urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-15 12:43:31 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,241 Commits 768 Branches 10 Tags 215 MiB
bdeb4e4a11
Commit Graph

235 Commits

Author SHA1 Message Date
Anton Dyudin
ffed0f0c62 debugging printf 2015-05-21 17:39:55 -07:00
Henry Ault
b5d7375817 Merge branch 'do' into test 2015-05-21 17:24:09 -07:00
Anton Dyudin
860df1d8b4 missing desk assert 2015-05-21 16:47:50 -07:00
Anton Dyudin
21fb3d6b12 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-05-21 16:04:11 -07:00
Anton Dyudin
f60df5f6b5 /= decrash 2015-05-21 15:56:14 -07:00
demo
5650ae05f8 tame empty-broq-peek 2015-05-21 21:34:06 +00:00
Philip C Monk
f1cbc2bed5 Merge branch 'nextbreach' 
Conflicts:
	urb/urbit.pill
 2015-05-21 13:49:21 -04:00
Henry Ault
5703d91b33 ported do to newgall 2015-05-20 18:34:45 -07:00
Philip C Monk
e455574091 improved unix sync 2015-05-20 20:32:54 -04:00
C. Guy Yarvin
8f24c23b12 Merge branch 'test' 
Conflicts:
	urb/urbit.pill
 2015-05-20 12:29:30 -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
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
C. Guy Yarvin
7c6fd4f431 Merge remote-tracking branch 'urban/hugeicon' into demo 2015-05-19 14:14:51 -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
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
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
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
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
Anton Dyudin
1df8566df3 set ship cookie 2015-05-18 14:19:13 -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
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
be7ce2d332 hood without sole seems ready to use. 2015-05-16 19:37:36 -07:00
C. Guy Yarvin
a277625d5e drum in hood works, modulo slow update bug. 2015-05-16 17:31:28 -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
9a60d48e21 Various fixes and improvements. 2015-05-14 16:27:45 -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
8ba1b0ccf3 switching sole 2015-05-14 15:01:31 -07:00
Anton Dyudin
94aa7c7678 switching sole 2015-05-14 14:59:45 -07:00
Philip C Monk
ee4a39d600 sped up merges 2015-05-14 16:30:03 -04: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
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
Philip C Monk
6cb1505288 fixed merges 2015-05-13 17:18:43 -04:00
C. Guy Yarvin
2b940d9346 Various fixes and improvements; test can :?begin. 2015-05-13 01:02:34 -07:00
C. Guy Yarvin
30d32255b9 Let %them through. 2015-05-12 15:00:18 -07:00
Philip C Monk
7f7512e3dc bump to protocol 6 2015-05-12 17:31:25 -04:00
Philip C Monk
b2eddf4f83 Merge remote-tracking branch 'origin/master' into space-tools 
Conflicts:
	urb/urbit.pill
 2015-05-12 17:24:24 -04:00
Philip C Monk
d43169dc17 reworked ++mass 2015-05-12 17:18:34 -04:00
C. Guy Yarvin
6dcbda8df4 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/helm/core.hook
 2015-05-12 13:36:21 -07:00
C. Guy Yarvin
5665fb132a Various cleanups. 2015-05-12 13:10:22 -07:00
Anton Dyudin
fdbf46ce16 added json octo interfaces 2015-05-12 12:57:58 -07:00
C. Guy Yarvin
6952ecaa75 Switch from helm to hood. 2015-05-11 17:43:47 -07:00
C. Guy Yarvin
1f2ed6ae76 Merge old helm code into hood/kiln. 2015-05-11 17:31:37 -07:00
C. Guy Yarvin
9e84fca27e Fix %mack. 2015-05-11 11:16:04 -07:00
C. Guy Yarvin
b3027a328b And %gall is reborn. 2015-05-09 15:55:05 -07:00
C. Guy Yarvin
e7791411cb The great god %gall is dead. 2015-05-09 13:49:11 -07:00
C. Guy Yarvin
33761503cb Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2015-05-09 13:47:51 -07:00
C. Guy Yarvin
ea5ab48776 Various fixes and improvements. 2015-05-09 13:38:33 -07:00
C. Guy Yarvin
cf6cd46177 Various fixes and improvements. 2015-05-08 18:08:18 -07:00
Anton Dyudin
49cc3c5c57 Made bad-cookie nonfatal 2015-05-08 17:34:06 -07:00
Anton Dyudin
372928b4ee Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-08 17:17:58 -07:00
Anton Dyudin
52a59d8ef1 fix cached dependencies 2015-05-08 17:13:10 -07:00
C. Guy Yarvin
fbf9930b34 test now switched over to behn. 2015-05-08 16:02:50 -07:00
C. Guy Yarvin
e15fcdbcda Unbreak eyre. 2015-05-08 13:57:34 -07:00
C. Guy Yarvin
c58b0611f0 eyre ready to talk to behn. 2015-05-08 13:27:40 -07:00
C. Guy Yarvin
802a76a279 Command-line functionality with %behn. 2015-05-08 12:43:11 -07:00
C. Guy Yarvin
b0eac3721a Latest stuff hand-merged from %behn. 2015-05-08 10:56:30 -07:00
C. Guy Yarvin
ceb79e045f Prepare the doll. 2015-05-08 10:53:28 -07:00
Anton Dyudin
99c5992ed1 Merge branch 'master' of https://github.com/urbit/urbit to fix #278 
Conflicts:
	urb/urbit.pill
 2015-05-07 14:18:19 -07:00
