Commit Graph

2300 Commits

Author SHA1 Message Date
C. Guy Yarvin
24385894dd Fix bone 0. 2014-12-10 21:42:02 -08:00
Galen Wolfe-Pauly
22859f89ee easier test 2014-12-10 21:03:32 -08:00
Galen Wolfe-Pauly
da450af760 easier test 2014-12-10 21:02:38 -08:00
Galen Wolfe-Pauly
88e2ce9cf2 Merge branch 'radio' of github.com:urbit/urbit-new into radio 2014-12-10 20:43:32 -08:00
Galen Wolfe-Pauly
4bf92c7661 also hymn 2014-12-10 20:43:22 -08:00
Anton Dyudin
4c6a7ccbe4 Merge branch 'radio' of https://github.com/urbit/urbit into radio 2014-12-10 20:43:16 -08:00
Anton Dyudin
750dbcf550 Proxy courtesy @hoontap 2014-12-10 20:42:48 -08:00
Galen Wolfe-Pauly
f2e3acc423 Merge branch 'radio' of github.com:urbit/urbit-new into radio 2014-12-10 20:39:31 -08:00
Galen Wolfe-Pauly
75b7565627 test case 2014-12-10 20:39:09 -08:00
C. Guy Yarvin
70d4766518 Don't reset ost. 2014-12-10 20:29:09 -08:00
C. Guy Yarvin
b6c448e8a9 Merge branch 'radio' of https://github.com/urbit/urbit into radio
Conflicts:
	urb/zod/main/app/talk/core.hook
2014-12-10 16:33:34 -08:00
C. Guy Yarvin
7b4186b719 Don't give on bone 0. 2014-12-10 16:31:39 -08:00
Anton Dyudin
a2e4eb27de join command 2014-12-10 16:02:02 -08:00
Anton Dyudin
2e584a0451 Merge branch 'radio' of https://github.com/urbit/urbit into radio 2014-12-10 15:34:11 -08:00
Anton Dyudin
45ff25509a host/join parsers 2014-12-10 15:33:22 -08:00
C. Guy Yarvin
cfc0849a4d Add grams. 2014-12-10 15:32:46 -08:00
Galen Wolfe-Pauly
ba03df2dd3 js testing 2014-12-10 15:22:25 -08:00
C. Guy Yarvin
976ddaf907 More rodeo. 2014-12-10 14:50:40 -08:00
Anton Dyudin
288261d9ff Working? :talk 2014-12-10 13:10:30 -08:00
C. Guy Yarvin
4090e05a03 Talk. 2014-12-10 12:09:01 -08:00
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