Commit Graph

2179 Commits

Author SHA1 Message Date
C. Guy Yarvin
6db859f940 Merge branch 'master' into radio 2014-12-10 10:44:07 -08:00
C. Guy Yarvin
16b5a5cf1b Fix ford caching bug. 2014-12-09 21:06:30 -08:00
Galen Wolfe-Pauly
209b63f3a6 new pill 2014-12-09 18:28:14 -08:00
Anton Dyudin
b057258711 Fixed markdown spin 2014-12-09 18:25:47 -08:00
Galen Wolfe-Pauly
0d4a17b411 various fixes and improvements 2014-12-09 18:15:22 -08:00
Philip C Monk
6a19b061d4 fix json converted on sub in eyre 2014-12-09 20:39:51 -05:00
Philip C Monk
9cbb67fc4d Merge branch 'master' into radio
Conflicts:
	urb/urbit.pill
2014-12-09 20:39:36 -05:00
Philip C Monk
cf405ac9de fix door search 2014-12-09 19:54:42 -05:00
Anton Dyudin
a115d95037 Merge branch 'master' of https://github.com/urbit/urbit 2014-12-09 15:51:46 -08:00
Anton Dyudin
42b47b3f2f urb.util.toDate 2014-12-09 15:51:18 -08:00
Galen Wolfe-Pauly
54f5124a1c radio testing 2014-12-09 15:11:30 -08:00
Philip C Monk
5d927a6773 Merge branch 'master' of https://github.com/urbit/urbit
Conflicts:
	urb/urbit.pill
2014-12-09 18:02:38 -05:00
Philip C Monk
56fe217022 fix ye olde dotket bug
fixes #194
2014-12-09 17:59:31 -05:00
C. Guy Yarvin
6dfe33c181 Radio-report. 2014-12-09 14:45:14 -08:00
C. Guy Yarvin
38606a3155 Less broken prep. 2014-12-09 14:10:45 -08:00
C. Guy Yarvin
a8d8d5e136 More debugging. 2014-12-09 13:59:08 -08:00
Anton Dyudin
e0814b6eae Added sail multi-classes 2014-12-09 13:52:43 -08:00
Anton Dyudin
9d6031e881 Merge branch 'master' of https://github.com/urbit/urbit 2014-12-09 12:33:57 -08:00
Anton Dyudin
c63674d983 defuture entity grab 2014-12-09 12:33:50 -08:00
C. Guy Yarvin
26e5692f90 Merge branch 'radio' of https://github.com/urbit/urbit into radio
Conflicts:
	urb/urbit.pill
2014-12-09 11:14:59 -08:00
C. Guy Yarvin
023f452e63 Rodeo is ready-o. 2014-12-09 11:04:09 -08:00
Philip C Monk
2268e47f5f remove annoying error printfs 2014-12-09 13:58:54 -05:00
Anton Dyudin
f4b98280f4 Merge branch 'master' of https://github.com/urbit/urbit 2014-12-08 19:16:57 -08:00
Anton Dyudin
5722fe448f Moved sanitization logic to ++normalize 2014-12-08 19:16:00 -08:00
Philip C Monk
fa6f84e23a fix some of ford's blocking problems 2014-12-08 21:04:59 -05:00
Philip C Monk
4dacd26a4b Merge branch 'master' of https://github.com/urbit/urbit 2014-12-08 19:01:42 -05:00
Anton Dyudin
83d49bd020 Merge branch 'master' of https://github.com/urbit/urbit 2014-12-08 15:45:23 -08:00
Anton Dyudin
2e8873942a Split mar/down, installed jet hoon-spec 2014-12-08 15:44:20 -08:00
Galen Wolfe-Pauly
0ce235178d Merge branch 'master' of github.com:urbit/urbit 2014-12-08 15:19:27 -08:00
Anton Dyudin
a7f7a55d55 Merge branch 'master' of https://github.com/urbit/urbit 2014-12-08 14:52:40 -08:00
Anton Dyudin
3796d56de7 Moved entity parser to %zuse, cleanup 2014-12-08 14:51:27 -08:00
Galen Wolfe-Pauly
58cd855dd6 md content type update 2014-12-08 14:49:31 -08:00
Anton Dyudin
e34c5317fa Fixed tape !over 2014-12-08 10:41:46 -08:00
C. Guy Yarvin
d2b48300f3 Merge branch 'radio' of https://github.com/urbit/urbit into radio 2014-12-07 20:01:45 -08:00
C. Guy Yarvin
2921578cd5 rodeo compiles; extend gall for trivial bone. 2014-12-07 13:46:31 -08:00
Anton Dyudin
e9b6ebae2b report grow:json compiles 2014-12-06 00:12:52 -08:00
Philip C Monk
dfd63c7745 remove markdown printfs 2014-12-05 20:46:52 -05:00
Anton Dyudin
a4c23968b5 Merge branch 'radio' of https://github.com/urbit/urbit into radio 2014-12-05 17:19:03 -08:00
Anton Dyudin
08cda0da1f radio-command/mar json grabbed 2014-12-05 17:18:31 -08:00
C. Guy Yarvin
92df315233 Stash. 2014-12-05 14:54:11 -08:00
Philip C Monk
bcca4ec405 clean for new era 2014-12-05 16:48:30 -05:00
C. Guy Yarvin
6b5f6b1750 Reverse cousin. 2014-12-05 13:17:49 -08:00
Philip C Monk
8b8d6b12be Merge branch 'master' of https://github.com/urbit/urbit 2014-12-05 16:10:48 -05:00
Philip C Monk
1ba2800be1 clear terminal backlog in ++prep 2014-12-05 16:09:46 -05:00
C. Guy Yarvin
e3e3bee184 Radio structures. 2014-12-05 12:14:00 -08:00
Philip C Monk
445dd6b334 half the markdown jet 2014-12-03 23:58:49 -05:00
C. Guy Yarvin
7d9a4c6073 Add test user-level jet. 2014-12-03 15:21:55 -08:00
Philip C Monk
947bd1cb97 test files 2014-12-03 17:20:41 -05:00
Philip C Monk
068e93e2f6 Merge commit '7894810906c8213feba3ebd7be89b62a6ed89122' as 'outside/commonmark' 2014-12-03 17:03:42 -05:00
Philip C Monk
c365f358e6 Squashed 'outside/commonmark/' content from commit cfb756f
git-subtree-dir: outside/commonmark
git-subtree-split: cfb756f918aad3ef7714f75a06210e564ecb90f9
2014-12-03 17:03:42 -05:00