Commit Graph

5402 Commits

Author SHA1 Message Date
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
Galen Wolfe-Pauly
6928592e08 Merge branch 'clock' of https://github.com/ohAitch/base into clock 2016-05-24 12:07:22 -07:00
Anton Dyudin
61026b95dc parse tree-comments user out of ;h2:code:""
urbit/tree@6bdd46e
2016-05-23 18:33:41 -07:00
Anton Dyudin
a60f32a8cf add spur to &talk-comment to bypass |serve base
urbit/tree@51d9fe7
2016-05-23 17:45:57 -07:00
Galen Wolfe-Pauly
79156f1ac6 minor change, and catted 2016-05-23 17:31:53 -07:00
Galen Wolfe-Pauly
0219998b7f more comments 2016-05-23 17:06:35 -07:00
Galen Wolfe-Pauly
7bc80d41b4 last ship 2016-05-23 16:57:53 -07:00
Galen Wolfe-Pauly
b13feb4392 merge and a bunch of work on stream and comments 2016-05-23 16:57:30 -07:00
Anton Dyudin
2cc8acd0df normalize %core silks to use numerical revisions
@juped should boot fine now. Filed #145 for the underlying issue.
2016-05-23 15:51:53 -07:00
Anton Dyudin
2fad2d4cf9 rename %hoop cache to %path 2016-05-23 14:16:47 -07:00
Raymond Pasco
f6331f1290 Replace crub with cruc 2016-05-23 15:22:49 -04:00
Raymond Pasco
f045872ff6 Switch ++ob from aesc to muk 2016-05-23 15:20:11 -04:00
Raymond Pasco
e94a08e4dd Refactor murmur3 into ++muk and ++mum 2016-05-23 15:19:40 -04:00
Raymond Pasco
e4c37ed9f3 Squash subtract-underflow bug in ++ob 2016-05-23 15:17:52 -04:00
Raymond Pasco
a0cd05f889 Add new asymmetric cryptosystem as ++cruc 2016-05-23 15:15:35 -04:00
Raymond Pasco
bb828c3457 Make ++crub a SIV/ed/curve acru 2016-05-23 05:41:45 -04:00
Raymond Pasco
ea341fb576 Merge remote-tracking branches 'galenwp/css-order' and 'max19/master'
Fix CSS ordering
Max Greer: ~nym key fingerprint
2016-05-19 16:08:14 -04:00
Max G
4eb75b8269 Take ownership of ~nym 2016-05-19 22:40:35 +03:00
Galen Wolfe-Pauly
49b86157eb fixed css ordering 2016-05-18 22:48:27 -07:00
Raymond Pasco
40d6f5f576 Merge remote-tracking branches 'galenwp/wheel', 'zaphar/master' and 'chc4/patch-2'
Style changes, some tree changes, etc
Jeremy Wall: ~ped key fingerprint
Charlie Cummings: ~rys key fingerprint
2016-05-18 20:38:01 -04:00
chc4
6049c527e8 Take ownership of ~rys 2016-05-18 20:06:23 -04:00
Jeremy Wall
0064ed1bf3 Take possession of ~ped.
for ~ramtev-wisbyt:

<said over catholic bible>
  I solemnly swear that I am Jeremy Wall and will treat this
  Galaxy with the respect it deserves.
</said over catholic bible>
2016-05-18 18:47:34 -05:00
Anton Dyudin
b0363c93d7 send line-split talk messages in same command 2016-05-18 13:28:09 -07:00