Commit Graph

3100 Commits

Author SHA1 Message Date
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
C. Guy Yarvin
3511088d74 Merge branch 'test' into livetest
Conflicts:
	urb/urbit.pill
2015-05-18 12:24:58 -07:00
C. Guy Yarvin
4fc95723e7 Various fixes and unimprovements. 2015-05-17 20:51:17 -07:00
C. Guy Yarvin
925196bc5d Alas, too hasty a fix. 2015-05-17 20:26:38 -07:00
C. Guy Yarvin
1f17f99852 Various fixes and improvements. 2015-05-17 19:34:05 -07:00
C. Guy Yarvin
4d9c60d57a Sync base to kids in capital ships. 2015-05-17 18:56:59 -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
C. Guy Yarvin
e28c7fd468 Fix queuing issue. 2015-05-17 12:39:03 -07:00
C. Guy Yarvin
c305ecaa2a Various fixes and improvements. 2015-05-16 21:50:05 -07:00
C. Guy Yarvin
be7ce2d332 hood without sole seems ready to use. 2015-05-16 19:37:36 -07:00
C. Guy Yarvin
37e9bfad79 Work around duplicate-triggering slow update bug. 2015-05-16 18:31:34 -07:00
C. Guy Yarvin
7318467c6c Forgot to add. 2015-05-16 18:05:56 -07:00
C. Guy Yarvin
a277625d5e drum in hood works, modulo slow update bug. 2015-05-16 17:31:28 -07:00
Daniel Klein
88fac8916c Removing chat clutter 2015-05-16 18:53:07 -04:00
C. Guy Yarvin
e14b37eb6c Bogus file. 2015-05-15 17:24:35 -07:00
C. Guy Yarvin
08ab26aec7 drum compiles. 2015-05-15 17:23:40 -07:00
Anton Dyudin
2c9828637d curedly flipped octo frontend 2015-05-15 17:22:59 -07:00
C. Guy Yarvin
058b9fe495 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-15 16:58:30 -07:00