urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-15 04:22:48 +03:00
Code Issues Packages Projects Releases Wiki Activity
687 Commits 768 Branches 10 Tags 215 MiB
b18c327392
Commit Graph

481 Commits

Author SHA1 Message Date
Steve Dee
93193477cc Don't generate diffs we can't apply 2014-04-15 17:43:15 -07:00
Steve Dee
1d347ede31 Tree edit 2014-04-15 16:47:57 -07:00
Steve Dee
79e34e3929 Map union jet 2014-04-15 13:07:11 -07:00
C. Guy Yarvin
66a68f4ce5 Merge branch 'master' of github.com:urbit/urbit 2014-04-15 10:33:01 -07:00
C. Guy Yarvin
3d9983f39e More advanced and faster. 2014-04-15 10:32:48 -07:00
Steve Dee
3904660cdf Remove redundant(?) woof 
A structurally identical decl exists in hoon.hoon, so I'm assuming this
is redundant.
 2014-04-14 19:20:21 -07:00
C. Guy Yarvin
9630807126 Remove debug printf. 2014-04-14 11:53:57 -07:00
C. Guy Yarvin
e0a6db7ddc More gentle handling for unacceptable inconsistencies. 2014-04-14 11:43:06 -07:00
C. Guy Yarvin
7208047f0e Sometimes we need trailing whitespace. 2014-04-14 11:22:36 -07:00
C. Guy Yarvin
20c6d005b3 Clean up requests from dead connections. 2014-04-14 11:01:18 -07:00
~hatteb-mitlyd
e0dfb10b42 veri jet skeleton, still not working 2014-04-12 19:59:02 -07:00
~hatteb-mitlyd
dac62b87e2 sort-of fix jets for Ed25519 
puck:ed is correct for at least the single test-point i tried.

sign:ed is still wrong.
 2014-04-11 17:17:39 -07:00
~hatteb-mitlyd
a0762ef8c8 first hack at sign:ed jet 2014-04-10 18:05:59 -07:00
~hatteb-mitlyd
33bb87af0f Merge remote-tracking branch 'urbit/master' into newbreach 
Update to the latest vere
 2014-04-10 12:04:51 -07:00
C. Guy Yarvin
e866603ae6 Some fixes. 2014-04-09 18:01:46 -07:00
Steve Dee
09ddf90b62 Use acru/crua in ames 2014-04-09 17:39:40 -07:00
C. Guy Yarvin
24f0d3cfb1 Good pill, no debug. 2014-04-09 17:06:33 -07:00
C. Guy Yarvin
ffd462591f Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/zod/arvo/zuse.hoon
 2014-04-09 16:52:25 -07:00
C. Guy Yarvin
9178eba744 Script fixes. 2014-04-09 16:51:19 -07:00
Gavin Whelan
f36faa5e3b Merge branch 'master' of github.com:urbit/urbit 2014-04-09 16:48:29 -07:00
Gavin Whelan
2860413be3 Fixing breakage from reformatting 2014-04-09 16:25:11 -07:00
Gavin Whelan
a1cb94b1e4 hoon regex 2014-04-09 13:35:28 -07:00
Steve Dee
02f8900165 One change that didn't make it in 2014-04-09 13:03:02 -07:00
Steve Dee
8e0604c4d2 Sign the input message, not the whole sealed noun 2014-04-09 12:59:09 -07:00
Steve Dee
0d901a8608 Trailing whitespace 
Repeat after me:

    find urb/zod/ -type f -name *.hoon | xargs sed -i '' -e 's/[[:space:]]*$//'
 2014-04-08 17:34:29 -07:00
C. Guy Yarvin
d28162053e Fix syntax error. 2014-04-08 15:56:07 -07:00
C. Guy Yarvin
2676054930 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/zod/arvo/eyre.hoon
	urb/zod/arvo/hoon.hoon
 2014-04-08 15:28:36 -07:00
C. Guy Yarvin
deaa14d27a Various fixes and improvements. 2014-04-08 15:26:01 -07:00
Steve Dee
b54dea7533 New cryptosuite interface 
`seal`/`tear` now imply `sign`/`sure` and take the public key of
the other party. As this muddies the `pu`/`se` distinction, we lump
all asym ops under `as`.
 2014-04-08 10:59:49 -07:00
