Commit Graph

3136 Commits

Author SHA1 Message Date
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
Anton Dyudin
276042f78e Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-26 13:57:30 -07:00
Anton Dyudin
c2641a464a gage unwinding stable 2015-05-26 13:56:21 -07:00
Henry Ault
e6a6f40405 pre-state unification 2015-05-26 13:47:57 -07:00
Anton Dyudin
cab4b671a6 reloads 2015-05-26 13:24:14 -07:00
C. Guy Yarvin
b50faa769b octo, possibly almost perfect. 2015-05-25 21:00:34 -07:00
Henry Ault
7ac192a5a1 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-25 19:28:24 -07:00
Henry Ault
8918885dd5 create disk, check status 2015-05-25 19:28:08 -07:00
C. Guy Yarvin
4d4bc1688b Basic functionality on new octo. 2015-05-25 19:15:08 -07:00
Philip C Monk
6cd237ef7f move :+sync to userspace 2015-05-25 21:20:45 -04:00
Anton Dyudin
593aa09701 wip 2015-05-25 18:17:59 -07:00
demo
77277e008a Merge branch 'master' of https://github.com/urbit/urbit 2015-05-25 19:14:34 +00:00
ault011
9c96a3da76 delete coin 2015-05-25 11:32:14 -07:00
Henry Ault
ed2ba93eb2 outbound gce create request 2015-05-23 14:40:20 -07:00
Henry Ault
58e4cf42c8 question 2 2015-05-23 14:21:47 -07:00
Henry Ault
71754c764b question about error msgs 2015-05-23 13:45:42 -07:00
C. Guy Yarvin
1e76f8b4dc Fix preceding commit. 2015-05-23 10:27:24 -07:00
C. Guy Yarvin
a2853db342 Fix preceding commit. 2015-05-23 10:05:17 -07:00
C. Guy Yarvin
cd09667bc7 Before from tweak. 2015-05-23 10:03:02 -07:00
C. Guy Yarvin
ea4e7b917f Add ++gulf and &/, |/ syntax to match ++each. 2015-05-21 22:30:08 -07:00
Henry Ault
8515db0b3a reorganized frontend components 2015-05-21 19:53:50 -07:00
Anton Dyudin
1f8a857d7a Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-21 17:40:05 -07:00
Anton Dyudin
ffed0f0c62 debugging printf 2015-05-21 17:39:55 -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
Anton Dyudin
860df1d8b4 missing desk assert 2015-05-21 16:47:50 -07:00
Anton Dyudin
21fb3d6b12 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-05-21 16:04:11 -07:00
Anton Dyudin
f60df5f6b5 /= decrash 2015-05-21 15:56:14 -07:00
C. Guy Yarvin
acd6a4ae86 Merge branch 'master' of https://github.com/urbit/urbit 2015-05-21 15:35:30 -07:00
demo
5650ae05f8 tame empty-broq-peek 2015-05-21 21:34:06 +00:00
Philip C Monk
f1cbc2bed5 Merge branch 'nextbreach'
Conflicts:
	urb/urbit.pill
2015-05-21 13:49:21 -04:00
C. Guy Yarvin
9fad0573db Fix up demo a little bit. 2015-05-21 09:05:14 -07:00
C. Guy Yarvin
5421c42f46 Merge branch 'master' into test 2015-05-20 23:17:02 -07:00
C. Guy Yarvin
2efa61a6f8 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-20 23:09:05 -07:00
C. Guy Yarvin
4b14564c72 Just checking in. 2015-05-20 22:37:14 -07:00
Henry Ault
5703d91b33 ported do to newgall 2015-05-20 18:34:45 -07:00
C. Guy Yarvin
b561cdcb95 Display %url lines. 2015-05-20 17:45:24 -07:00
Philip C Monk
e455574091 improved unix sync 2015-05-20 20:32:54 -04:00
C. Guy Yarvin
3a08cd57de Merge branch 'master' of https://github.com/urbit/urbit 2015-05-20 16:59:17 -07:00
C. Guy Yarvin
153c2ad64a Merge branch 'test' 2015-05-20 16:58:58 -07:00
C. Guy Yarvin
b5e9638397 Fix parsing of *desk/ape. 2015-05-20 16:58:27 -07:00
C. Guy Yarvin
42b26c65e6 Just saving. 2015-05-20 16:55:46 -07:00
C. Guy Yarvin
703a8200d0 Check in just to save. 2015-05-20 16:54:49 -07:00
Philip C Monk
62e64ca8f1 fix :+sync 2015-05-20 19:41:18 -04:00
Anton Dyudin
167c7bcbd3 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-20 15:13:42 -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
C. Guy Yarvin
9b00b7dcdd Merge branch 'test'
Conflicts:
	urb/urbit.pill
2015-05-20 12:33:34 -07:00