Commit Graph

1400 Commits

Author SHA1 Message Date
Max G
9e80712633 fixed indentation, better salsa20 columnround 2015-06-20 06:01:09 +03:00
Philip C Monk
63a94bc415 fix no-sync-duct bug 2015-06-19 18:08:57 -04:00
Philip C Monk
72ef5c2cbd urb/zod/base -> urb/zod 2015-06-19 17:16:48 -04:00
Philip C Monk
f55f5bc295 moving stuff around 2015-03-11 20:37:37 -04:00
Philip C Monk
7bf9db3b1a merging across network works 2015-03-11 15:43:44 -04:00
Philip C Monk
7c04b9b9f8 boots 2015-03-10 20:54:39 -04:00
Philip C Monk
3406a1e9a4 waypoint 2015-03-10 19:56:08 -04:00
Philip C Monk
5f08f67e54 waypoint 2015-03-10 17:11:48 -04:00
Philip C Monk
030cae0cde waypoint 2015-03-10 17:09:53 -04:00
Philip C Monk
277a301036 Merge remote-tracking branch 'origin/master' into typedclay
Conflicts:
	urb/urbit.pill
2015-03-10 15:47:22 -04:00
Philip C Monk
ceb3c30a45 add fake network acceleration 2015-03-10 15:07:34 -04:00
Philip C Monk
c5fb969904 remove extraneous printfs 2015-03-09 17:36:04 -04:00
Philip C Monk
1d6e199d65 merging across network tentatively works 2015-03-06 17:28:55 -05:00
Philip C Monk
459604b7df first over-the-network typed merge 2015-03-06 16:07:34 -05:00
Anton Dyudin
b692b1d75c slab -> slob
Conflicts:
	urb/zod/arvo/ford.hoon
2015-03-06 16:07:26 -05:00
Philip C Monk
4f2e514563 waypoint 2015-03-05 20:19:54 -05:00
Philip C Monk
31d3788115 Merge remote-tracking branch 'origin/master' into typedclay
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/eyre.hoon
	urb/zod/arvo/hoon.hoon
	urb/zod/arvo/zuse.hoon
	urb/zod/main/app/poke/core.hook
	urb/zod/main/app/reboot/core.hook
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/tree/core.hook
2015-03-05 18:27:07 -05:00
Philip C Monk
092a2822e9 progress toward sub-booting 2015-03-04 19:36:29 -05:00
Philip C Monk
55e8072b3b arvo side of getting subs to boot 2015-03-03 20:05:41 -05:00
Philip C Monk
0e024a009f move along, nothing to see here 2015-02-27 01:35:41 -05:00
Galen Wolfe-Pauly
ee14edfcc2 botched that, deft correct 2015-02-09 14:15:34 -08:00
Galen Wolfe-Pauly
4d68d1cdec revert anton pending, fix deft 2015-02-09 13:43:22 -08:00
Anton Dyudin
b2188de9e2 Fixed extension parsing for non-term URLs 2015-02-09 13:35:58 -08:00
vere
833e522ff1 Continuity roll 2 2015-02-06 21:24:47 +00:00
Galen Wolfe-Pauly
2bec93ba70 Merge branch 'master' of github.com:urbit/urbit-new 2015-02-04 14:59:40 -08:00
Galen Wolfe-Pauly
b3a3db6c5a ford rune changes 2015-02-03 10:41:17 -08:00
Anton Dyudin
def54e2321 Actually put out eyre fires 2015-01-30 18:18:22 -08:00
Anton Dyudin
4d17234fd6 Put out eyre fires 2015-01-30 17:48:22 -08:00
Anton Dyudin
db05158f71 Merge branch 'test'
Conflicts:
	urb/urbit.pill
2015-01-29 11:17:01 -08:00
Anton Dyudin
9cdab44c9b Eyre js auth redirect: req script under /gop, get window.location change 2015-01-27 12:21:43 -08:00
Philip C Monk
2f9510f764 Merge remote-tracking branch 'origin/test'
Conflicts:
	urb/urbit.pill
2015-01-27 00:28:33 -05:00
Philip C Monk
a73da6dbff bump protocol to 1 2015-01-26 23:38:19 -05:00
C. Guy Yarvin
a1fd3597e6 Turn off gall queue management, temporarily. 2015-01-26 18:54:14 -08:00
C. Guy Yarvin
8c0e89949b Stage down to 163. 2015-01-26 16:25:27 -08:00
Anton Dyudin
50f19ec56f eyre double-unsub hackaround 2015-01-26 15:30:50 -08:00
Anton Dyudin
205d1868ec Type printer crash fix 2015-01-26 15:24:31 -08:00
Galen Wolfe-Pauly
b39b85009d Merge branch 'test' of github.com:urbit/urbit-new into test 2015-01-26 14:44:02 -08:00
Galen Wolfe-Pauly
441393137a eyre change 2015-01-26 14:43:47 -08:00
C. Guy Yarvin
1ebd16fd2a Various fixes and improvements. 2015-01-26 14:41:24 -08:00
C. Guy Yarvin
0e6434f3ee Merge branch 'test' of https://github.com/urbit/urbit into test 2015-01-26 14:31:06 -08:00
C. Guy Yarvin
353ff78e34 Various fixes. 2015-01-26 14:31:00 -08:00
Anton Dyudin
c1c4b3b75a Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-01-26 14:12:50 -08:00
Anton Dyudin
52c26318fe ^X fix, flit cleaning 2015-01-26 13:53:35 -08:00
C. Guy Yarvin
cc07287e80 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-01-26 12:55:52 -08:00
C. Guy Yarvin
36bfe2ab63 Fix general unsubscribe. 2015-01-26 12:54:45 -08:00
Anton Dyudin
db5fd67914 fel:stab, fel:pick 2015-01-26 11:15:35 -08:00
Anton Dyudin
c9caa1538e Merge branch 'exec' into test
Conflicts:
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/terminal/core.hook
2015-01-25 21:29:21 -08:00
Anton Dyudin
cffbe9b15b Polling, sort of 2015-01-23 21:16:12 -08:00
Galen Wolfe-Pauly
6627ea38d1 simpler auth 2015-01-23 10:07:05 -08:00
Anton Dyudin
ac1552ee69 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-01-22 14:16:19 -08:00