Steve Dee
977a7fc702 Trailing whitespace 
You guys. The default git precommit hook checks for this. You can enable
it by copying and pasting this command into a shell in your Urbit
checkout:

    cp .git/hooks/precommit{.sample,}
 2014-04-07 10:19:02 -07:00
C. Guy Yarvin
0879da2286 Final template tweaks. 2014-04-05 14:25:16 -07:00
C. Guy Yarvin
08c3078647 "Fix" script and style non-escaping. 2014-04-05 12:04:05 -07:00
C. Guy Yarvin
bd21f15624 Merge branch 'master' of github.com:urbit/urbit 2014-04-04 15:36:21 -07:00
C. Guy Yarvin
80b6707039 More template tweaks. 2014-04-04 15:35:59 -07:00
johncburnham
bea2dd0d55 added some comments to hoon.hoon 2014-04-04 03:00:26 -07:00
C. Guy Yarvin
774beceac3 Template language. 2014-04-02 18:06:45 -07:00
C. Guy Yarvin
88e4aed25e Okay this works. 2014-03-27 10:52:31 -07:00
C. Guy Yarvin
e7acee9de8 Grr. 2014-03-27 10:50:14 -07:00
C. Guy Yarvin
b894894c1c Grr. 2014-03-27 10:46:57 -07:00
C. Guy Yarvin
50adabc51a Fix proxy name. 2014-03-27 10:39:17 -07:00
C. Guy Yarvin
499f9d2e33 More proxy testing. 2014-03-27 10:20:53 -07:00
C. Guy Yarvin
d17ffb8069 Fix ship from DNS resolution. 2014-03-27 10:06:58 -07:00
C. Guy Yarvin
891f026bbd Fix a bad checkin. 2014-03-26 18:06:11 -07:00
C. Guy Yarvin
a6dbaf7584 Some html and syntax tweaks. 2014-03-25 17:48:22 -07:00
~hatteb-mitlyd
779ab3f1ea beep on C-t if line is too short. closes #125 2014-03-25 11:32:49 -07:00
C. Guy Yarvin
619666ee35 Some syntax changes. 2014-03-25 10:46:30 -07:00
C. Guy Yarvin
b0f6d70140 Proxying. 2014-03-23 14:18:05 -07:00
C. Guy Yarvin
a0737a02e6 More http fixes. 2014-03-23 12:42:18 -07:00
C. Guy Yarvin
8619e957a7 Testing web proxying. 2014-03-23 11:44:23 -07:00
C. Guy Yarvin
81cc2694dd Test web proxying. 2014-03-22 14:42:25 -07:00
C. Guy Yarvin
9f47123717 A bunch of web fixes. Preparing to proxy. 2014-03-21 14:46:14 -07:00
C. Guy Yarvin
faf34392d8 Fix %eyre bugs, performance problems, etc. 2014-03-20 23:24:22 -07:00
C. Guy Yarvin
3cf9dc3ba2 Check in a bunch of web stuff. 2014-03-19 18:05:42 -07:00
Steve Dee
a6b43c81ad Trailing whitespace, hoon level, part 2 2014-03-14 10:50:12 -07:00
C. Guy Yarvin
13055e7dff Fix dor. Duh. 2014-03-13 17:49:31 -07:00
C. Guy Yarvin
d7a59f0cbf Basic generative loading... 2014-03-12 18:04:58 -07:00
C. Guy Yarvin
0529456f74 Initial checkin to neweyre. 2014-03-12 12:50:39 -07:00
C. Guy Yarvin
cdf290587f Merge branch 'master' of github.com:urbit/urbit 2014-03-12 12:44:27 -07:00
C. Guy Yarvin
67e6ed51b9 Add ++wain. 2014-03-12 12:44:08 -07:00
Steve Dee
8c40684235 Disable ^W for now 2014-03-11 13:34:06 -07:00
Gavin Whelan
d8af5d339b Merge branch 'master' of github.com:urbit/urbit 2014-03-07 16:38:19 -08:00
Gavin Whelan
e8b3d3faac Redefined pfix, sfix in terms of comb, cleaned some variable names. 2014-03-07 16:36:43 -08:00
C. Guy Yarvin
c1570f1272 Add ++zing. 2014-03-07 16:31:36 -08:00
C. Guy Yarvin
a49bd3f260 Tighten up zuse. 2014-03-05 13:43:43 -08:00
C. Guy Yarvin
69f6b2bb91 mv and rm. 2014-03-05 13:42:47 -08:00
C. Guy Yarvin
139449b86c :cp path1 path2 2014-03-05 12:21:52 -08:00
C. Guy Yarvin
08a932474f Fix another ++dish bug. 2014-03-05 11:00:27 -08:00
C. Guy Yarvin
65c709223a Fix an infinite loop in ++dish (prettyprinting). 2014-03-04 11:38:14 -08:00
C. Guy Yarvin
0645597bb2 Merge branch 'master' of github.com:urbit/urbit 2014-03-04 11:17:49 -08:00
C. Guy Yarvin
172581939f Various fixes and improvements. 2014-03-04 11:17:34 -08:00
Steve Dee
140a8faa1b :pope ~tyr 2014-03-03 15:53:18 -08:00
C. Guy Yarvin
395ec1d285 Don't automatically span-escape URLs. 2014-03-03 14:47:59 -08:00
C. Guy Yarvin
231a702852 Make :curl work again. 2014-03-03 13:55:40 -08:00
C. Guy Yarvin
a0654094b1 Revert to previous hoon and zuse. 2014-03-03 12:39:48 -08:00
C. Guy Yarvin
617a572fc3 Continuity breach and flag day. 2014-03-03 12:23:59 -08:00
C. Guy Yarvin
78645ae116 Some HTTP client fixes. 2014-03-03 11:51:35 -08:00
C. Guy Yarvin
26f4cbaf81 Working HTTP client. 2014-03-02 14:31:03 -08:00
C. Guy Yarvin
3d1c90f357 Various HTTP client fixes. 2014-02-26 17:58:40 -08:00
C. Guy Yarvin
65fe1417e2 Some memory palliatives. 2014-02-14 17:35:22 -08:00
C. Guy Yarvin
acdd6e6993 Merge branch 'master' of github.com:urbit/urbit 2014-02-14 11:29:19 -08:00
C. Guy Yarvin
012396a4b1 Various fixes and improvements. 2014-02-14 11:29:03 -08:00
Allen Short
b0d0eee3fb better json 2014-02-12 16:53:06 -08:00
C. Guy Yarvin
187f180d48 Merge branch 'master' of github.com:urbit/urbit 2014-02-10 21:35:23 -08:00
C. Guy Yarvin
dad137f068 Sacrifice a %bull bug. 2014-02-10 21:34:24 -08:00
atax1a
de7e8a339c fingerprint ~net 2014-02-10 18:06:24 -08:00
C. Guy Yarvin
7395ceb49e Various fixes and improvements. 2014-02-10 09:50:20 -08:00
~novrud-hanweb (del)
450d40a965 :pope ~del 2014-02-01 14:42:06 -05:00
johncburnham
e0eee90df2 change ~led to Laozi 2014-01-31 11:16:05 -08:00
johncburnham
7a51539f72 Merge pull request #114 from ngvrnd/patch-1 
Proposed change to name of carrier ~led, Laozi
 2014-01-31 11:13:24 -08:00
