urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-15 04:22:48 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,178 Commits 768 Branches 10 Tags 215 MiB
f837e082b6
Commit Graph

95 Commits

Author SHA1 Message Date
Galen Wolfe-Pauly
f837e082b6 nock spec 2015-06-05 15:45:52 -07:00
Galen Wolfe-Pauly
493c5e1c0a minor cm css 2015-06-05 14:11:03 -07:00
Galen Wolfe-Pauly
8f84e30e44 Merge branch 'demo' of github.com:urbit/urbit into demo 2015-06-05 14:09:12 -07:00
Galen Wolfe-Pauly
5cd6aff30e codemirror css 2015-06-05 14:09:02 -07:00
Anton Dyudin
bfa80ec64b abstract oct3 fab over desk 2015-06-05 12:50:34 -07:00
Henry Ault
4a370a7318 talk bug, instructions in asana 2015-06-05 12:36:58 -07:00
Anton Dyudin
e760115f8a Merge branch 'demo' into test 
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/cloud.hoon
	urb/zod/base/arvo/gall.hoon
	urb/zod/base/mar/oct2-move.hoon
	urb/zod/base/mar/oct2-update.hoon
 2015-06-04 17:16:13 -07:00
Anton Dyudin
b32c688648 Revert "remove docs for demo", "remove odds and ends", "demo network", "DEMO ONLY: root beak as %demo." 
This reverts commit 8e1e40d75b3ab15c194b6bf9570f3edc46e2de58.
This reverts commit f073c490f9fd7c5abc033af4857df92229877de7.
This reverts commit f187d2d7e01a54823f3e979af9bbd148b398e7e9.
This reverts commit bc272862a73cfce1b118586ca39d3a377d841f1b.
 2015-06-04 16:56:30 -07:00
Henry Ault
224939f6e9 trying to booth gce s with external ips 2015-06-03 17:49:20 -07:00
Galen Wolfe-Pauly
5b48108ae6 formatting, &c 2015-06-03 17:29:56 -07:00
Anton Dyudin
75fd854f40 Merge branch 'demo' into test 2015-06-03 13:15:46 -07:00
Galen Wolfe-Pauly
5e54a45902 change path in hymn 2015-06-03 09:36:19 -07:00
Henry Ault
7f16f641bd weird talk bug 2015-06-02 18:36:23 -07:00
C. Guy Yarvin
5b5054e8f6 Various fixes and improvements. 2015-06-02 16:17:55 -07:00
Galen Wolfe-Pauly
e216eb1f36 remove docs for demo 2015-06-02 15:59:27 -07:00
Galen Wolfe-Pauly
c81d742f60 remove odds and ends 2015-06-02 15:59:10 -07:00
Henry Ault
3ddaa35c35 merging cloud front end 2015-06-02 13:20:16 -07:00
Anton Dyudin
3e0e63eaa5 fixed styl mark 2015-05-29 15:05:47 -07:00
Anton Dyudin
19fd175abe misc untrackeditude 2015-05-29 12:09:21 -07:00
Anton Dyudin
11b024858f Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-28 16:34:40 -07:00
Galen Wolfe-Pauly
8888a449cf talk changes 2015-05-28 16:30:06 -07:00
Galen Wolfe-Pauly
fa0d6326c9 octo frontend 2015-05-28 16:16:01 -07:00
Anton Dyudin
1bd371b1cc more liberal casting 2015-05-28 14:36:19 -07:00
Henry Ault
6450ed4ca1 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-26 17:29:15 -07:00
Henry Ault
ae094a05dc updating joint state 2015-05-26 17:29:02 -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
23b190e9de line numbers 2015-05-26 14:52:59 -07:00
Anton Dyudin
991bc3fb3d working tree js 2015-05-26 14:35:30 -07:00
Anton Dyudin
06384f6bc0 re-add CM react 2015-05-26 14:35:30 -07:00
Anton Dyudin
5ffead0ec0 re-add CM react 2015-05-26 14:23:39 -07:00
Anton Dyudin
809c524e70 working tree js 2015-05-26 14:22:49 -07:00
Henry Ault
8918885dd5 create disk, check status 2015-05-25 19:28:08 -07:00
Henry Ault
71754c764b question about error msgs 2015-05-23 13:45:42 -07:00
Henry Ault
8515db0b3a reorganized frontend components 2015-05-21 19:53:50 -07:00
Henry Ault
b5d7375817 Merge branch 'do' into test 2015-05-21 17:24:09 -07:00
Henry Ault
e6d8ec36d0 do->cloud rename 2015-05-21 17:22:56 -07:00
Henry Ault
5703d91b33 ported do to newgall 2015-05-20 18:34:45 -07:00
Anton Dyudin
7e4cf03c93 codemirror tree v1 2015-05-20 15:13:27 -07:00
Henry Ault
2a583c0ee9 Merge branch 'do' of https://github.com/urbit/urbit into do 
Conflicts:
	urb/zod/base/ape/bit/core.hook
 2015-05-20 13:50:42 -07:00
Henry Ault
4ce18a92d2 beginning of GCE auth 2015-05-20 13:49:19 -07:00
Anton Dyudin
ab078ee41a Merge branch 'test' into do 
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/  --  took --theirs
	urb/zod/base/fap/talk/core.hook
 2015-05-20 11:45:37 -07:00
Galen Wolfe-Pauly
2563c63d51 octo front 2015-05-19 16:54:32 -07:00
Galen Wolfe-Pauly
def715e2b1 Merge branch 'test' of github.com:urbit/urbit into test 2015-05-19 16:13:27 -07:00
Galen Wolfe-Pauly
c6aaee6468 octo front 2015-05-19 16:13:22 -07:00
C. Guy Yarvin
ac38430577 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-19 16:10:44 -07:00
C. Guy Yarvin
6e938f99a1 Change to /web. 2015-05-19 16:08:35 -07:00
Galen Wolfe-Pauly
d188d0dfbc talk details 2015-05-19 14:40:12 -07:00
Galen Wolfe-Pauly
ac6195ca2c titles 2015-05-19 13:26:13 -07:00
Galen Wolfe-Pauly
93b3b919d0 talk details 2015-05-19 12:07:37 -07:00
Galen Wolfe-Pauly
8d76510d5f octo css + some extras 2015-05-19 11:54:48 -07:00