Commit Graph

2793 Commits

Author SHA1 Message Date
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
Galen Wolfe-Pauly
9667179223 Merge branch 'test' of github.com:urbit/urbit into test 2015-05-08 16:48:05 -07:00
Galen Wolfe-Pauly
369dd1878a tree for editing 2015-05-08 16:47:46 -07:00
C. Guy Yarvin
fbf9930b34 test now switched over to behn. 2015-05-08 16:02:50 -07:00
Galen Wolfe-Pauly
4f1a7b537b fix audience 2015-05-08 15:56:33 -07:00
Galen Wolfe-Pauly
5a0d576bd3 not staging; 2015-05-08 15:15:17 -07:00
Galen Wolfe-Pauly
c24c9e68d9 Merge branch 'test' of github.com:urbit/urbit into test 2015-05-08 15:00:45 -07:00
C. Guy Yarvin
e15fcdbcda Unbreak eyre. 2015-05-08 13:57:34 -07:00
Galen Wolfe-Pauly
cf6bc4d3fc talk updates 2015-05-08 13:29:24 -07:00
C. Guy Yarvin
eee0cbeb4b Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-08 13:28:18 -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
Anton Dyudin
4a0a43f6b4 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-08 11:26:39 -07:00
Anton Dyudin
e5e3045daf add tym to dojo 2015-05-08 11:26:21 -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
Galen Wolfe-Pauly
d7a2dd9905 off by one 2015-05-07 12:16:48 -07:00
Galen Wolfe-Pauly
b4f0dc6143 audience 2015-05-07 11:47:25 -07:00
Galen Wolfe-Pauly
408b2f0cef colors 2015-05-07 10:49:56 -07:00
Anton Dyudin
b8c3720c28 continuity roll 5 2015-05-07 10:36:29 -07:00
Anton Dyudin
b65fc83aa6 Merge branch 'test' 2015-05-07 10:31:10 -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
61610b4669 Revert to less broken console library. 2015-05-06 19:18:06 -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
Galen Wolfe-Pauly
5236fcbb1e Merge pull request #279 from yebyen/master
sorry more spelling
2015-05-06 18:56:58 -07:00
Kingdon
f1533c8972 necessary 2015-05-06 21:53:05 -04:00
C. Guy Yarvin
3295f1797b Hand-merged ford, zuse and hoon from newgall. 2015-05-06 18:41:20 -07:00
Galen Wolfe-Pauly
70cb0566d8 minor 2015-05-06 18:24:43 -07:00
Galen Wolfe-Pauly
b3e4633e1f new look 2015-05-06 18:01:36 -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
Philip C Monk
99451fa4af Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-05 19:43:36 -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
eb8dbe0ff1 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-05 13:11:39 -07:00
Anton Dyudin
ab8f6c8c69 /~/to/app/mark.json?anon&wire=/ webhook endpoint, accepts raw requests 2015-05-05 13:10:18 -07:00
Galen Wolfe-Pauly
5b7e4120b0 minor doc css 2015-05-04 18:05:13 -07:00
Anton Dyudin
c62717ed8c fix %app thoughts 2015-05-04 13:43:20 -07:00
Anton Dyudin
a8de86094f !: |% → :: |% isn't a valid syntax transform 2015-05-04 11:40:51 -07:00
Anton Dyudin
ede9f1e89e restored :hi 2015-05-04 11:10:02 -07:00
C. Guy Yarvin
acce20899f Continuity breach with new protocol 4. 2015-05-03 16:57:35 -07:00
cgyarvin
6f5abd44ae Merge pull request #277 from urbit/revert-276-revert-275-master
Revert "Revert "Jetted scrypt""
2015-05-03 16:32:12 -07:00
cgyarvin
62cb2f2812 Revert "Revert "Jetted scrypt"" 2015-05-03 16:31:45 -07:00