ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-18 20:31:40 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,097 Commits 6 Branches 0 Tags 164 MiB
2c34ae94da
Commit Graph

343 Commits

Author SHA1 Message Date
Philip C Monk
7fe05c5255 couple of fixes 2015-05-27 13:53:33 -04: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
Philip C Monk
dcf4b7ec03 kiln improvements 2015-05-26 20:06:21 -04: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
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
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
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
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
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
1515de98c3 changed to :bit+send 0cADDRESS 'BTC-amount' 2015-05-20 12:17:52 -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
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
Galen Wolfe-Pauly
60389c940f Merge branch 'test' of github.com:urbit/urbit into test 2015-05-19 16:54:41 -07:00
Galen Wolfe-Pauly
2563c63d51 octo front 2015-05-19 16:54:32 -07:00
C. Guy Yarvin
dc0df6ce52 Various fixes and improvements. 2015-05-19 16:37:52 -07:00
Galen Wolfe-Pauly
ef6731c5f4 Merge branch 'test' of github.com:urbit/urbit into test 2015-05-19 16:22:58 -07:00
C. Guy Yarvin
b35f0970fb Fix subs. 2015-05-19 16:22:25 -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
bdf8057696 fix bug. 2015-05-19 16:09:37 -07:00
C. Guy Yarvin
6e938f99a1 Change to /web. 2015-05-19 16:08:35 -07:00
Galen Wolfe-Pauly
d51e75fdb2 Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/eyre.hoon
 2015-05-19 15:42:49 -07:00
Philip C Monk
22a8b76421 Merge branch 'time-tools' 2015-05-19 18:08:15 -04:00
Philip C Monk
1a275ef482 Merge branch 'master' into time-tools 
Conflicts:
	urb/urbit.pill
 2015-05-19 18:07:54 -04:00
Anton Dyudin
08a7896d73 fully remove logside-page 2015-05-19 15:04:52 -07:00
Galen Wolfe-Pauly
d188d0dfbc talk details 2015-05-19 14:40:12 -07:00
C. Guy Yarvin
7c6fd4f431 Merge remote-tracking branch 'urban/hugeicon' into demo 2015-05-19 14:14:51 -07:00
Galen Wolfe-Pauly
b96ac1c004 Merge branch 'master' of github.com:urbit/urbit 2015-05-19 13:26:18 -07:00
Galen Wolfe-Pauly
ac6195ca2c titles 2015-05-19 13:26:13 -07:00
Anton Dyudin
b49b65102a folded /_ back into /~~; 'own' now means "logged in ship if any" 2015-05-19 13:16:44 -07:00
vere
4ec4fb21e2 fix %that handling 2015-05-19 20:00:59 +00:00
vere
d936005bb8 Merge branch 'master' of https://github.com/urbit/urbit 2015-05-19 20:00:37 +00:00
Galen Wolfe-Pauly
93b3b919d0 talk details 2015-05-19 12:07:37 -07:00
Galen Wolfe-Pauly
6ad2add586 Merge branch 'master' of github.com:urbit/urbit 2015-05-19 11:55:01 -07:00
Galen Wolfe-Pauly
8d76510d5f octo css + some extras 2015-05-19 11:54:48 -07:00
C. Guy Yarvin
86f0e5a23a Merge branch 'master' of https://github.com/urbit/urbit 
Conflicts:
	urb/urbit.pill
 2015-05-19 11:46:46 -07:00
C. Guy Yarvin
6843bd4e04 -T for autoboot. 2015-05-19 11:38:23 -07:00
Galen Wolfe-Pauly
8b04f19782 Merge branch 'master' of github.com:urbit/urbit 2015-05-19 11:36:45 -07:00
Galen Wolfe-Pauly
d5e4dcaa28 login redir fix 2015-05-19 11:36:34 -07:00
Anton Dyudin
b8abf5b9d1 disenterminalize /got gram +-got 2015-05-19 18:29:36 +00:00
Philip C Monk
2f34a2eeff added the :+mass cat 2015-05-19 14:28:41 -04:00
Anton Dyudin
a990b50bff disenterminalize /got gram +-got 2015-05-19 11:26:45 -07:00
Galen Wolfe-Pauly
12769cba88 Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2015-05-19 10:17:37 -07:00
Galen Wolfe-Pauly
ab54ef1323 solided 2015-05-19 10:12:36 -07:00
C. Guy Yarvin
9110f4cc3e Change talk prompt. 2015-05-18 21:31:30 -07:00
C. Guy Yarvin
7331650ae2 Fixed starting an app with # *. 2015-05-18 21:27:39 -07:00
Philip C Monk
8d5d2f0b32 fixed :+mass 2015-05-18 21:16:32 -04:00
Anton Dyudin
4acbaa2670 SSo v1 2015-05-18 17:59:40 -07:00
Anton Dyudin
4ee2497262 /_ /~/as/any works if ship= cookie already set 2015-05-18 17:05:31 -07:00