Commit Graph

2295 Commits

Author SHA1 Message Date
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
8777772efa basic userspace merge tool 2015-03-02 20:28:32 -05:00
Philip C Monk
0e024a009f move along, nothing to see here 2015-02-27 01:35:41 -05:00
Galen Wolfe-Pauly
ec2b8f56fd doc -> docs 2015-02-24 11:33:50 -08:00
Galen Wolfe-Pauly
bbcea8c08f moved into doc desk 2015-02-23 15:28:09 -08:00
C. Guy Yarvin
27fa5ed8e2 Merge branch 'master' of https://github.com/urbit/urbit 2015-02-19 15:19:25 -08:00
Galen Wolfe-Pauly
8f2c89287e keyboard events, type preen 2015-02-18 19:28:39 -08:00
Galen Wolfe-Pauly
4383b6138d merge master 2015-02-18 18:51:04 -08:00
Galen Wolfe-Pauly
1323064f84 type details 2015-02-18 16:55:12 -08:00
Galen Wolfe-Pauly
c1fcc47513 talk in 2015-02-18 14:25:58 -08:00
Galen Wolfe-Pauly
fbcaea0798 runes structure and no console logs 2015-02-18 11:29:46 -08:00
Galen Wolfe-Pauly
4f3329b01d Merge branch 'master' into doc 2015-02-18 09:00:51 -08:00
Galen Wolfe-Pauly
2ea66a0114 docs and tree 2015-02-17 19:03:21 -08:00
Galen Wolfe-Pauly
d10ee595fa Merge branch 'master' of github.com:urbit/urbit-new 2015-02-17 12:53:13 -08:00
Galen Wolfe-Pauly
261fcc9029 better snips 2015-02-17 12:53:06 -08:00
Henry Ault
e0986a89b7 Merge branch 'master' of https://github.com/urbit/urbit 2015-02-10 12:20:01 -08: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
C. Guy Yarvin
fb05c0f38b Merge branch 'master' of https://github.com/urbit/urbit 2015-02-06 14:49:22 -08:00
vere
833e522ff1 Continuity roll 2 2015-02-06 21:24:47 +00:00
Anton Dyudin
f487f457ab sen disable 2015-02-06 12:56:21 -08:00
Anton Dyudin
4236ddf20d ++print refactoring 2015-02-06 12:46:30 -08:00
Anton Dyudin
55e6a1492e Backlog de-flop 2 2015-02-06 12:40:54 -08:00
Anton Dyudin
fd47960fc2 ++send cleaning 2015-02-06 12:32:18 -08:00
Anton Dyudin
a34f82f829 Fixed state erasure 2015-02-06 12:24:30 -08:00
Galen Wolfe-Pauly
886a91c15f need the psal garb 2015-02-04 17:23:47 -08: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
dde694b535 snips 2015-02-04 14:59:15 -08:00
C. Guy Yarvin
5bab244d71 Merge branch 'master' of https://github.com/urbit/urbit 2015-02-04 10:29:32 -08:00
Galen Wolfe-Pauly
b796b9d8e0 class -> className 2015-02-03 13:01:24 -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
Galen Wolfe-Pauly
1fee5836ee react mar 2015-01-30 18:02:40 -08:00
Anton Dyudin
4d17234fd6 Put out eyre fires 2015-01-30 17:48:22 -08:00
Anton Dyudin
8bbe811ad1 Curl utility 2015-01-29 18:36:00 -08:00
Galen Wolfe-Pauly
97e1eacfc0 Merge branch 'test' of github.com:urbit/urbit-new into test 2015-01-29 17:50:44 -08:00
Galen Wolfe-Pauly
26d26af927 react door 2015-01-29 17:50:35 -08:00
Anton Dyudin
db05158f71 Merge branch 'test'
Conflicts:
	urb/urbit.pill
2015-01-29 11:17:01 -08:00
Galen Wolfe-Pauly
7374ea3a96 Merge branch 'master' of github.com:urbit/urbit-new 2015-01-28 07:13:42 -08:00
Galen Wolfe-Pauly
51708dd145 begin de flopped 2015-01-28 07:13:30 -08:00
Anton Dyudin
b663c8974b Added :time 2015-01-27 22:27:35 -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