Commit graph

119 commits

Author SHA1 Message Date
Alexander Wang
5c2d75a360
tests 2023-02-10 21:28:03 -08:00
Alexander Wang
0f9d98fa8a
Merge branch 'master' into tune-spacing 2023-02-10 21:27:10 -08:00
Alexander Wang
b30a72b2b3
merge 2023-02-10 21:25:28 -08:00
Alexander Wang
c33676a416
ok 2023-02-10 20:47:58 -08:00
Alexander Wang
9fad105822
fix padding 2023-02-10 13:47:22 -08:00
Alexander Wang
939a5ca088
ok 2023-02-10 12:18:50 -08:00
Alexander Wang
8ec04a1f61
save 2023-02-10 10:25:44 -08:00
Alexander Wang
4aaaf8dfa2
elk 2023-02-09 19:49:53 -08:00
Alexander Wang
dbac4b8cdf
dagre 2023-02-09 19:29:30 -08:00
Gavin Nishizawa
b387e2c6e0
update tests 2023-02-03 13:59:12 -08:00
Gavin Nishizawa
4bfb6af7e6
Merge branch 'master' into shape-specific-inner-boxes 2023-02-02 20:25:52 -08:00
Anmol Sethi
8860b6b716
d2graph: Sort objects by AST order 2023-02-02 12:24:48 -08:00
Vojtěch Fošnár
01928a5032
review fixes 2023-01-30 12:06:54 +01:00
Anmol Sethi
3ace33fd01
d2ir: Review fixes #714 2023-01-27 23:28:44 -08:00
Anmol Sethi
30b5b64cad
d2ir: Review fixes #714 2023-01-27 23:19:50 -08:00
Vojtěch Fošnár
6598a1023f
fixed appendix text color 2023-01-28 01:43:24 +01:00
Vojtěch Fošnár
af2be1232f
resolved conflicts, updated tests 2023-01-27 22:30:44 +01:00
Anmol Sethi
2d36513e2c
Merge remote-tracking branch 'upstream/master' into scenarios-a407 2023-01-27 10:51:33 -08:00
Anmol Sethi
caef5a5a8f
cli: Add support for rendering layers/scenarios/steps 2023-01-27 10:41:25 -08:00
Gavin Nishizawa
ce0d81650d
update tests 2023-01-26 16:45:14 -08:00
Anmol Sethi
b350399d66
d2ir: Complete integration across all packages 2023-01-24 03:24:35 -08:00
OneRain2333
fafc542cfe update tests 2023-01-24 17:52:05 +08:00
OneRain2333
194dfac8d2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg
#	d2renderers/d2sketch/testdata/basic/sketch.exp.svg
#	d2renderers/d2sketch/testdata/child_to_child/sketch.exp.svg
#	d2renderers/d2sketch/testdata/class/sketch.exp.svg
#	d2renderers/d2sketch/testdata/connection_label/sketch.exp.svg
#	d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg
#	d2renderers/d2sketch/testdata/twitter/sketch.exp.svg
#	d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg
#	d2renderers/d2svg/appendix/testdata/links/sketch.exp.svg
#	d2renderers/d2svg/appendix/testdata/tooltip_wider_than_diagram/sketch.exp.svg
#	d2renderers/d2svg/d2svg.go
#	e2etests/testdata/regression/dagre_edge_label_spacing/dagre/sketch.exp.svg
#	e2etests/testdata/regression/dagre_edge_label_spacing/elk/sketch.exp.svg
#	e2etests/testdata/regression/dagre_special_ids/dagre/sketch.exp.svg
#	e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg
#	e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg
#	e2etests/testdata/regression/elk_alignment/elk/sketch.exp.svg
#	e2etests/testdata/regression/elk_img_empty_label_panic/dagre/sketch.exp.svg
#	e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg
#	e2etests/testdata/regression/elk_order/dagre/sketch.exp.svg
#	e2etests/testdata/regression/elk_order/elk/sketch.exp.svg
#	e2etests/testdata/regression/empty_sequence/dagre/sketch.exp.svg
#	e2etests/testdata/regression/empty_sequence/elk/sketch.exp.svg
#	e2etests/testdata/regression/only_header_class_table/dagre/sketch.exp.svg
#	e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg
#	e2etests/testdata/regression/query_param_escape/dagre/sketch.exp.svg
#	e2etests/testdata/regression/query_param_escape/elk/sketch.exp.svg
#	e2etests/testdata/regression/sequence_diagram_name_crash/dagre/sketch.exp.svg
#	e2etests/testdata/regression/sequence_diagram_name_crash/elk/sketch.exp.svg
#	e2etests/testdata/regression/sequence_diagram_no_message/dagre/sketch.exp.svg
#	e2etests/testdata/regression/sequence_diagram_no_message/elk/sketch.exp.svg
#	e2etests/testdata/regression/sequence_diagram_span_cover/dagre/sketch.exp.svg
#	e2etests/testdata/regression/sequence_diagram_span_cover/elk/sketch.exp.svg
#	e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg
#	e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg
#	e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg
#	e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg
#	e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg
#	e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg
#	e2etests/testdata/sanity/basic/dagre/sketch.exp.svg
#	e2etests/testdata/sanity/basic/elk/sketch.exp.svg
#	e2etests/testdata/sanity/child_to_child/dagre/sketch.exp.svg
#	e2etests/testdata/sanity/child_to_child/elk/sketch.exp.svg
#	e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg
#	e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg
#	e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg
#	e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg
#	e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg
#	e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg
#	e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg
#	e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg
#	e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg
#	e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg
#	e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg
#	e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg
#	e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg
#	e2etests/testdata/stable/binary_tree/elk/sketch.exp.svg
#	e2etests/testdata/stable/chaos1/dagre/sketch.exp.svg
#	e2etests/testdata/stable/chaos1/elk/sketch.exp.svg
#	e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg
#	e2etests/testdata/stable/chaos2/elk/sketch.exp.svg
#	e2etests/testdata/stable/child_parent_edges/dagre/sketch.exp.svg
#	e2etests/testdata/stable/child_parent_edges/elk/sketch.exp.svg
#	e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg
#	e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg
#	e2etests/testdata/stable/class/dagre/sketch.exp.svg
#	e2etests/testdata/stable/class/elk/sketch.exp.svg
#	e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg
#	e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg
#	e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg
#	e2etests/testdata/stable/connected_container/elk/sketch.exp.svg
#	e2etests/testdata/stable/constant_near_stress/dagre/board.exp.json
#	e2etests/testdata/stable/constant_near_stress/dagre/sketch.exp.svg
#	e2etests/testdata/stable/constant_near_stress/elk/board.exp.json
#	e2etests/testdata/stable/constant_near_stress/elk/sketch.exp.svg
#	e2etests/testdata/stable/constant_near_title/dagre/sketch.exp.svg
#	e2etests/testdata/stable/constant_near_title/elk/sketch.exp.svg
#	e2etests/testdata/stable/container_edges/dagre/sketch.exp.svg
#	e2etests/testdata/stable/container_edges/elk/sketch.exp.svg
#	e2etests/testdata/stable/dense/dagre/sketch.exp.svg
#	e2etests/testdata/stable/dense/elk/sketch.exp.svg
#	e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg
#	e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg
#	e2etests/testdata/stable/direction/dagre/sketch.exp.svg
#	e2etests/testdata/stable/direction/elk/sketch.exp.svg
#	e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg
#	e2etests/testdata/stable/font_colors/elk/sketch.exp.svg
#	e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg
#	e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg
#	e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg
#	e2etests/testdata/stable/giant_markdown_test/elk/sketch.exp.svg
#	e2etests/testdata/stable/hr/dagre/sketch.exp.svg
#	e2etests/testdata/stable/hr/elk/sketch.exp.svg
#	e2etests/testdata/stable/icon-label/dagre/sketch.exp.svg
#	e2etests/testdata/stable/icon-label/elk/sketch.exp.svg
#	e2etests/testdata/stable/images/dagre/sketch.exp.svg
#	e2etests/testdata/stable/images/elk/sketch.exp.svg
#	e2etests/testdata/stable/investigate/dagre/sketch.exp.svg
#	e2etests/testdata/stable/investigate/elk/sketch.exp.svg
#	e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg
#	e2etests/testdata/stable/large_arch/elk/sketch.exp.svg
#	e2etests/testdata/stable/latex/dagre/sketch.exp.svg
#	e2etests/testdata/stable/latex/elk/sketch.exp.svg
#	e2etests/testdata/stable/li1/dagre/sketch.exp.svg
#	e2etests/testdata/stable/li1/elk/sketch.exp.svg
#	e2etests/testdata/stable/li2/dagre/sketch.exp.svg
#	e2etests/testdata/stable/li2/elk/sketch.exp.svg
#	e2etests/testdata/stable/li3/dagre/sketch.exp.svg
#	e2etests/testdata/stable/li3/elk/sketch.exp.svg
#	e2etests/testdata/stable/li4/dagre/sketch.exp.svg
#	e2etests/testdata/stable/li4/elk/sketch.exp.svg
#	e2etests/testdata/stable/links/dagre/sketch.exp.svg
#	e2etests/testdata/stable/links/elk/sketch.exp.svg
#	e2etests/testdata/stable/lone_h1/dagre/sketch.exp.svg
#	e2etests/testdata/stable/lone_h1/elk/sketch.exp.svg
#	e2etests/testdata/stable/markdown/dagre/sketch.exp.svg
#	e2etests/testdata/stable/markdown/elk/sketch.exp.svg
#	e2etests/testdata/stable/markdown_stroke_fill/dagre/sketch.exp.svg
#	e2etests/testdata/stable/markdown_stroke_fill/elk/sketch.exp.svg
#	e2etests/testdata/stable/md_2space_newline/dagre/sketch.exp.svg
#	e2etests/testdata/stable/md_2space_newline/elk/sketch.exp.svg
#	e2etests/testdata/stable/md_backslash_newline/dagre/sketch.exp.svg
#	e2etests/testdata/stable/md_backslash_newline/elk/sketch.exp.svg
#	e2etests/testdata/stable/md_code_block_fenced/dagre/sketch.exp.svg
#	e2etests/testdata/stable/md_code_block_fenced/elk/sketch.exp.svg
#	e2etests/testdata/stable/md_code_block_indented/dagre/sketch.exp.svg
#	e2etests/testdata/stable/md_code_block_indented/elk/sketch.exp.svg
#	e2etests/testdata/stable/md_code_inline/dagre/sketch.exp.svg
#	e2etests/testdata/stable/md_code_inline/elk/sketch.exp.svg
#	e2etests/testdata/stable/multiline_text/dagre/sketch.exp.svg
#	e2etests/testdata/stable/multiline_text/elk/sketch.exp.svg
#	e2etests/testdata/stable/multiple_trees/dagre/sketch.exp.svg
#	e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg
#	e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg
#	e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg
#	e2etests/testdata/stable/number_connections/dagre/sketch.exp.svg
#	e2etests/testdata/stable/number_connections/elk/sketch.exp.svg
#	e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg
#	e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg
#	e2etests/testdata/stable/one_three_one_container/dagre/sketch.exp.svg
#	e2etests/testdata/stable/one_three_one_container/elk/sketch.exp.svg
#	e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg
#	e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg
#	e2etests/testdata/stable/p/dagre/sketch.exp.svg
#	e2etests/testdata/stable/p/elk/sketch.exp.svg
#	e2etests/testdata/stable/pre/dagre/sketch.exp.svg
#	e2etests/testdata/stable/pre/elk/sketch.exp.svg
#	e2etests/testdata/stable/self-referencing/dagre/sketch.exp.svg
#	e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_distance/dagre/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_distance/elk/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_long_note/dagre/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_long_note/elk/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_nested_groups/elk/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_nested_span/elk/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_note/dagre/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_note/elk/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg
#	e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg
#	e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg
#	e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg
#	e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg
#	e2etests/testdata/stable/square_3d/elk/sketch.exp.svg
#	e2etests/testdata/stable/straight_hierarchy_container/dagre/sketch.exp.svg
#	e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg
#	e2etests/testdata/stable/stylish/dagre/sketch.exp.svg
#	e2etests/testdata/stable/stylish/elk/sketch.exp.svg
#	e2etests/testdata/stable/text_font_sizes/dagre/sketch.exp.svg
#	e2etests/testdata/stable/text_font_sizes/elk/sketch.exp.svg
#	e2etests/testdata/stable/tooltips/dagre/sketch.exp.svg
#	e2etests/testdata/stable/tooltips/elk/sketch.exp.svg
#	e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg
#	e2etests/testdata/stable/transparent_3d/elk/sketch.exp.svg
#	e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg
#	e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg
#	e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg
#	e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg
#	e2etests/testdata/stable/us_map/dagre/sketch.exp.svg
#	e2etests/testdata/stable/us_map/elk/sketch.exp.svg
#	e2etests/testdata/todo/container_child_edge/dagre/sketch.exp.svg
#	e2etests/testdata/todo/container_child_edge/elk/sketch.exp.svg
#	e2etests/testdata/todo/font_sizes_containers_large/dagre/sketch.exp.svg
#	e2etests/testdata/todo/font_sizes_containers_large/elk/sketch.exp.svg
#	e2etests/testdata/todo/font_sizes_large/dagre/sketch.exp.svg
#	e2etests/testdata/todo/font_sizes_large/elk/sketch.exp.svg
#	e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/sketch.exp.svg
#	e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/sketch.exp.svg
#	e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg
#	e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg
#	e2etests/testdata/todo/tall_edge_label/dagre/sketch.exp.svg
#	e2etests/testdata/todo/tall_edge_label/elk/sketch.exp.svg
2023-01-24 17:30:28 +08:00
OneRain2333
735add1b32 update tests 2023-01-24 16:21:39 +08:00
Alexander Wang
74b54f3f8a
update 2023-01-19 00:52:10 -08:00
Alexander Wang
bb92a1c0fa
ok 2023-01-07 19:46:10 -08:00
Bernard Xie
35c1a1633f
add script to tests 2023-01-03 16:42:39 -08:00
OneRain2333
f2a0de9f69 update tests 2023-01-01 16:13:32 +08:00
Alexander Wang
e8a897530c
update tests 2022-12-30 21:00:34 -08:00
Alexander Wang
462d22a75f
don't round 2022-12-24 13:39:45 -08:00
Alexander Wang
b21318ca5b
Merge branch 'master' into sketch 2022-12-21 21:04:30 -08:00
Alexander Wang
07fb1a3d86
implement sketch 2022-12-21 20:55:27 -08:00
Gavin Nishizawa
495a21120c
update tests 2022-12-21 13:11:08 -08:00
Gavin Nishizawa
98a2d59aea
update tests 2022-12-17 20:41:42 -08:00
Alexander Wang
06ea7c191a
unique label mask 2022-12-05 22:32:23 -08:00
Alexander Wang
9e523015bf
rever theme change for now 2022-12-05 14:40:14 -08:00
Alexander Wang
4ed0ebc58b
use new span colors 2022-12-05 14:27:37 -08:00
Alexander Wang
fe5f9a9cbc
try theme 2022-12-05 14:22:40 -08:00
Alexander Wang
2a8a643b64
nvm 2022-12-05 14:13:26 -08:00
Alexander Wang
ce9bf38ee3
fix default theme 2022-12-05 14:09:27 -08:00
Alexander Wang
1b99604359
fix nested sequence diagram shape 2022-12-05 13:53:09 -08:00
Júlio César Batista
297ea52b9e
Merge branch 'master' into actors-distance 2022-12-05 13:13:30 -08:00
Alexander Wang
159e2016a9
blend groups 2022-12-05 12:09:32 -08:00
Júlio César Batista
f99cf98864
Tests 2022-12-05 11:36:20 -08:00
Alexander Wang
bed4ef7fae
fix group classification 2022-12-05 11:36:19 -08:00
Alexander Wang
5deb9b2d7d
blend groups 2022-12-05 11:22:16 -08:00
Júlio César Batista
fdf6699eb8
Merge branch 'master' into actors-distance 2022-12-05 11:11:26 -08:00
Júlio César Batista
a5b713673b
Handle case without edges between actors 2022-12-05 10:59:44 -08:00
Alexander Wang
e0d91d3c15
fix bolding 2022-12-05 10:46:06 -08:00
Júlio César Batista
077d29977a
Update tests 2022-12-05 10:36:42 -08:00
Alexander Wang
83118fb076
no aspect ratio 2022-12-04 22:40:45 -08:00
Alexander Wang
d93833a4f1
nvm 2022-12-04 22:38:43 -08:00
Alexander Wang
0b614b79b3
no aspect ratio actor height 2022-12-04 22:37:42 -08:00
Alexander Wang
df81a5aeaa
fix span width 2022-12-04 22:31:37 -08:00
Alexander Wang
823c788307
lifeline z index 2022-12-04 21:19:40 -08:00
Alexander Wang
9bf1fb7b72
refactor group check 2022-12-04 21:12:59 -08:00
Alexander Wang
0f5b14c76a
reduce distance between actors 2022-12-04 20:05:25 -08:00
Alexander Wang
e9c9a80edb
actors are B5 fill 2022-12-04 19:57:52 -08:00
Alexander Wang
5b1b5edc86
sequence diagram fixes 2022-12-04 16:02:25 -08:00
Alexander Wang
3b94fabb0b
add label masks over all connections 2022-12-03 16:36:11 -08:00
Júlio César Batista
a2f7abc316
Fix actor font size 2022-12-02 19:15:04 -08:00
Júlio César Batista
b2e310d6ac
Add title padding 2022-12-02 18:40:59 -08:00
Júlio César Batista
4c44b9b367
Update tests 2022-12-02 17:22:30 -08:00
Alexander Wang
ca23f30817
Revert "messages inside label"
This reverts commit b64008d4f9c55f387c40ed67e571c3c12a32b983.
2022-12-02 11:11:11 -08:00
Alexander Wang
0ca7246db4
messages inside label 2022-12-02 11:11:11 -08:00
Júlio César Batista
be21a957ff
Update message zindex 2022-12-02 10:27:32 -08:00
Júlio César Batista
f918991550
Fix tests 2022-12-02 10:23:11 -08:00
Júlio César Batista
8621512739
Handle layout with binaries 2022-12-01 18:30:14 -08:00
Júlio César Batista
d3316c7961
Add sequence diagram e2etests 2022-12-01 13:56:47 -08:00