urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-15 21:03:10 +03:00
Code Issues Packages Projects Releases Wiki Activity
5,799 Commits 768 Branches 10 Tags 215 MiB
6f52e2d538
Commit Graph

5799 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Dyudin
5095f69367 womb@790a521 no Network 2016-07-01 14:20:00 -07:00
Anton Dyudin
1a9164ddb8 disable claiming ships and recycling tickets 2016-07-01 14:01:11 -07:00
Anton Dyudin
4f26894cfe encrypted jammed womb back-up 2016-07-01 10:44:35 -07:00
Anton Dyudin
bc07b0cbfc womb@0ebf761 no checkout/recycling 2016-06-30 15:24:45 -07:00
Philip C Monk
9628a46861 fix sso crash 2016-06-30 18:04:23 -04:00
Philip C Monk
7caa16e318 Merge remote-tracking branch 'origin/master' into HEAD 
Conflicts:
	web/tree/main.js
 2016-06-30 14:39:47 -04:00
Anton Dyudin
a0485c6d30 move robots.txt out of %eyre 2016-06-30 10:56:19 -07:00
Anton Dyudin
dfc77aa29a tree@8c94e48 - further fix mailto: links 2016-06-27 11:24:53 -07:00
Raymond Pasco
40365667c7 Merge remote-tracking branches 'joemfb/run-in', 'max19/master', 'chc4/spin', 'cgyarvin/docs-issue-28' and 'ray/galactic-transactions' 
Actually valid +-run:in "map over set" arm
Less loopy ++og PRNG (TODO: better PRNG)
++spin/++spun, "stateful ++turn" arms
Remove syntactically impossible %$ regular form for bunt
Galactic transactions
 2016-06-26 00:51:33 -04:00
Raymond Pasco
67d94c3f8a Merge remote-tracking branches 'ohaitch/redo-pull-161', 'joemfb/moon-error', 'knubie/master' and 'ohaitch/tree-64612ca' 
Errata for merge a6e1b08
More user-friendly +moon experience
talk@d1ecb80
tree@64612ca
 2016-06-26 00:38:42 -04:00
Raymond Pasco
0a58067d6c Give ~red to Alex Kravets, swap ~rep to Raymond Pasco 2016-06-25 20:34:37 -04:00
Anton Dyudin
313de74ab3 fix merge conflict resolution 2016-06-24 16:50:57 -07:00
Anton Dyudin
3564870c5a tree@64612ca 
- nav flickering
- refresh comments
- don't interpret mailto: links as relative paths
- better error-handling during a scroll race condition
- warn on incomplete json preload
- timeout module unmounts, fixing back button from e.g. talk
 2016-06-24 15:54:49 -07:00
C. Guy Yarvin
cb5d4b6e6b Add :bunt to fix docs issue 28. 2016-06-22 13:44:23 -07:00
Charlie Cummings
906411c06c spin and spun 2016-06-21 12:33:50 -04:00
Matt Steedman
1d6db57847 talk@d1ecb80 2016-06-20 16:49:01 -04:00
Joseph Bryan
9911308996 fixes run:in (map over a set, producing a set) 2016-06-18 22:29:20 -04:00
Joseph Bryan
45b26586c1 updates +moon to produce an error message instead of a stack trace 
...when run from a moon or comet

also replaces binary math with `++clan`,
allows ~zod to ticket,
and uses %tang/%leaf instead of %noun
 2016-06-18 21:30:28 -04:00
Max G
643041bcbe Improve random continuation in ++og 2016-06-18 03:53:09 -04:00
Raymond Pasco
527984daa6 Merge remote-tracking branches 'ohaitch/new-title', 'ohaitch/media-urbit-org' and 'ohaitch/fix-overload' 
New title for tree
use media.urbit.org CDN
fix |overload
 2016-06-16 15:26:58 -04:00
production server
2c6fbb7628 fix overload 2016-06-15 15:15:07 -07:00
Anton Dyudin
aed571cf5e s|storage.googleapis.com/urbit-extra|media.urbit.org|g 2016-06-15 15:06:32 -07:00
Galen Wolfe-Pauly
bb0055a0ab new title 2016-06-15 15:05:10 -07:00
Raymond Pasco
c1ec01af0b Merge branch 'urbjs-timeout', remote-tracking branches 'joemfb/pedant' and 'galenwp/long-lines' 
Add reconnect timeout to urb.js
Spell "successful" correctly
Fix talk line wrapping issue
 2016-06-15 17:04:55 -04:00
Matt Steedman
769a62f3a9 Set timeout for urb.req 
This sets a 1 minute timout on the urb.req xhr object. If no response
is received after one minute, it passes an error to the callback with a
408 status code.

