urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-14 20:02:51 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,824 Commits 768 Branches 10 Tags 215 MiB
df358f27c4
Commit Graph

2824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
C. Guy Yarvin
c4980f2563 Merge branch 'master' of https://github.com/urbit/urbit 2015-04-30 17:14:53 -07:00
Philip C Monk
8dd242fdb2 Merge branch 'typedclay' 2015-04-30 18:12:00 -04:00
Philip C Monk
f7565dc039 Merge branch 'dropped' into typedclay 2015-04-30 18:08:52 -04:00
C. Guy Yarvin
5d107f88d7 Merge branch 'master' of https://github.com/urbit/urbit 2015-04-30 15:06:16 -07:00
Anton Dyudin
253eb6c4c8 Merge remote-tracking branch 'origin/master' into test 2015-04-30 14:09:52 -07:00
Philip C Monk
38e20772a6 Merge branch 'master' of https://github.com/urbit/urbit 2015-04-30 17:09:18 -04:00
Philip C Monk
a672eb691e forgot to commit cat/helm/unix 2015-04-30 17:09:02 -04:00
Philip C Monk
7fc4a1a24e Merge remote-tracking branch 'origin/master' into test 2015-04-30 17:02:20 -04:00
Philip C Monk
b97b04a552 get rid of swapfile 2015-04-30 17:01:41 -04:00
Anton Dyudin
5a16059089 swap files! 2015-04-30 14:01:33 -07:00
Philip C Monk
6457c00c28 comment out %camping 2015-04-30 15:58:39 -04:00
Anton Dyudin
8240fc7723 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-04-30 12:49:17 -07:00
Anton Dyudin
7ebfeda9a5 fixed main/ imports to base/ 2015-04-30 12:37:46 -07:00
Philip C Monk
d30dfc5270 bumped protocol number to 3 2015-04-30 14:52:51 -04:00
Philip C Monk
fb74e61885 moved ford dependencies to new model 2015-04-30 14:37:22 -04:00
Philip C Monk
75d4e2fbad added %next clay subscription type 2015-04-29 21:23:46 -04:00
Philip C Monk
ed698889f6 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-04-29 19:03:59 -04:00
Philip C Monk
f03263852c main->base, arvo events depth-first 2015-04-29 18:48:45 -04:00
Anton Dyudin
d6f18401c6 stub out unsubscription checking 2015-04-29 12:43:14 -07:00
Anton Dyudin
171a42cf5b Init ease tracking 2015-04-29 11:57:48 -07:00
Anton Dyudin
858d47600f Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-04-28 18:18:20 -07:00
Anton Dyudin
c362047b74 somewhat broken 2015-04-28 17:43:23 -07:00
Philip C Monk
7c932f455e removed %scrying printf 2015-04-28 18:28:02 -04:00
Philip C Monk
7718f4e32f fix %tabl cache handling 2015-04-28 18:11:53 -04:00
Philip C Monk
e39cfecded Merge branch 'typedclay' into test 2015-04-28 17:39:07 -04:00
Philip C Monk
2547c08f67 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-04-28 17:39:03 -04:00
Philip C Monk
f073b515f6 fixed %cy hashes and allow de-sync from unix 2015-04-28 17:36:37 -04:00
Galen Wolfe-Pauly
6b3e74a284 Merge branch 'test' of github.com:urbit/urbit into test 2015-04-28 14:03:36 -07:00
Galen Wolfe-Pauly
f58a43c327 docs up to working date 2015-04-28 14:03:11 -07:00
Anton Dyudin
4a3c08e8f1 gall no longer talks to clay 2015-04-28 13:02:32 -07:00
Galen Wolfe-Pauly
584fdf569a talk polish 2015-04-28 12:00:46 -07:00
Philip C Monk
7a21ebcd85 Merge branch 'typedclay' into test 2015-04-28 14:20:40 -04:00
Philip C Monk
280728d1f3 sync to main-away 2015-04-28 14:20:22 -04:00
Anton Dyudin
4c59877cdf slightly fixed stack traces 2015-04-27 17:46:55 -07:00
Philip C Monk
ea2c2e2a8d local merge checkout optimization 2015-04-27 17:29:56 -04:00
Philip C Monk
de8ff5c595 fixd deeper hash bug 2015-04-24 19:35:24 -04:00
Philip C Monk
0fc29d1a38 fixed hash bug 2015-04-24 17:07:34 -04:00
Philip C Monk
df357653e9 send merge messages to talk 2015-04-24 16:03:23 -04:00
Philip C Monk
ca788cac3c Merge remote-tracking branch 'origin/test' into typedclay 
Conflicts:
	urb/urbit.pill
	urb/zod/main/app/helm/core.hook
	urb/zod/main/arvo/ford.hoon
 2015-04-23 20:46:25 -04:00
Philip C Monk
75e4b36d36 port merge tools to dojo model 2015-04-23 20:34:36 -04:00
Galen Wolfe-Pauly
6e76dc5ecb better links, tree fix 2015-04-23 13:58:43 -07:00
Galen Wolfe-Pauly
8dc26c3eb6 working on links 2015-04-23 13:43:47 -07:00
Galen Wolfe-Pauly
0cce8e35d3 anchor links 2015-04-23 11:34:19 -07:00
Galen Wolfe-Pauly
51f90fd136 working on type 2015-04-23 11:32:38 -07:00
Galen Wolfe-Pauly
34f235bab2 whoops, live links 2015-04-22 17:45:12 -07:00
Galen Wolfe-Pauly
f78916e2ad Merge branch 'test' of github.com:urbit/urbit into test 2015-04-22 17:43:58 -07:00
Galen Wolfe-Pauly
a8dd15c34d a cleaner library 2015-04-22 17:43:52 -07:00
Philip C Monk
dd0716eb72 Merge branch 'master' into typedclay 
Conflicts:
	n/t.c
	urb/urbit.pill
	urb/zod/main/app/reload/core.hook
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/solid/core.hook
	urb/zod/main/arvo/dill.hoon
	urb/zod/main/arvo/eyre.hoon
	urb/zod/main/arvo/ford.hoon
	urb/zod/main/arvo/gall.hoon
	urb/zod/main/arvo/hoon.hoon
	urb/zod/main/mar/json/door.hook
	urb/zod/main/mar/md/door.hook
	urb/zod/main/mar/txt/door.hook
	v/raft.c
	v/unix.c
 2015-04-22 20:18:19 -04:00
Anton Dyudin
459be5899f 80 column violation 2015-04-22 15:55:46 -07:00
Anton Dyudin
1287173dc7 more ctrl keys 2015-04-22 15:35:35 -07:00