Steve Dee
b3b2c56603 Merge remote-tracking branch 'urbit/master' 2014-01-30 09:34:45 -08:00
C. Guy Yarvin
d3795cad50 Test compilation routines. 2014-01-29 16:16:10 -08:00
Steve Dee
f0cb1dd67a GF(bex n) in zuse 2014-01-29 15:43:23 -08:00
johncburnham
9b7f46adfa added ~rislus-dopsym as ~wep 2014-01-28 11:30:42 -08:00
C. Guy Yarvin
d937b964b2 Better checkin. 2014-01-27 14:24:27 -08:00
C. Guy Yarvin
cb04b91c94 Various fixes and improvements. 2014-01-27 11:09:56 -08:00
C. Guy Yarvin
a8ad473cf6 Merge branch 'master' of github.com:urbit/urbit 2014-01-27 10:49:41 -08:00
C. Guy Yarvin
7d2f7d3dfe Various fixes etc. 2014-01-27 10:49:26 -08:00
n gvrnd
1e95dde489 Proposed change to name of carrier ~led, Laozi 2014-01-25 17:57:54 -05:00
Steve Dee
62ac351101 Generalize rol and ror 2014-01-24 14:09:34 -08:00
Allen Short
dc49f5fdbf ctrl-t transpose key. 2014-01-24 01:17:04 -08:00
Steve Dee
6e34c98472 Revert "Add signed modulus" 
This reverts commits 5fa624d27e4e6ae3b9d268b02ce79b712598caff and
81cc1d5632415f2b4e661f754b324a9b66875198.
 2014-01-23 14:53:48 -08:00
