Commit Graph

944 Commits

Author SHA1 Message Date
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
277a301036 Merge remote-tracking branch 'origin/master' into typedclay
Conflicts:
	urb/urbit.pill
2015-03-10 15:47:22 -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
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
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
c1fcc47513 talk in 2015-02-18 14:25:58 -08:00
Galen Wolfe-Pauly
261fcc9029 better snips 2015-02-17 12:53:06 -08: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
Galen Wolfe-Pauly
b796b9d8e0 class -> className 2015-02-03 13:01:24 -08:00
Galen Wolfe-Pauly
1fee5836ee react mar 2015-01-30 18:02:40 -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
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
Galen Wolfe-Pauly
ea2ca20e25 Merge branch 'master' into test 2015-01-27 09:01:25 -08:00
Anton Dyudin
189c20d7db Twitter subscribing, surface tested via web UI 2015-01-27 00:19:18 -08:00
Anton Dyudin
e375adabb8 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-01-26 22:21:30 -08:00
Anton Dyudin
8a8ff60aaa Tweet confirmations 2015-01-26 22:20:39 -08:00