ault011
|
c3a18d3c91
|
Delete hymn.hook
|
2015-06-02 13:18:37 -07:00 |
|
ault011
|
ee4eb06e93
|
cloud not ready
|
2015-06-02 13:17:34 -07:00 |
|
Henry Ault
|
23fbe88af9
|
better gcp commands
|
2015-06-02 12:51:29 -07:00 |
|
Henry Ault
|
9c30b51395
|
Merge branch 'master' of https://github.com/urbit/urbit
|
2015-05-29 19:48:09 -07:00 |
|
Henry Ault
|
6e904f5b6f
|
complete unified interface, actions & imgs left
|
2015-05-29 19:45:56 -07:00 |
|
Philip Monk
|
6a00fc97f2
|
Merge pull request #285 from fsteinel/master-fsteinel
fix links
|
2015-05-27 13:34:18 -07:00 |
|
Florian Steinel
|
357c8606c7
|
fix link
|
2015-05-27 21:20:23 +02:00 |
|
Florian Steinel
|
64eb3ce1f9
|
fix link
|
2015-05-27 21:16:31 +02:00 |
|
Anton Dyudin
|
23b190e9de
|
line numbers
|
2015-05-26 14:52:59 -07:00 |
|
Anton Dyudin
|
dd4aa98d02
|
Merge branch 'test'@0b9d56f
Conflicts:
urb/urbit.pill
|
2015-05-26 14:45:48 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
C. Guy Yarvin
|
8f24c23b12
|
Merge branch 'test'
Conflicts:
urb/urbit.pill
|
2015-05-20 12:29:30 -07:00 |
|
Anton Dyudin
|
6c864cbfb8
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-05-20 12:22:52 -07:00 |
|
Anton Dyudin
|
1515de98c3
|
changed to :bit+send 0cADDRESS 'BTC-amount'
|
2015-05-20 12:17:52 -07:00 |
|
Anton Dyudin
|
31527132c6
|
Merge branch 'test' into do
|
2015-05-20 11:46:35 -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 |
|
C. Guy Yarvin
|
e847993b7d
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-05-19 21:08:20 -07:00 |
|
Anton Dyudin
|
eb3a799831
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-05-19 20:31:32 -07:00 |
|
Anton Dyudin
|
0cafcc4612
|
standalone hook coloring
|
2015-05-19 20:29:04 -07:00 |
|
C. Guy Yarvin
|
43cd71b227
|
Check in demo instructions.
|
2015-05-19 19:38:03 -07:00 |
|
C. Guy Yarvin
|
e55cbf7431
|
Merge branch 'test' of https://github.com/urbit/urbit into test
|
2015-05-19 17:04:23 -07:00 |
|
Galen Wolfe-Pauly
|
60389c940f
|
Merge branch 'test' of github.com:urbit/urbit into test
|
2015-05-19 16:54:41 -07:00 |
|