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

2821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Anton Dyudin
372928b4ee Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-08 17:17:58 -07:00
Anton Dyudin
52a59d8ef1 fix cached dependencies 2015-05-08 17:13:10 -07:00
Galen Wolfe-Pauly
9667179223 Merge branch 'test' of github.com:urbit/urbit into test 2015-05-08 16:48:05 -07:00
Galen Wolfe-Pauly
369dd1878a tree for editing 2015-05-08 16:47:46 -07:00
C. Guy Yarvin
fbf9930b34 test now switched over to behn. 2015-05-08 16:02:50 -07:00
Galen Wolfe-Pauly
4f1a7b537b fix audience 2015-05-08 15:56:33 -07:00
Galen Wolfe-Pauly
5a0d576bd3 not staging; 2015-05-08 15:15:17 -07:00
Galen Wolfe-Pauly
c24c9e68d9 Merge branch 'test' of github.com:urbit/urbit into test 2015-05-08 15:00:45 -07:00
C. Guy Yarvin
e15fcdbcda Unbreak eyre. 2015-05-08 13:57:34 -07:00
Galen Wolfe-Pauly
cf6bc4d3fc talk updates 2015-05-08 13:29:24 -07:00
C. Guy Yarvin
eee0cbeb4b Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-08 13:28:18 -07:00
C. Guy Yarvin
c58b0611f0 eyre ready to talk to behn. 2015-05-08 13:27:40 -07:00
C. Guy Yarvin
802a76a279 Command-line functionality with %behn. 2015-05-08 12:43:11 -07:00
Anton Dyudin
4a0a43f6b4 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-08 11:26:39 -07:00
Anton Dyudin
e5e3045daf add tym to dojo 2015-05-08 11:26:21 -07:00
C. Guy Yarvin
b0eac3721a Latest stuff hand-merged from %behn. 2015-05-08 10:56:30 -07:00
C. Guy Yarvin
ceb79e045f Prepare the doll. 2015-05-08 10:53:28 -07:00
Anton Dyudin
99c5992ed1 Merge branch 'master' of https://github.com/urbit/urbit to fix #278 
Conflicts:
	urb/urbit.pill
 2015-05-07 14:18:19 -07:00
Anton Dyudin
60eb11a0f7 fix ames begin to talk to gall 2015-05-07 14:17:39 -07:00
Philip C Monk
eccaacd790 revert errant clay change 2015-05-07 16:32:37 -04:00
Galen Wolfe-Pauly
d7a2dd9905 off by one 2015-05-07 12:16:48 -07:00
vere
becc52fecd Revert "test roll 6" 
This reverts commit 638ad719a81d9e58f285c3d17ef4238741da6ff0.
 2015-05-07 19:04:47 +00:00
Galen Wolfe-Pauly
b4f0dc6143 audience 2015-05-07 11:47:25 -07:00
vere
c45ab98654 test roll 6 2015-05-07 18:44:32 +00:00
Galen Wolfe-Pauly
408b2f0cef colors 2015-05-07 10:49:56 -07:00
Anton Dyudin
b8c3720c28 continuity roll 5 2015-05-07 10:36:29 -07:00