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
3,241 Commits 768 Branches 10 Tags 215 MiB
bdeb4e4a11
Commit Graph

36 Commits

Author SHA1 Message Date
Philip C Monk
bdeb4e4a11 Merge remote-tracking branch 'origin/test' into newunix 
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/clay.hoon
 2015-06-16 17:44:47 -04:00
Philip C Monk
c0baedb438 mount mostly works 2015-06-11 23:52:42 -04:00
Philip C Monk
b13941458b all compiles 2015-06-09 16:55:07 -04:00
Philip C Monk
07fc0a5def basic clay stuff written, haven't compiled 2015-06-09 15:18:32 -04:00
C. Guy Yarvin
acc4b61cda Merge branch 'demo' of https://github.com/urbit/urbit into demo 
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/clay.hoon
 2015-06-05 15:11:55 -07:00
C. Guy Yarvin
2888822f70 Remove numerous printfs. 2015-06-05 15:07:40 -07:00
Anton Dyudin
89a76c488b Merge branch 'demo' of https://github.com/urbit/urbit into demo 
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/dojo.hoon
 2015-06-05 13:22:29 -07:00
C. Guy Yarvin
7524157829 Various fixes and improvements. 2015-06-04 21:14:07 -07:00
Anton Dyudin
09e4021349 added %core silk, transitioned mar lib ape etc. 2015-06-04 15:16:48 -07:00
Philip C Monk
1357ce6198 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/hood/core.hook
	urb/zod/base/lib/helm/core.hook
 2015-06-03 17:31:37 -04:00
Philip C Monk
3307443e12 use kiln for initial autosync 2015-06-03 17:18:13 -04:00
Anton Dyudin
63ae7612f6 Merge commit 'f073c490f9^' into test 
Conflicts:
	urb/urbit.pill
 2015-06-03 12:54:56 -07:00
Philip C Monk
68f76aecd8 attempting to fix goning problem 2015-06-02 16:40:53 -04:00
C. Guy Yarvin
282a9ec75f Various fixes and improvements. 2015-06-02 11:36:56 -07:00
C. Guy Yarvin
1671375215 Various fixes and improvements. 2015-05-29 01:36:23 -07:00
C. Guy Yarvin
16004b615e Merge branch 'test' into goodtest 
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/dojo/core.hook
	urb/zod/base/ape/hood/core.hook
	urb/zod/base/ape/octo/core.hook
	urb/zod/base/arvo/hoon.hoon
 2015-05-28 12:16:10 -07:00
C. Guy Yarvin
ae67dcdf34 Finish moving ++from into bowl. 2015-05-28 00:56:08 -07:00
C. Guy Yarvin
ec1bb36984 Change lat to now. 2015-05-27 20:54:20 -07:00
C. Guy Yarvin
7e841df093 Replaced hide with bowl. 2015-05-27 20:48:25 -07:00
C. Guy Yarvin
fc07a7e44a Before merging to update gall. 2015-05-27 19:00:53 -07:00
Anton Dyudin
f2e0911933 hiss/sigh typed http requests 2015-05-27 15:34:01 -07:00
Anton Dyudin
b18bc0bc24 Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
	urb/zod/base/pub/tree/src/js/components/CodeMirror.coffee
	urb/zod/base/pub/tree/src/js/main.js
 2015-05-26 15:12:26 -07:00
Anton Dyudin
593aa09701 wip 2015-05-25 18:17:59 -07:00
Philip C Monk
e455574091 improved unix sync 2015-05-20 20:32:54 -04:00
C. Guy Yarvin
6843bd4e04 -T for autoboot. 2015-05-19 11:38:23 -07:00
Philip C Monk
8d5d2f0b32 fixed :+mass 2015-05-18 21:16:32 -04:00
C. Guy Yarvin
3511088d74 Merge branch 'test' into livetest 
Conflicts:
	urb/urbit.pill
 2015-05-18 12:24:58 -07:00
Anton Dyudin
817f7234a2 web dependency tracking injection 2015-05-15 11:28:01 -07:00
C. Guy Yarvin
e190e20256 Checking in for fun and profit. 2015-05-14 12:24:43 -07:00
C. Guy Yarvin
5665fb132a Various cleanups. 2015-05-12 13:10:22 -07:00
C. Guy Yarvin
b3027a328b And %gall is reborn. 2015-05-09 15:55:05 -07:00
C. Guy Yarvin
ea5ab48776 Various fixes and improvements. 2015-05-09 13:38:33 -07:00
C. Guy Yarvin
cf6cd46177 Various fixes and improvements. 2015-05-08 18:08:18 -07:00
C. Guy Yarvin
3295f1797b Hand-merged ford, zuse and hoon from newgall. 2015-05-06 18:41:20 -07:00
Philip C Monk
75d4e2fbad added %next clay subscription type 2015-04-29 21:23:46 -04:00
Philip C Monk
f03263852c main->base, arvo events depth-first 2015-04-29 18:48:45 -04:00