Anton Dyudin
60eb11a0f7 fix ames begin to talk to gall 2015-05-07 14:17:39 -07:00
Philip C Monk
eccaacd790 revert errant clay change 2015-05-07 16:32:37 -04:00
vere
becc52fecd Revert "test roll 6" 
This reverts commit 638ad719a81d9e58f285c3d17ef4238741da6ff0.
 2015-05-07 19:04:47 +00:00
vere
c45ab98654 test roll 6 2015-05-07 18:44:32 +00:00
Anton Dyudin
b8c3720c28 continuity roll 5 2015-05-07 10:36:29 -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
C. Guy Yarvin
de80178627 Hand-merge in all newgall files. 2015-05-06 19:31:54 -07:00
Philip C Monk
98801c4a14 added space profiling tools 2015-05-06 22:25:41 -04:00
C. Guy Yarvin
9d55c17455 Hand-merge behn and gall. 2015-05-06 19:25:10 -07:00
C. Guy Yarvin
54165e49b8 Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2015-05-06 19:13:15 -07:00
C. Guy Yarvin
2af8dd2263 Hand-merge ames and time from newgall. 2015-05-06 19:00:58 -07:00
C. Guy Yarvin
3295f1797b Hand-merged ford, zuse and hoon from newgall. 2015-05-06 18:41:20 -07:00
Anton Dyudin
f7de17cf48 window.urb injection collision avoidance 2015-05-06 17:01:13 -07:00
Anton Dyudin
fb14b6717a Restrict authenticated requests to /~~ and /~/as paths 2015-05-06 15:58:54 -07:00
Philip C Monk
c53d71fc33 stack overflow-inducing dill 2015-05-06 15:55:47 -04:00
Anton Dyudin
1ff3be04c0 HEAD requests 2015-05-05 14:24:48 -07:00
Anton Dyudin
76f74a2223 stray printf 2015-05-05 13:21:33 -07:00
Anton Dyudin
ab8f6c8c69 /~/to/app/mark.json?anon&wire=/ webhook endpoint, accepts raw requests 2015-05-05 13:10:18 -07:00
C. Guy Yarvin
acce20899f Continuity breach with new protocol 4. 2015-05-03 16:57:35 -07:00
cgyarvin
62cb2f2812 Revert "Revert "Jetted scrypt"" 2015-05-03 16:31:45 -07:00
cgyarvin
7d6815b009 Revert "Jetted scrypt" 2015-05-03 16:28:51 -07:00
Max G
ffbc4366be new bounds 2015-05-03 23:45:41 +03:00
Max G
3ef2611ff9 Jetted scrypt 2015-05-03 15:26:42 +03:00
Philip C Monk
334840e068 performance improvements 2015-05-01 21:26:59 -04:00
Anton Dyudin
95528fb7d4 v0 beam compilation 2015-05-01 17:16:57 -07:00
Anton Dyudin
f2e605f491 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-05-01 15:09:59 -07:00
Anton Dyudin
d22f243dfe multi-dependency support 2015-05-01 14:43:41 -07:00
Philip C Monk
dc773b37f3 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-05-01 16:41:34 -04:00
Philip C Monk
ff2597da68 performane improvements 2015-05-01 16:32:04 -04:00
Anton Dyudin
4c2e39b74b dep-missed drop 2015-05-01 12:03:02 -07:00
Anton Dyudin
8eba67cf03 norm mark beaks 2015-04-30 17:34:57 -07:00
Philip C Monk
6457c00c28 comment out %camping 2015-04-30 15:58:39 -04:00
Philip C Monk
d30dfc5270 bumped protocol number to 3 2015-04-30 14:52:51 -04:00
Philip C Monk
fb74e61885 moved ford dependencies to new model 2015-04-30 14:37:22 -04:00
Philip C Monk
75d4e2fbad added %next clay subscription type 2015-04-29 21:23:46 -04:00
Philip C Monk
ed698889f6 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-04-29 19:03:59 -04:00
Philip C Monk
f03263852c main->base, arvo events depth-first 2015-04-29 18:48:45 -04:00