Steven Dee
a2f9aa9b2b Prevent some underflows in %fo 2014-01-22 23:39:31 -05:00
Steven Dee
3c5e24ecaf Remove unnecessary :si in si 2014-01-22 18:16:22 -05:00
Steven Dee
da9432bf3f Add signed modulus 2014-01-22 17:18:40 -05:00
cgyarvin
28541c2b1f Merge pull request #112 from washort/json 
JSON parser
 2014-01-21 17:25:22 -08:00
Allen Short
4800ad00c2 JSON parser 2014-01-21 16:34:25 -08:00
Steve Dee
d1c84b878a Make shal truncate ruz to len 2014-01-21 15:38:28 -08:00
Steve Dee
6aa1ca3c73 Get at the length field of sha-512 
This lets us take the hash of old-world strings with a bunch of trailing
zero bytes.
 2014-01-21 15:03:30 -08:00
johncburnham
1af62de359 add ~nosryl-tarpem as ~leb 2014-01-21 10:43:05 -08:00
Steve Dee
259717d60f Revert probably unintentional replace 2014-01-20 18:33:06 -08:00
Steve Dee
e156c00d93 sha-512 hoon 2014-01-20 18:22:04 -08:00
C. Guy Yarvin
39e5411c04 Various fixes and improvements. 2014-01-20 13:50:54 -08:00
C. Guy Yarvin
e5a43df074 Merge branch 'master' of github.com:urbit/urbit 2014-01-15 22:44:20 -08:00
C. Guy Yarvin
d0e5caf069 Just some stuff. 2014-01-15 22:43:56 -08:00
johncburnham
026f9851d5 more ames.hoon updates 2014-01-15 10:21:57 -08:00
johncburnham
e03a4ed29a updated ames.hoon 2014-01-15 10:16:01 -08:00
johncburnham
a7a20d15d3 Merge pull request #108 from yebyen/master 
claimed ~del for ~novrud-hanweb
 2014-01-15 10:00:29 -08:00
johncburnham
cd203fffac Merge pull request #109 from ngvrnd/master 
claiming carrier 41, ~led, in the name of the destroyer, ~lontec-botrum.
 2014-01-15 09:59:38 -08:00
n gvrnd
78bdc9554f claiming carrier 41, ~led, in the name of the destroyer, ~lontec-botrum. 2014-01-15 08:56:48 -05:00
Kingdon Barrett
abbbc42f3e claimed ~del for ~novrud-hanweb 2014-01-15 08:36:00 -05:00
johncburnham
934630d02e changed ~tyr to fidelis 2014-01-14 17:04:04 -08:00
atax1a
6825d95dd4 claim ~net 2014-01-14 16:19:36 -08:00
Steve Dee
c709ad17f8 ~tyr, owned by ~hobmed-hinrym, ruled by Rurik 2014-01-14 14:53:09 -08:00
johncburnham
5628e12d7c Merge branch 'master' of https://github.com/urbit/urbit 2014-01-14 11:32:54 -08:00
johncburnham
d6984cc6b7 some carrier cleanup 2014-01-14 11:31:56 -08:00
Steve Dee
1dcf352b4d emacs-style word navigation 2014-01-07 09:39:24 -08:00
C. Guy Yarvin
fd3caa0d7c Probably not a substantive change. 2014-01-06 17:09:03 -08:00
C. Guy Yarvin
faf9f9bc0f Merge branch 'funbreach' 
Conflicts:
	urb/urbit.pill
 2014-01-06 12:46:49 -08:00
