Commit Graph

2992 Commits

Author SHA1 Message Date
C. Guy Yarvin
7ec596e1b5 Moved from to bowl. 2015-05-27 23:51:32 -07:00
C. Guy Yarvin
ec1bb36984 Change lat to now. 2015-05-27 20:54:20 -07:00
C. Guy Yarvin
7e841df093 Replaced hide with bowl. 2015-05-27 20:48:25 -07:00
C. Guy Yarvin
217a539e54 Um, commit this. 2015-05-27 20:17:09 -07:00
C. Guy Yarvin
fc07a7e44a Before merging to update gall. 2015-05-27 19:00:53 -07:00
C. Guy Yarvin
b50faa769b octo, possibly almost perfect. 2015-05-25 21:00:34 -07:00
C. Guy Yarvin
4d4bc1688b Basic functionality on new octo. 2015-05-25 19:15:08 -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
C. Guy Yarvin
4b14564c72 Just checking in. 2015-05-20 22:37:14 -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
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
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
Philip C Monk
e1736d0ddb Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-19 18:43:34 -04: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
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
9c2d90b48b Merge branch 'master' of github.com:urbit/urbit 2015-05-19 12:07:43 -07: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