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
3,081 Commits 768 Branches 10 Tags 215 MiB
485a4d8482
Commit Graph

3081 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Henry Ault
16d4b63594 Merge branch 'master' of https://github.com/urbit/urbit into do 2015-05-10 16:44:53 -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
Henry Ault
2a2aa4fc09 better talk flow 2015-05-07 17:01:25 -07:00
Henry Ault
cf5587c3db message to sender 2015-05-07 16:53:08 -07:00
henry
799baff5a5 Various fixes and improvements -- bit 2015-05-07 19:27:50 -04:00
henry
f0e3a88ea8 precommit 2015-05-07 19:25:22 -04:00
Henry Ault
19c6469956 switch on port # 2015-05-07 15:23:22 -07:00
Henry Ault
12550a7e89 merge local 2015-05-07 15:02:24 -07:00
Henry Ault
4c117a9418 merge test 2015-05-07 14:34:49 -07:00
Henry Ault
c464f0fbb3 fake network 2015-05-07 14:33:18 -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
Henry Ault
fdf8a0639a send bitcoin and view address where you received 2015-05-07 11:26:10 -07: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
Anton Dyudin
b65fc83aa6 Merge branch 'test' 2015-05-07 10:31:10 -07:00
Anton Dyudin
b72da57ce8 Merge branch 'space-tools' into test 
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/time.hoon
 2015-05-07 10:30:32 -07:00
Henry Ault
c77662a009 Merge branch 'do' of http://github.com/urbit/urbit into do 
Conflicts:
	urb/zod/base/app/bit/core.hook
 2015-05-07 02:51:55 -04:00
Henry Ault
478d210298 ported to real network 2015-05-07 02:49:30 -04:00
Henry Ault
4b928f5e22 port forward 2015-05-07 02:47:41 -04:00
C. Guy Yarvin
de80178627 Hand-merge in all newgall files. 2015-05-06 19:31:54 -07:00