ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-18 04:11:49 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,272 Commits 6 Branches 0 Tags 164 MiB
8367c44918
Commit Graph

126 Commits

Author SHA1 Message Date
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
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
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
Galen Wolfe-Pauly
ab54ef1323 solided 2015-05-19 10:12:36 -07:00
Philip Monk
124f962960 Merge pull request #282 from othercriteria/chatless 
Removing chat clutter
 2015-05-18 13:49:04 -07:00
Galen Wolfe-Pauly
3610971c93 talker 2015-05-17 16:55:46 -07:00
Galen Wolfe-Pauly
c6caabae4c Merge branch 'test' of github.com:urbit/urbit into test 2015-05-17 13:28:34 -07:00
Galen Wolfe-Pauly
9c31e52b64 login css, talk details 2015-05-17 13:27:59 -07:00
Daniel Klein
88fac8916c Removing chat clutter 2015-05-16 18:53:07 -04:00
Anton Dyudin
2c9828637d curedly flipped octo frontend 2015-05-15 17:22:59 -07:00
Galen Wolfe-Pauly
ce53f4c5f1 Merge branch of github.com:urbit/urbit into test 2015-05-14 16:07:14 -07:00
Galen Wolfe-Pauly
24f970eb4f not listening 2015-05-14 16:06:56 -07:00
Anton Dyudin
d02e9e44ff Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-14 14:59:57 -07:00
Anton Dyudin
94aa7c7678 switching sole 2015-05-14 14:59:45 -07:00
Galen Wolfe-Pauly
4a13e03bd9 Merge branch 'test' of github.com:urbit/urbit into test 2015-05-14 14:05:30 -07:00
Galen Wolfe-Pauly
64d6e9696e full talk name 2015-05-14 13:57:12 -07:00
Anton Dyudin
5ac01defea Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-14 13:13:58 -07:00
Anton Dyudin
6656d49283 switchable websole v1 2015-05-14 13:13:45 -07:00
Galen Wolfe-Pauly
ab48a5f0f1 path out of talk 2015-05-14 12:21:13 -07:00
Galen Wolfe-Pauly
7d733fd85c whom 2015-05-13 16:21:51 -07:00
Anton Dyudin
5d252b315e Merge branch 'test' into do 2015-05-13 12:46:39 -07:00
Anton Dyudin
77796a4fa6 Merge branch 'test' into do 
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/dill.hoon
	urb/zod/base/arvo/gall.hoon
 2015-05-13 12:21:53 -07:00
Henry Ault
a9e358a759 small updates 2015-05-13 06:14:36 -07:00
Henry Ault
552d388e17 working do 2015-05-12 16:35:59 -07:00
Galen Wolfe-Pauly
6ac76f9f73 octo frontend 2015-05-12 15:21:10 -07:00
Henry Ault
16d4b63594 Merge branch 'master' of https://github.com/urbit/urbit into do 2015-05-10 16:44:53 -07:00
Galen Wolfe-Pauly
369dd1878a tree for editing 2015-05-08 16:47:46 -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
cf6bc4d3fc talk updates 2015-05-08 13:29:24 -07:00
Henry Ault
4c117a9418 merge test 2015-05-07 14:34:49 -07:00
Galen Wolfe-Pauly
d7a2dd9905 off by one 2015-05-07 12:16:48 -07:00
Galen Wolfe-Pauly
b4f0dc6143 audience 2015-05-07 11:47:25 -07:00
Galen Wolfe-Pauly
408b2f0cef colors 2015-05-07 10:49:56 -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
478d210298 ported to real network 2015-05-07 02:49:30 -04:00
C. Guy Yarvin
54165e49b8 Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2015-05-06 19:13:15 -07:00
Kingdon
f1533c8972 necessary 2015-05-06 21:53:05 -04:00
Galen Wolfe-Pauly
70cb0566d8 minor 2015-05-06 18:24:43 -07:00
Galen Wolfe-Pauly
b3e4633e1f new look 2015-05-06 18:01:36 -07:00
Henry Ault
b543549d28 moved main to base 2015-05-06 14:08:27 -07:00
Galen Wolfe-Pauly
5b7e4120b0 minor doc css 2015-05-04 18:05:13 -07:00
Galen Wolfe-Pauly
46264b255d minor talk fixes 2015-05-01 18:16:32 -07:00
Galen Wolfe-Pauly
276b8fc416 minor talk fixes 2015-05-01 18:06:28 -07:00
Florian Steinel
c9b832d811 fix link to the guides 2015-05-01 15:18:01 +02:00
Anton Dyudin
7ebfeda9a5 fixed main/ imports to base/ 2015-04-30 12:37:46 -07:00
Philip C Monk
f03263852c main->base, arvo events depth-first 2015-04-29 18:48:45 -04:00