ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-18 12:22:10 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,029 Commits 6 Branches 0 Tags 164 MiB
e2124792cc
Commit Graph

276 Commits

Author SHA1 Message Date
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
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
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
c8422ac0e3 add 0vtest try2 2015-05-18 13:44:10 -07: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
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
Anton Dyudin
17df698c70 remember logins 2015-05-15 16:21:09 -07:00
Anton Dyudin
d90d090dd0 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-15 14:03:05 -07:00
Anton Dyudin
67003df527 restore authentication to /~/at injection 2015-05-15 14:01:19 -07:00
C. Guy Yarvin
b567343d54 Merge branch 'test' into livetest 
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/hood/core.hook
	urb/zod/base/arvo/dill.hoon
 2015-05-15 13:34:41 -07:00
Galen Wolfe-Pauly
d06a6aacb0 Merge branch t push origin test'test' of github.com:urbit/urbit into test 2015-05-15 12:37:03 -07:00
Galen Wolfe-Pauly
e63ea914ab eyre blocking css 2015-05-15 12:36:56 -07:00
Anton Dyudin
e734911a07 icon v2 2015-05-15 12:15:02 -07:00
Anton Dyudin
1cf20c8fab Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-05-15 11:46:38 -07:00
Anton Dyudin
817f7234a2 web dependency tracking injection 2015-05-15 11:28:01 -07:00
C. Guy Yarvin
6b4f6a80f1 Various fixes. 2015-05-15 01:09:12 -07:00
C. Guy Yarvin
9a60d48e21 Various fixes and improvements. 2015-05-14 16:27:45 -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
Philip C Monk
53c01ebe81 removed bad printf 2015-05-14 18:45:22 -04:00
Philip C Monk
999e19e3c2 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-05-14 18:37:39 -04:00
Philip C Monk
ed727923ea Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-14 18:01:42 -04: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
Philip C Monk
ee4a39d600 sped up merges 2015-05-14 16:30:03 -04: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
C. Guy Yarvin
e190e20256 Checking in for fun and profit. 2015-05-14 12:24:43 -07:00
Galen Wolfe-Pauly
ab48a5f0f1 path out of talk 2015-05-14 12:21:13 -07:00
Philip C Monk
6b956e0dcb added %scot jet hint 2015-05-14 14:12:12 -04:00
Anton Dyudin
15bcbb23e7 cleaning up %base to %home 2015-05-14 11:04:32 -07:00
Philip C Monk
60365b5ae8 added %slaw jet hint 2015-05-14 13:46:52 -04:00
C. Guy Yarvin
04379dac6e Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-05-13 17:15:06 -07:00
C. Guy Yarvin
cc2a7defb5 Various fixes and improvements. 2015-05-13 16:31:13 -07:00
Galen Wolfe-Pauly
df358f27c4 Merge branch 'test' of github.com:urbit/urbit into test 2015-05-13 16:22:03 -07:00
Galen Wolfe-Pauly
7d733fd85c whom 2015-05-13 16:21:51 -07:00
Anton Dyudin
f39de10190 Merge remote-tracking branch 'origin/test' into do 2015-05-13 16:12:58 -07:00
Philip C Monk
6cb1505288 fixed merges 2015-05-13 17:18:43 -04:00
Anton Dyudin
b60cf4d702 port complete 2015-05-13 13:17:38 -07:00
Anton Dyudin
5d252b315e Merge branch 'test' into do 2015-05-13 12:46:39 -07:00
Anton Dyudin
a8578d4ed2 port1 2015-05-13 12:46:25 -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