Commit Graph

3019 Commits

Author SHA1 Message Date
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
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
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
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
vere
179ff6b998 Merge branch 'master' of https://github.com/urbit/urbit 2015-05-19 17:49:18 +00: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
C. Guy Yarvin
c277187c30 Merge branch 'master' of https://github.com/urbit/urbit
Conflicts:
	urb/urbit.pill
2015-05-18 18:34:54 -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
Galen Wolfe-Pauly
e9ce5810c5 login css, talk details
Conflicts:
	urb/zod/base/arvo/eyre.hoon
2015-05-18 15:08:29 -07:00
Anton Dyudin
b270089909 fix /~~/~/at regression 2015-05-18 21:36:18 +00:00
vere
4114d8f5b9 Merge branch 'master' of https://github.com/urbit/urbit 2015-05-18 21:35:59 +00:00
Anton Dyudin
27c136ccc4 fix /~~/~/at regression 2015-05-18 14:34:46 -07:00
Philip C Monk
759106d25a more cleanup 2015-05-18 17:32:14 -04:00
Anton Dyudin
1df8566df3 set ship cookie 2015-05-18 14:19:13 -07:00
Philip C Monk
6ef4246c19 deleted old %gall apps 2015-05-18 16:52:16 -04:00
Philip Monk
124f962960 Merge pull request #282 from othercriteria/chatless
Removing chat clutter
2015-05-18 13:49:04 -07:00
Anton Dyudin
3e18602fc7 add 0vtest try2 2015-05-18 20:44:44 +00:00
Anton Dyudin
c8422ac0e3 add 0vtest try2 2015-05-18 13:44:10 -07:00
Anton Dyudin
fcaf1c7d06 0vtest dephash for node testing 2015-05-18 20:37:49 +00:00
Anton Dyudin
a7e98574de 0vtest dephash for node testing 2015-05-18 13:35:53 -07:00
C. Guy Yarvin
b2b762589a Merge branch 'livetest'
Conflicts:
	urb/urbit.pill
2015-05-18 13:02:17 -07:00
C. Guy Yarvin
cf6962abad New protocol 7 for breach. 2015-05-18 12:51:33 -07:00
C. Guy Yarvin
fcc44754c9 Merge branch 'master' into livetest
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/dill.hoon
	urb/zod/base/arvo/gall.hoon
2015-05-18 12:43:11 -07:00