C. Guy Yarvin
e4bbd4c21d Last checkin on funbreach. 2014-01-06 12:37:42 -08:00
C. Guy Yarvin
98e6396258 New vane version detection. 2014-01-05 18:10:37 -08:00
C. Guy Yarvin
37c32ed8b7 New load/come interface, part a. 2014-01-05 17:52:37 -08:00
C. Guy Yarvin
5fa1531701 Ready for a cross-generation reset. 2014-01-05 16:36:29 -08:00
C. Guy Yarvin
59815373bd Refactor peek. 2014-01-05 16:02:34 -08:00
C. Guy Yarvin
c3e0a0394c Some arvo cleanups. 2014-01-05 15:38:34 -08:00
C. Guy Yarvin
37c4885cfb Reinvented reset. 2014-01-05 14:10:49 -08:00
C. Guy Yarvin
af9f1753f6 Should be freezable here. 2014-01-04 20:42:15 -08:00
C. Guy Yarvin
1a7c8bf182 Removed unused runes. 2014-01-04 20:11:15 -08:00
C. Guy Yarvin
7a02512e38 dtpt and dtsg are gone. 2014-01-04 19:56:33 -08:00
C. Guy Yarvin
bba36c8222 cnbc and cnhx now actually gone. 2014-01-04 19:31:24 -08:00
C. Guy Yarvin
298384b3a9 About to remove cnbc and cnhx. 2014-01-04 19:18:06 -08:00
C. Guy Yarvin
8c1eb9bace zpsm is now fully sifted. 2014-01-04 18:05:33 -08:00
C. Guy Yarvin
e122c912d2 %zpwt, language version gating. 2014-01-04 17:15:52 -08:00
C. Guy Yarvin
9136204453 Hint refactoring. 2014-01-04 14:57:44 -08:00
C. Guy Yarvin
1b50d77eeb Various fixes and improvements. 2014-01-03 23:28:16 -08:00
C. Guy Yarvin
2567a6f529 Preparing to install wt?z. 2014-01-03 18:59:56 -08:00
C. Guy Yarvin
00939d2d38 New structure of ++wing. 2014-01-01 12:47:18 -08:00
C. Guy Yarvin
1cc029333e About to remove wtfs. 2013-12-31 22:48:21 -08:00
C. Guy Yarvin
e0f545ee03 Preparing to redo wts. 2013-12-31 12:11:16 -08:00
C. Guy Yarvin
9f2f953637 New model bull. 2013-12-31 11:30:37 -08:00
C. Guy Yarvin
6e99138693 Checked in a bad ames. 2013-12-30 12:16:02 -05:00
C. Guy Yarvin
109402dd9c Eliminate annoying timeout messages - for now. 2013-12-30 01:56:13 -05:00
C. Guy Yarvin
a9d4fc73b4 Fix update bug. 2013-12-29 17:24:29 -05:00
C. Guy Yarvin
92aaf45cb4 Remove debug. Add ~s5 lag in update to deal with skew bug. 2013-12-29 01:55:19 -05:00
C. Guy Yarvin
e387a3c259 Debug. 2013-12-29 01:40:00 -05:00
C. Guy Yarvin
516bc2768a Debug. 2013-12-29 01:30:10 -05:00
C. Guy Yarvin
752e0cb8ca More debug. 2013-12-29 01:14:11 -05:00
C. Guy Yarvin
c599b27c65 More debug. 2013-12-29 00:23:05 -05:00
C. Guy Yarvin
c8f129c033 Not so many printfs. 2013-12-29 00:04:56 -05:00
C. Guy Yarvin
af58bdd423 More printfs. 2013-12-28 23:59:45 -05:00
C. Guy Yarvin
93b26b1072 Okay made it slightly less ugly... 2013-12-28 16:11:11 -05:00
C. Guy Yarvin
93318d3c7a Add ze static loader 2013-12-28 15:50:50 -05:00
C. Guy Yarvin
539c3dd0aa %zuse should not be compiled with debug. 2013-12-28 13:18:40 -05:00
C. Guy Yarvin
eafadbd9b5 Remove dbug. 2013-12-28 00:46:13 -05:00
C. Guy Yarvin
048e43780d Real dbugz. 2013-12-28 00:30:53 -05:00
C. Guy Yarvin
fb94a70b69 More dbugz. 2013-12-28 00:29:36 -05:00
C. Guy Yarvin
6cd652224c More dbugz. 2013-12-28 00:26:22 -05:00
C. Guy Yarvin
bec0261d1b Remove debug printfs... 2013-12-27 20:39:55 -05:00
C. Guy Yarvin
74bc44357d More debugging. 2013-12-27 20:32:52 -05:00
C. Guy Yarvin
aae064bcb5 Debugging for ligfed-famsef. 2013-12-27 20:28:39 -05:00
C. Guy Yarvin
7dd20465d8 Don't record bad keys as traffic. 2013-12-27 20:21:11 -05:00
C. Guy Yarvin
a179231541 Set Arthur Breitman to (mercor). 2013-12-27 20:14:06 -05:00
C. Guy Yarvin
97036644ad Remove some debug changes. 2013-12-27 17:35:14 -05:00
C. Guy Yarvin
24c14d3d25 Time out key as well as route. 2013-12-27 17:33:24 -05:00
C. Guy Yarvin
2722cee95b Some debugging traps. 2013-12-27 15:49:37 -05:00
C. Guy Yarvin
880f0a64a5 Support :reset path. 2013-12-26 21:56:57 -05:00
C. Guy Yarvin
99a82ccb17 Eliminate %wtcn in favor of %wtts. 2013-12-26 21:43:25 -05:00
C. Guy Yarvin
497b4b1e31 Fix routing bug. 2013-12-26 19:32:55 -05:00
C. Guy Yarvin
12bd66848d Continuity breach and flag day. 2013-12-26 13:28:32 -05:00
C. Guy Yarvin
33eb41cdfe Various %bull-related updates. 2013-12-26 12:12:07 -05:00
C. Guy Yarvin
389cb3d6b8 Eliminate sloppy fork resolution. 2013-12-23 15:49:15 -05:00
C. Guy Yarvin
b449146d9f A little bit of %bull. 2013-12-22 15:32:30 -08:00
C. Guy Yarvin
450e90a391 Remove all traces of snap. Add ktdt for grooming. 2013-12-20 23:46:49 -08:00
C. Guy Yarvin
8e01847841 Flag day in ames. 2013-12-20 18:53:01 -08:00
C. Guy Yarvin
1c5656c5f3 Merge branch 'funky' 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/ames.hoon
 2013-12-20 18:45:17 -08:00
