C. Guy Yarvin
|
7bef988d9b
|
Rotate to protocol version 6 for continuity breach.
|
2015-10-17 13:39:57 -07:00 |
|
C. Guy Yarvin
|
9d40d206e3
|
Merge cgyarvin fixes into test.
|
2015-10-17 13:01:38 -07:00 |
|
Anton Dyudin
|
39108ab80e
|
Merge branch 'nobreach' into test
|
2015-10-15 15:49:09 -07:00 |
|
Anton Dyudin
|
34a187fdb6
|
check for empty revision
|
2015-10-13 11:57:56 -07:00 |
|
C. Guy Yarvin
|
e7e9fdeaa0
|
Merge branch 'test' of https://github.com/urbit/urbit into karpi
Conflicts:
urb/urbit.pill
|
2015-10-12 17:10:56 -07:00 |
|
C. Guy Yarvin
|
f979e96d10
|
Doc fixes and changes to match.
|
2015-10-09 18:31:07 -07:00 |
|
Anton Dyudin
|
e5ff969867
|
Merge branch 'master' of https://github.com/urbit/urbit into nobreach
|
2015-10-09 10:56:57 -07:00 |
|
Raymond Pasco
|
4f961d6074
|
Correct off by one in ++gulf
|
2015-10-08 19:35:33 -04:00 |
|
Anton Dyudin
|
98fc5f5d2f
|
Merge branch 'nobreach' into test
|
2015-10-07 11:28:28 -07:00 |
|
Anton Dyudin
|
769f656e46
|
remove fcgi printf
|
2015-10-06 15:35:32 -07:00 |
|
Anton Dyudin
|
65e6826053
|
remove eyre jam measure
|
2015-10-05 17:25:18 -07:00 |
|
Raymond Pasco
|
777924283d
|
Create planets with a %kids desk
|
2015-10-05 16:48:55 -04:00 |
|
Anton Dyudin
|
d5438b51f0
|
stray cast
|
2015-10-02 15:06:32 -07:00 |
|
Anton Dyudin
|
8e00ec8cce
|
fixed ++less to return correct end position
|
2015-10-02 14:58:03 -07:00 |
|
Philip C Monk
|
03f27e4b77
|
Merge branch 'master' into test
|
2015-10-02 16:37:58 -04:00 |
|
Anton Dyudin
|
58e86fb223
|
No ford profiling
|
2015-09-29 12:15:01 -07:00 |
|
Philip C Monk
|
1a02d31022
|
fix timers
|
2015-09-28 20:48:30 -04:00 |
|
Anton Dyudin
|
a243f2a59a
|
ford profiling
|
2015-09-25 16:05:40 -07:00 |
|
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 |
|