urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-15 21:03:10 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,847 Commits 768 Branches 10 Tags 215 MiB
b567343d54
Commit Graph

2847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
C. Guy Yarvin
b567343d54 Merge branch 'test' into livetest 
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/hood/core.hook
	urb/zod/base/arvo/dill.hoon
 2015-05-15 13:34:41 -07:00
C. Guy Yarvin
6b4f6a80f1 Various fixes. 2015-05-15 01:09:12 -07:00
C. Guy Yarvin
9a60d48e21 Various fixes and improvements. 2015-05-14 16:27:45 -07:00
Galen Wolfe-Pauly
ce53f4c5f1 Merge branch of github.com:urbit/urbit into test 2015-05-14 16:07:14 -07:00
Galen Wolfe-Pauly
24f970eb4f not listening 2015-05-14 16:06:56 -07:00
Philip C Monk
53c01ebe81 removed bad printf 2015-05-14 18:45:22 -04:00
Philip C Monk
999e19e3c2 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-05-14 18:37:39 -04:00
Philip C Monk
ed727923ea Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-14 18:01:42 -04:00
Anton Dyudin
6aead63e77 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-14 15:01:39 -07:00
Anton Dyudin
8ba1b0ccf3 switching sole 2015-05-14 15:01:31 -07:00
Anton Dyudin
d02e9e44ff Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-14 14:59:57 -07:00
Anton Dyudin
94aa7c7678 switching sole 2015-05-14 14:59:45 -07:00
Galen Wolfe-Pauly
4a13e03bd9 Merge branch 'test' of github.com:urbit/urbit into test 2015-05-14 14:05:30 -07:00
Galen Wolfe-Pauly
64d6e9696e full talk name 2015-05-14 13:57:12 -07:00
Philip C Monk
ee4a39d600 sped up merges 2015-05-14 16:30:03 -04:00
Anton Dyudin
5ac01defea Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-14 13:13:58 -07:00
Anton Dyudin
6656d49283 switchable websole v1 2015-05-14 13:13:45 -07:00
C. Guy Yarvin
e190e20256 Checking in for fun and profit. 2015-05-14 12:24:43 -07:00
Galen Wolfe-Pauly
ab48a5f0f1 path out of talk 2015-05-14 12:21:13 -07:00
Anton Dyudin
293946d35f Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-14 11:04:49 -07:00
Anton Dyudin
15bcbb23e7 cleaning up %base to %home 2015-05-14 11:04:32 -07:00
C. Guy Yarvin
04379dac6e Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-05-13 17:15:06 -07:00
C. Guy Yarvin
cc2a7defb5 Various fixes and improvements. 2015-05-13 16:31:13 -07:00
Galen Wolfe-Pauly
df358f27c4 Merge branch 'test' of github.com:urbit/urbit into test 2015-05-13 16:22:03 -07:00
Galen Wolfe-Pauly
7d733fd85c whom 2015-05-13 16:21:51 -07:00
Philip C Monk
6cb1505288 fixed merges 2015-05-13 17:18:43 -04:00
C. Guy Yarvin
2b940d9346 Various fixes and improvements; test can :?begin. 2015-05-13 01:02:34 -07:00
Galen Wolfe-Pauly
8b2b182cf1 Merge branch 'test' of github.com:urbit/urbit into test 2015-05-12 15:21:25 -07:00
Galen Wolfe-Pauly
6ac76f9f73 octo frontend 2015-05-12 15:21:10 -07:00
C. Guy Yarvin
30d32255b9 Let %them through. 2015-05-12 15:00:18 -07:00
C. Guy Yarvin
6dcbda8df4 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/helm/core.hook
 2015-05-12 13:36:21 -07:00
C. Guy Yarvin
5665fb132a Various cleanups. 2015-05-12 13:10:22 -07:00
Anton Dyudin
fdbf46ce16 added json octo interfaces 2015-05-12 12:57:58 -07:00
Anton Dyudin
23939c6dfd Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-11 17:51:00 -07:00
Anton Dyudin
5d718597c5 sole transmute fix 2015-05-11 17:50:40 -07:00
C. Guy Yarvin
6952ecaa75 Switch from helm to hood. 2015-05-11 17:43:47 -07:00
C. Guy Yarvin
2cfe3c252b Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-11 17:32:47 -07:00
C. Guy Yarvin
1f2ed6ae76 Merge old helm code into hood/kiln. 2015-05-11 17:31:37 -07:00
Anton Dyudin
0eaaa00f6f cherry-pick 8caa882 'add tym to dojo' 2015-05-11 12:09:41 -07:00
C. Guy Yarvin
9e84fca27e Fix %mack. 2015-05-11 11:16:04 -07:00
C. Guy Yarvin
1a7b72fbe9 Forgot a file. 2015-05-11 11:05:14 -07:00
C. Guy Yarvin
66f7b16d5e Various fixes and improvements. 2015-05-11 10:53:47 -07:00
C. Guy Yarvin
b3027a328b And %gall is reborn. 2015-05-09 15:55:05 -07:00
C. Guy Yarvin
fa5f5dc786 Didn't mean to chek in a broken helm. 2015-05-09 15:35:57 -07:00
C. Guy Yarvin
e7791411cb The great god %gall is dead. 2015-05-09 13:49:11 -07:00
C. Guy Yarvin
33761503cb Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2015-05-09 13:47:51 -07:00
C. Guy Yarvin
b8317260a9 Deprecate old apps to improve name completion. 2015-05-09 13:40:53 -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
Anton Dyudin
49cc3c5c57 Made bad-cookie nonfatal 2015-05-08 17:34:06 -07:00