Commit Graph

2785 Commits

Author SHA1 Message Date
Henry Ault
4c117a9418 merge test 2015-05-07 14:34:49 -07:00
Henry Ault
c464f0fbb3 fake network 2015-05-07 14:33:18 -07:00
Henry Ault
fdf8a0639a send bitcoin and view address where you received 2015-05-07 11:26: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
Henry Ault
c77662a009 Merge branch 'do' of http://github.com/urbit/urbit into do
Conflicts:
	urb/zod/base/app/bit/core.hook
2015-05-07 02:51:55 -04:00
Henry Ault
478d210298 ported to real network 2015-05-07 02:49:30 -04:00
Henry Ault
4b928f5e22 port forward 2015-05-07 02:47:41 -04:00
C. Guy Yarvin
de80178627 Hand-merge in all newgall files. 2015-05-06 19:31:54 -07:00
Henry Ault
999ca3535b publisher update 2015-05-06 19:29:56 -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
C. Guy Yarvin
3295f1797b Hand-merged ford, zuse and hoon from newgall. 2015-05-06 18:41:20 -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
Henry Ault
b543549d28 moved main to base 2015-05-06 14:08:27 -07:00
Henry Ault
1161ab655c Merge branch 'test' into do 2015-05-06 14:05:58 -07:00
Henry Ault
cf86110ae7 added uncommitted things part 2 2015-05-06 14:00:06 -07:00
Henry Ault
c412a78f97 notify thru urbit, add missing cats 2015-05-06 13:57:20 -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
cgyarvin
f1fcff84a9 Merge pull request #276 from urbit/revert-275-master
Revert "Jetted scrypt"
2015-05-03 16:29:24 -07:00
cgyarvin
7d6815b009 Revert "Jetted scrypt" 2015-05-03 16:28:51 -07:00
cgyarvin
35417f4d60 Merge pull request #275 from Hmmm-Max/master
Jetted scrypt
2015-05-03 16:21:36 -07:00
Max G
ffbc4366be new bounds 2015-05-03 23:45:41 +03:00
Max G
3ef2611ff9 Jetted scrypt 2015-05-03 15:26:42 +03:00
Galen Wolfe-Pauly
c020671d3f Merge branch 'test' of github.com:urbit/urbit into test 2015-05-01 18:28:26 -07:00
Philip C Monk
334840e068 performance improvements 2015-05-01 21:26:59 -04:00
Galen Wolfe-Pauly
46264b255d minor talk fixes 2015-05-01 18:16:32 -07:00
Galen Wolfe-Pauly
276b8fc416 minor talk fixes 2015-05-01 18:06:28 -07:00
Anton Dyudin
95528fb7d4 v0 beam compilation 2015-05-01 17:16:57 -07:00
Anton Dyudin
f4b0255dd6 fixed tree to point at /=home= 2015-05-01 15:10:32 -07:00
Anton Dyudin
f2e605f491 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-05-01 15:09:59 -07:00
Anton Dyudin
d22f243dfe multi-dependency support 2015-05-01 14:43:41 -07:00
Henry Ault
c363267149 old system 2015-05-01 13:43:10 -07:00
Philip C Monk
dc773b37f3 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-05-01 16:41:34 -04:00
Philip C Monk
ff2597da68 performane improvements 2015-05-01 16:32:04 -04:00