Commit Graph

1531 Commits

Author SHA1 Message Date
Anton Dyudin
c76ee92346 transitioned eyre to use weak etags 2015-09-23 13:50:31 -07:00
Philip C Monk
09c6d28d6b bump protocol to 5 2015-09-21 15:08:57 -04:00
Philip C Monk
417dda3aaf Merge remote-tracking branches 'anton/nobreach' and 'my/clayhammer' into test
Conflicts:
	urb/urbit.pill
2015-09-21 14:58:10 -04:00
Joan Torres
cb8e5f41df Add ++skid jet 2015-09-19 10:03:13 -07:00
Philip C Monk
06bda9cd8c fixed lose-changes-when-unrelated-conflict bug 2015-09-18 20:15:36 -04:00
Philip C Monk
081da0eee4 Merge remote-tracking branch 'my/pending' into test
Conflicts:
	urb/urbit.pill
2015-09-17 14:51:01 -04:00
Philip C Monk
5de171f23d RIP %indirect 2015-09-16 19:45:54 -04:00
Philip C Monk
a84fb403f6 turn off autoload with |autoload 2015-09-16 19:40:53 -04:00
Anton Dyudin
cf5a8c79c2 fix tree, per-day talk output format, rendering 2015-09-16 15:52:40 -07:00
Philip C Monk
aaa9022a48 autoreload and autoreset 2015-09-16 18:39:11 -04:00
Joan Torres
58ddbe73fa Add ++reap jet 2015-09-16 13:50:36 -07:00
Philip C Monk
3bfe641b1c added |cancel 2015-09-15 20:24:44 -04:00
Anton Dyudin
fe05f3080c /- /+ dojo syntax 2015-09-15 16:27:19 -07:00
Philip C Monk
852bd5a202 Merge branch 'master' into clayhammer 2015-09-15 19:16:09 -04:00
Joan Torres
7699134470 Add ++murn jet 2015-09-15 13:59:00 -04:00
Philip C Monk
a4634d96f1 Merge remote-tracking branch 'anton/nobreach' into pending 2015-09-11 20:39:24 -04:00
Philip C Monk
77eb638240 merge clay card-sending pathways 2015-09-11 20:27:32 -04:00
Anton Dyudin
05e37b73b6 extensible urb.onupdate 2015-09-11 12:20:19 -07:00
Anton Dyudin
86a423b4d4 better mark type handling 2015-09-11 10:54:28 -07:00
Philip C Monk
73a5596168 %init doesn't require new desk 2015-09-10 20:25:27 -04:00
Philip C Monk
f75b8a1370 change some our's to her's 2015-09-10 18:37:19 -04:00
Philip C Monk
16cb3f3961 pull marks from correct ships 2015-09-10 17:49:22 -04:00
Philip C Monk
5a71800fb8 Merge branch 'clayhammer' into pending
Conflicts:
	urb/urbit.pill
	urb/zod/ape/dojo.hoon
	urb/zod/arvo/zuse.hoon
	urb/zod/lib/drum.hoon
	urb/zod/lib/helm.hoon
	urb/zod/lib/kiln.hoon

Also bumped protocol to 4
2015-09-09 19:15:26 -04:00
Philip C Monk
10d91a0c4d Merge remote-tracking branch 'origin/test' into pending 2015-09-09 17:32:02 -04:00
Philip C Monk
13a01c3e36 merge from commit rather than desk 2015-09-09 17:08:10 -04:00
Anton Dyudin
cdc47047d7 Merge branch 'pending' into test 2015-09-08 13:28:15 -07:00
vere
a3a93b6dac fix crash 2015-09-08 19:24:31 +00:00
Philip C Monk
d0389ec2c1 reworked ++ankh and ++soba 2015-09-05 21:14:00 -04:00
Philip C Monk
584dc5e9a9 fixed some bugs 2015-09-04 20:15:05 -04:00
Philip C Monk
490798b908 disallow multiple simultaneous merges to same desk 2015-09-03 17:14:35 -04:00
Philip C Monk
4ec8907b39 performance improvements 2015-09-03 17:14:35 -04:00
Anton Dyudin
41553bd749 changed ford semantics to stick libraries into one core 2015-09-03 17:14:34 -04:00
Anton Dyudin
8ee93321de qualified library names in userspace 2015-09-03 17:14:34 -04:00
Anton Dyudin
4a911fd279 Sur disqualification "*" removed from %ford 2015-09-03 17:14:34 -04:00
Anton Dyudin
31e6e4cb80 more informative |mass for ford and gall 2015-09-03 17:14:33 -04:00
Anton Dyudin
a2d2d54f13 instrumented %eyre for mass 2015-09-03 17:14:23 -04:00
Anton Dyudin
9f6db73bd5 changed ford semantics to stick libraries into one core 2015-09-01 17:25:35 -07:00
Anton Dyudin
7ca85f7989 qualified library names in userspace 2015-09-01 16:54:16 -07:00
Anton Dyudin
4b04b24e86 Sur disqualification "*" removed from %ford 2015-09-01 14:19:22 -07:00
Anton Dyudin
9f6bb36ce7 more informative |mass for ford and gall 2015-09-01 13:09:18 -07:00
vere
aca6beec28 ignore bad %went in gall 2015-09-01 17:38:21 +00:00
Anton Dyudin
406eae5b90 instrumented %eyre for mass 2015-08-31 17:48:24 -07:00
Philip C Monk
09966db7b5 bump protocol to 3 2015-08-31 20:18:07 -04:00
Anton Dyudin
50884e7360 Merge branch 'apps' into test 2015-08-31 17:06:12 -07:00
Galen Wolfe-Pauly
4161954c17 mobile login, lite mobile work, mark done in store 2015-08-27 16:16:55 -07:00
Anton Dyudin
1fc367377a eyre cookie code was missing a '; Domain=' in some cases. Fixed #340 2015-08-27 12:48:15 -07:00
Anton Dyudin
42bccb9005 fix node_modules overflow 2015-08-27 11:47:45 -07:00
Alex Higgins
cd25ee7eb5 Jet ++xeb 2015-08-27 05:31:10 -05:00
Anton Dyudin
86d01d9903 more informative gall error reporting 2015-08-20 12:31:12 -07:00
Philip C Monk
eef09135c2 Merge branch 'apps' of https://github.com/urbit/urbit into work 2015-08-19 20:37:53 -04:00