I've also made sure that a 'beat' response resets the dely property back
to 250, instead of maintaining the previous value.

Fixes urbit/talk#21
 2016-06-15 17:04:02 -04:00
Galen Wolfe-Pauly
2d753b35ad talk@bc7b187 2016-06-14 17:02:01 -07:00
Joseph Bryan
a70c716b13 fixes "succesful" typo 2016-06-13 11:38:46 -04:00
Raymond Pasco
2a10b2c7ce Merge remote-tracking branch 'knubie/master' 
talk@d80a6c7, fixing longstanding scroll bug
 2016-06-12 19:19:12 -04:00
Matt Steedman
b945e06a8e talk@d80a6c7 2016-06-12 18:24:12 -04:00
Raymond Pasco
a6e1b087f0 Merge remote-tracking branch 'ohaitch/urb-defer-init' 
Conflicts:
	ren/tree/head.hoon
	web/tree/~.main_urb.js

Add urb.init to pull /~/auth.json
Tree was already at a newer version on master head
 2016-06-10 18:06:42 -04:00
Raymond Pasco
20e04360a5 Merge remote-tracking branch 'ohaitch/tree-auto-pack' 
End the tyranny of redundant ~.whatever copies of files
 2016-06-07 18:31:28 -04:00
Anton Dyudin
a1721d2955 automatic resource packing 2016-06-07 14:45:54 -07:00
Raymond Pasco
6e867db622 Merge remote-tracking branch 'galenwp/talk-fixes' 
talk@f6b1258
 2016-06-07 16:03:11 -04:00
Galen Wolfe-Pauly
6f94319c6f grams overlay 2016-06-07 11:45:49 -07:00
Galen Wolfe-Pauly
3006303747 talk@f6b1258 2016-06-07 11:42:19 -07:00
Raymond Pasco
8a9e0c1dfd Merge branch 'awap-spam', remote-tracking branch 'ohaitch/talk-bundle-split' 
Remove extremely spammy %awap ~& from ford
Send line-split talk messages in same command
 2016-06-06 15:22:00 -04:00
Raymond Pasco
5968c86df7 Remove extremely spammy debug print from ford 2016-06-06 15:19:46 -04:00
Raymond Pasco
5d4c1484b3 Merge remote-tracking branch 'galenwp/eyre-fix' 
Conflicts:
	arvo/eyre.hoon

Change placeholder text in eyre login page
 2016-06-06 14:28:16 -04:00
Raymond Pasco
84734bf61d Merge remote-tracking branch 'galenwp/clock' 
Conflicts:
	web/talk/main.js
	web/tree/main.js
	web/tree/~.main_urb.js

Comments, talk feed, &c
 2016-06-06 14:21:21 -04:00
Raymond Pasco
70836c353b Merge remote-tracking branches 'philipcmonk/porcelain' and 'ohaitch/clay-tluc' 
Better gh app, various (known broken code)
improve performance for writing files, rebuilding tree
 2016-06-06 13:29:55 -04:00
Raymond Pasco
2a40577a14 Merge remote-tracking branches 'ohaitch/talk-loop-hotfix', 'ohaitch/plan-text-loaction', 'galenwp/talk-names' and 'joemfb/serve-desk' 
Don't retransmit duplicate messages
Use simple @t .plan location field
Update to tree@6ffed1d and talk@24e1387
Update :tree renderer to use |served desk
 2016-06-06 13:03:52 -04:00
Joseph Bryan
55f811d36f updates :tree to serve JS/CSS assets from the current desk 2016-06-06 12:55:48 -04:00
Galen Wolfe-Pauly
6b46da9387 tree@6ffed1d and talk@24e1387 2016-06-05 11:19:47 -07:00
Galen Wolfe-Pauly
aa39d1d214 planet -> your-urbit 2016-06-04 16:45:49 -07:00
Anton Dyudin
2c2c4137a2 Use simple @t .plan location field 
Note: technically type-incompatible, might require people to recreate .plan files if they had already set a location
 2016-06-02 16:04:01 -07:00
Anton Dyudin
6aa26a073b don't retransmit duplicate messages 2016-05-31 13:48:33 -07:00
production server
bf469e5705 bump protocol to 3 2016-05-27 18:38:03 +00:00
Galen Wolfe-Pauly
cd29e5fe80 tree@34752ad 2016-05-27 11:09:06 -07:00
Anton Dyudin
9e72f67feb Add urb.init to pull /~/auth.json; call it lazily 
urbit/tree@8fb378b
 2016-05-24 14:11:24 -07:00
Galen Wolfe-Pauly
3cc670a2df tree@939a456 2016-05-24 12:31:48 -07:00