Raymond Pasco
26c674e9ae
Merge remote-tracking branches 'ray/nonbreaching-crypto', 'ohaitch/tree-8c94e48', 'joemfb/indx', 'joemfb/dedupe-history', 'ohaitch/userspace-robots-txt', 'philipcmonk/sso-fix', 'dhaffey/da-parser' and 'galenwp/prs'
...
Conflicts:
web/talk/main.js
Add ++aes to zuse, and ++crub frontend (unrelated to previous ++crub)
Superseded tree update, merged for historical purposes
Library gates to search lists
Deduplication of dojo history
robots.txt no longer hardcoded in eyre
Fix crash caused by bad eyre cookie
Fix @da parser crash
talk@2ba76c1, tree@ca059b5
2016-07-06 05:42:14 -04:00
Galen Wolfe-Pauly
a2b45b8297
talk@2ba76c1, tree@ca059b5
2016-07-05 14:45:48 -07: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
67d94c3f8a
Merge remote-tracking branches 'ohaitch/redo-pull-161', 'joemfb/moon-error', 'knubie/master' and 'ohaitch/tree-64612ca'
...
Errata for merge a6e1b08
2016-06-26 00:38:42 -04: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
Matt Steedman
1d6db57847
talk@d1ecb80
2016-06-20 16:49:01 -04:00
Anton Dyudin
aed571cf5e
s|storage.googleapis.com/urbit-extra|media.urbit.org|g
2016-06-15 15:06:32 -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
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
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
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
Galen Wolfe-Pauly
6b46da9387
tree@6ffed1d and talk@24e1387
2016-06-05 11:19:47 -07: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
Galen Wolfe-Pauly
49b86157eb
fixed css ordering
2016-05-18 22:48:27 -07:00
Anton Dyudin
b72e97818b
Merge branch 'eyre-less-anon' into wheel
2016-05-18 11:24:42 -07:00
Anton Dyudin
fb5e4f2998
added ship name over comment box
...
urbit/tree@fa3ea1b
2016-05-18 11:22:50 -07:00
Anton Dyudin
4772cbd4bd
updated talk frontend for anon subs
...
urbit/talk@ea1fce2
2016-05-18 11:17:31 -07:00
Galen Wolfe-Pauly
88212812d5
no padding on email
2016-05-18 10:00:01 -07:00
Galen Wolfe-Pauly
54b5dbae36
ok, updated
2016-05-16 17:28:59 -07:00
Galen Wolfe-Pauly
f85bd4ebb5
working on homepage
2016-05-16 13:34:04 -07:00
Galen Wolfe-Pauly
39b6be82f5
Merge branch 'absolute-tree' into org
2016-05-15 16:41:23 -07:00
Galen Wolfe-Pauly
9c9cc8a289
hp updates
2016-05-12 17:30:30 -07:00
Galen Wolfe-Pauly
31a00b3ba9
list changes
2016-05-11 22:54:07 -07:00
Anton Dyudin
8d4096c56b
Merge remote-tracking branch 'glen/org' into absolute-tree
...
Packed new css/js
2016-05-09 17:38:40 -07:00
Anton Dyudin
e83ef02c93
absolute, urbit paths for resources
2016-05-09 16:32:00 -07:00
Galen Wolfe-Pauly
adbbefc9e6
any docs
2016-05-06 16:39:14 -07:00
Galen Wolfe-Pauly
4c632b2426
posts
2016-05-06 16:12:22 -07:00
Galen Wolfe-Pauly
dc38087b97
Merge branch 'org' of github.com:galenwp/arvo into org
2016-05-05 17:23:57 -07:00
Galen Wolfe-Pauly
286122ce88
no min, new tree
2016-05-05 17:23:47 -07:00
Anton Dyudin
02dec5dfde
default to serving concatenated css/js
...
web/tree/{main_hoon_urb.js,main_codemirror_fonts_bootstrap.css} are artefacts that should be maintained by concatenating {tree/main,lib/js/{hoon,urb}}.js and {tree/main,lib/css/{codemirror,fonts,bootstrap.min}}.css respectively
2016-05-03 14:37:52 -07:00
Anton Dyudin
7983d369b1
preload parent, child data
...
tree@624cc78
2016-05-03 14:33:33 -07:00
Galen Wolfe-Pauly
27e6937af4
no min bootstrap
2016-04-26 17:17:27 -07:00
Galen Wolfe-Pauly
932ff0016e
minor display
2016-04-26 17:16:03 -07:00
Galen Wolfe-Pauly
05c95159fe
footer +
2016-04-25 10:28:05 -07:00
