Commit Graph

34 Commits

Author SHA1 Message Date
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
aed571cf5e s|storage.googleapis.com/urbit-extra|media.urbit.org|g 2016-06-15 15:06:32 -07: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
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
286122ce88 no min, new tree 2016-05-05 17:23:47 -07:00
Anton Dyudin
7195fceee8 mar/womb-claim, finer-grained control over urb.wall
urbit/womb@cd9938f
2016-04-27 12:32:44 -07:00
Anton Dyudin
40686aec13 minor bugfixing 2016-04-26 18:15:51 -07:00
Galen Wolfe-Pauly
676584ad09 4/20 2016-04-20 17:00:23 -07:00
Galen Wolfe-Pauly
a469654081 tree@dad34f4 2016-04-19 10:22:39 -07:00
Galen Wolfe-Pauly
01043c4b07 updating frontends 2016-04-18 19:00:22 -04:00
Galen Wolfe-Pauly
a074f0794e bump tree and bootstrap 2016-04-18 18:59:08 -04:00
Galen Wolfe-Pauly
d645e98183 more plan 2016-04-18 18:59:08 -04:00
Galen Wolfe-Pauly
9da1a14fe5 panel bar 2016-04-18 18:59:08 -04:00
Galen Wolfe-Pauly
dc6e3d9dc8 fix missing braces in error handling 2016-03-05 15:33:31 -08:00
Anton Dyudin
73a060be5e navigate to "#ERROR" on urb.wALL blit 2016-03-03 11:38:49 -08:00
Galen Wolfe-Pauly
209bc2daac fix homepage after bootstrap update
bootstrap@8a279c8528
2016-02-24 16:31:02 -08:00
Anton Dyudin
63639dde49 hoon151 syntax highlighting 2016-02-10 16:38:47 -08:00
Galen Wolfe-Pauly
37a566021e Odds and ends: login / out, dojo details.
tree@ced2501277
2016-02-04 19:56:11 -08:00
Galen Wolfe-Pauly
ac0ee5f3f0 in-between tree commits 2016-02-04 17:38:14 -08:00
Galen Wolfe-Pauly
2a95c443ed Merge branch 'factor' of github.com:ohAitch/urbit into factor
Conflicts:
	urb/zod/web/tree/main.js

(had a newer main.js)

talk@26b0befe86
tree@621235bf52
2016-02-04 16:16:18 -08:00
Galen Wolfe-Pauly
087911e581 sweeping with anton 2016-02-04 11:52:00 -08:00
Anton Dyudin
e77bda234e add comments to tree
https://github.com/urbit/tree/tree/0a9c5a0
2016-02-03 17:53:38 -08:00
Galen Wolfe-Pauly
bfd52f9e32 sweeping 2016-02-03 16:12:46 -08:00
Galen Wolfe-Pauly
7c9a506b84 Merge branch 'factor' of https://github.com/ohaitch/urbit into factor
Conflicts:
	urb/zod/web/tree/main.js

Tree@fbcdee088d
2016-02-03 10:32:34 -08:00
Galen Wolfe-Pauly
e872cc507c mobile 2016-02-03 10:23:49 -08:00
Anton Dyudin
cfff86d1db moved web/app/dojo back to web/dojo as a module
https://github.com/urbit/sole@080b8b6
2016-02-02 18:08:19 -08:00
Anton Dyudin
8e87106369 moved sole protocol coffee to separate repository
https://github.com/urbit/sole@e2741c0
2016-02-01 17:44:11 -08:00
Galen Wolfe-Pauly
5e91f7edaf everything ready to be cleaned. 2016-01-29 18:29:57 -08:00
Anton Dyudin
011f7c0b48 Merge branch 'factor' into ford-ren - XX unresolved js 2016-01-29 17:35:38 -08:00
Anton Dyudin
6fc3c8e5c9 pre-merge: mv urb/zod/urb/zod/{lib,web/lib}/{js,css} 2016-01-29 15:52:28 -08:00
Anton Dyudin
be672cf4e7 pre-merge: mv web/lib/{**.(js|css),\1/}, web/*/{(js|css)/main.\1,main.\1} 2016-01-29 15:50:34 -08:00
Anton Dyudin
d1e6db156d Merge branch 'eyre-root-beam' into ford-ren - requested for glen/factor merge 2016-01-29 14:41:19 -08:00
Anton Dyudin
b3ea66fab3 update urb.util.basename 2015-12-07 13:36:13 -08:00
Anton Dyudin
0994ad1976 /pub -> /web, mostly 2015-12-07 12:57:38 -08:00