C. Guy Yarvin
afdc627168 Funky, thy work is done. 2013-12-20 18:35:33 -08:00
C. Guy Yarvin
6d65557fe0 ktts evolution complete. 2013-12-20 17:02:26 -08:00
C. Guy Yarvin
f69e8d91f2 ktzp is no more. 2013-12-20 16:59:03 -08:00
C. Guy Yarvin
eba0a1b1c0 Double verified; about to change togas. 2013-12-20 14:26:23 -08:00
C. Guy Yarvin
4f9b7173f9 On the way to funk. 2013-12-20 09:34:13 -08:00
C. Guy Yarvin
66d2266a81 Before testing bchx. 2013-12-18 01:48:24 -08:00
C. Guy Yarvin
dd067182a3 %brhx is prepared to replace %brtr. 2013-12-17 17:47:20 -08:00
C. Guy Yarvin
f427ae82f1 Check in some imperial keyprints. 2013-12-17 11:35:45 -08:00
C. Guy Yarvin
3bb91d91da I hate having a detached HEAD. 2013-12-17 11:13:44 -08:00
C. Guy Yarvin
9f3efa799f Various hoon improvements. 2013-12-16 20:48:40 -08:00
C. Guy Yarvin
43e81ec55e Merge branch 'master' of github.com:urbit/urbit into funky 2013-12-16 16:09:25 -08:00
C. Guy Yarvin
5e4b12b5d9 Reversed %bush and %reed. 2013-12-16 10:53:22 -08:00
C. Guy Yarvin
29f40e633d %bc* complete with new twig and tile. 2013-12-15 18:44:44 -08:00
C. Guy Yarvin
9c59feaffd More cleanup. 2013-12-15 17:15:04 -08:00
C. Guy Yarvin
25bddfb829 %bcts to %bczp. Double verified. 2013-12-15 15:40:44 -08:00
C. Guy Yarvin
6474f37de2 Replace %base with %axil. Double verified. 2013-12-15 12:52:24 -08:00