urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-14 11:08:45 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,073 Commits 768 Branches 10 Tags 215 MiB
9c39abae1c
Commit Graph

1073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
C. Guy Yarvin
9c39abae1c Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-21 15:54:29 -07:00
C. Guy Yarvin
2b5e57de2d Replace ++logo with ++mark to match doc. 2014-07-21 15:14:52 -07:00
Anton Dyudin
847253d685 fixed %eyre urb.user inject 2014-07-21 13:38:46 -07:00
Galen Wolfe-Pauly
0ddba5cf1b Merge branch 'master' of https://github.com/urbit/urbit 2014-07-21 11:42:07 -07:00
Galen Wolfe-Pauly
59a5281541 preened urb.js 2014-07-21 11:42:02 -07:00
John Dulin
383b75a47b Merge branch 'master' of https://github.com/urbit/urbit 2014-07-20 23:19:05 -07:00
John Dulin
5152f23085 Added asset [ship guid] logo to /main/sys for streams subscription messages 2014-07-20 23:18:56 -07:00
C. Guy Yarvin
3378245281 Functional build skeleton. 2014-07-20 20:15:02 -07:00
C. Guy Yarvin
ac488f6225 We are very close to the memory limit on :solid! 2014-07-18 19:45:10 -07:00
C. Guy Yarvin
925ae8ccb7 Merge branch 'master' of github.com:urbit/urbit 2014-07-18 17:51:37 -07:00
C. Guy Yarvin
79b91ebd7a New ford skeleton; some hoon cleanups 2014-07-18 17:51:22 -07:00
pcmonk
372ece59d3 unsubscriptions through %eyre 2014-07-18 12:23:35 -07:00
pcmonk
dd7400682b Merge branch 'eyre-stuff' 
Conflicts:
	urb/urbit.pill
 2014-07-17 16:16:28 -07:00
pcmonk
895b4a8f84 clients divorced from apps, streams multiplexed 2014-07-17 16:11:00 -07:00
C. Guy Yarvin
2260d31b1c Merge branch 'master' of github.com:urbit/urbit 2014-07-17 13:56:22 -07:00
C. Guy Yarvin
f3e3eb01e0 Preparing to integrate new ford. 2014-07-17 13:56:08 -07:00
johncburnham
5987ff2f8d improved xml parser 2014-07-16 19:46:46 -07:00
pcmonk
20574f69f7 more work on eyre-stuff -- compiles 2014-07-16 19:10:13 -07:00
Jared Hance
7faf70e14d Some klay changes. 2014-07-16 15:14:12 -04:00
C. Guy Yarvin
b9b6d522b9 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-16 11:56:15 -07:00
C. Guy Yarvin
5b8844207e Minor tweaks. 2014-07-16 11:54:53 -07:00
pcmonk
2df55edb87 Bump protocol number 2014-07-16 11:25:22 -07:00
Jared Hance
3c85c88040 Merge branch 'clay' 
Conflicts:
	urb/urbit.pill
 2014-07-16 13:56:34 -04:00
johncburnham
bbe73c468f added an xml parser 2014-07-15 22:47:43 -07:00
pcmonk
3fafa64ed5 initial work on eyre changes 2014-07-15 19:30:29 -07:00
Anton Dyudin
ecb2ebf79b zl:jo no longer builds faceless poles 2014-07-15 16:07:39 -07:00
Jared Hance
0dbe195676 nori -> yaki. 2014-07-15 15:40:57 -04:00
Jared Hance
072c87e5fb Better klay zerg. 2014-07-15 14:58:49 -04:00
Jared Hance
08a48d88e4 Add klay.hoon. 2014-07-15 14:41:48 -04:00
pcmonk
92f7bddcd8 unkludged eyre heartbeat 2014-07-14 19:45:04 -07:00
Jared Hance
e086185603 Add ++reap. 
Makes constructing lists for testing alot nicer.
 2014-07-14 11:59:16 -04:00
C. Guy Yarvin
ff5e56a05c Move silks around, etc. 2014-07-12 11:24:52 -07:00
pcmonk
f20944f107 Finished heartbeat 2014-07-11 19:02:11 -07:00
pcmonk
5acce9cc04 checkpoint 2014-07-11 16:44:33 -07:00
Jared Hance
58e1f03655 Ugly ++lize stuff. 
Well, merges work better, two-way parties seem fine with merging back
and forth.
 2014-07-11 14:05:07 -04:00
pcmonk
d20aee378b initial work on eyre heartbeat 2014-07-10 19:40:58 -07:00
C. Guy Yarvin
efde5692ed Fix some path reversal bugs. 2014-07-10 16:13:42 -07:00
Jared Hance
8e5c44a628 Update mergepoints. 2014-07-10 16:54:28 -04:00
pcmonk
9ec4de8d6b %lean is gone, long live %mean 2014-07-10 13:10:41 -07:00
Jared Hance
057ff37574 Clay revision control basically works. 
Just need to update the agons, coming soon.
 2014-07-10 16:07:48 -04:00
Jared Hance
7eb4282f33 Finish ++alne. 2014-07-10 15:24:22 -04:00
Jared Hance
d9782a5b5f Merges work again. 2014-07-10 15:13:42 -04:00
pcmonk
0dd086550d add timestamps and textual names for = in chat 2014-07-10 12:01:24 -07:00
pcmonk
2f2112f153 bump protocol number for breach 2014-07-10 11:21:49 -07:00
pcmonk
6f66d66f16 chat entering not reported bug fixed 2014-07-10 11:05:20 -07:00
pcmonk
aba680d1a8 Merge branch 'master' of https://github.com/urbit/urbit 2014-07-10 10:42:46 -07:00
pcmonk
8b8e1218fd chat private messaging prompt now persistent 2014-07-10 10:42:05 -07:00
Jared Hance
8c7281a330 Modify the data flow in zuse. 
Gets the ++niku passed around everywhere, so we have enough information
to actually merge.
 2014-07-10 10:45:17 -04:00
Jared Hance
07998df9e1 Add ++niku to ++saba. 2014-07-10 10:38:53 -04:00
Jared Hance
d549b6a4fe Fix revision origin. 2014-07-10 10:24:29 -04:00