Commit Graph

2326 Commits

Author SHA1 Message Date
Philip C Monk
7ae4742d10 boots again 2015-04-16 20:22:39 -04:00
Philip C Monk
8560bae3b8 waypoint 2015-04-14 20:48:37 -04:00
Philip C Monk
2e462a3c0d waypoint 2015-04-13 20:29:54 -04:00
Philip C Monk
b62bacbf1d annotated merges seem to be working 2015-04-13 17:29:39 -04:00
Philip C Monk
9e10039dfc bug fixing 2015-04-08 20:51:34 -04:00
Philip C Monk
c7d8cfd114 mostly working userlevel conflict merge 2015-04-07 18:24:16 -04:00
Philip C Monk
939c129539 bug fixes 2015-04-06 19:20:28 -04:00
Philip C Monk
76fd6824a6 :merge rework 2015-04-03 21:31:57 -04:00
Philip C Monk
ff6a9c3198 ~doznec boots 2015-04-01 19:57:38 -04:00
Philip C Monk
ca85c9728e make subs boot again 2015-03-31 15:52:47 -04:00
Philip C Monk
21e3d981d4 historical .^ 2015-03-30 18:12:18 -04:00
Philip C Monk
c246a061ad notification-only subscription path 2015-03-26 19:26:39 -04:00
Philip C Monk
5c489935cf another round of performance improvements 2015-03-24 19:35:04 -04:00
Philip C Monk
9823077b86 waypoint 2015-03-24 17:46:32 -04:00
Anton Dyudin
cc45140ca6 Cached %bake
Conflicts:
	urb/zod/main/arvo/ford.hoon
	urb/zod/main/mar/react-snip/door.hook
	urb/zod/main/mar/react/door.hook
	v/raft.c
2015-03-24 16:30:30 -04:00
Philip C Monk
a8409da5cf autosync works 2015-03-23 16:40:33 -04:00
Philip C Monk
f8928f908a network clay performance 2015-03-20 15:20:17 -04:00
Philip C Monk
fb6b5245ce validate plops with correct case 2015-03-19 15:34:25 -04:00
Philip C Monk
874c7ea21e performance improvements 2015-03-18 17:25:01 -04:00
Philip C Monk
7c8e49c54f cleanup 2015-03-13 18:52:15 -04:00
Philip C Monk
681b8e3960 subs boot 2015-03-13 17:47:29 -04:00
Philip C Monk
995d006e7a sub downloads files, but doesn't start terminal 2015-03-12 20:38:12 -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
Anton Dyudin
8771f59ff3 Fix #262 2015-03-06 11:27:39 -08: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