ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-18 12:22:10 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,807 Commits 6 Branches 0 Tags 164 MiB
3884808c55
Commit Graph

2807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Henry Ault
3884808c55 Merge remote-tracking branch 'origin/master' into do 2015-05-12 15:59:28 -07:00
Henry Ault
689b5df159 about to port 2015-05-12 15:58:27 -07:00
Philip C Monk
4bc1fc316d forgot to commit the mass cat 2015-05-12 17:59:27 -04:00
Philip C Monk
7f7512e3dc bump to protocol 6 2015-05-12 17:31:25 -04:00
Philip C Monk
b2eddf4f83 Merge remote-tracking branch 'origin/master' into space-tools 
Conflicts:
	urb/urbit.pill
 2015-05-12 17:24:24 -04:00
Philip C Monk
d43169dc17 reworked ++mass 2015-05-12 17:18:34 -04:00
Henry Ault
16d4b63594 Merge branch 'master' of https://github.com/urbit/urbit into do 2015-05-10 16:44:53 -07:00
Henry Ault
2a2aa4fc09 better talk flow 2015-05-07 17:01:25 -07:00
Henry Ault
cf5587c3db message to sender 2015-05-07 16:53:08 -07:00
henry
799baff5a5 Various fixes and improvements -- bit 2015-05-07 19:27:50 -04:00
henry
f0e3a88ea8 precommit 2015-05-07 19:25:22 -04:00
Henry Ault
19c6469956 switch on port # 2015-05-07 15:23:22 -07:00
Henry Ault
12550a7e89 merge local 2015-05-07 15:02:24 -07:00
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
Anton Dyudin
99c5992ed1 Merge branch 'master' of https://github.com/urbit/urbit to fix #278 
Conflicts:
	urb/urbit.pill
 2015-05-07 14:18:19 -07:00
Anton Dyudin
60eb11a0f7 fix ames begin to talk to gall 2015-05-07 14:17:39 -07:00
Philip C Monk
eccaacd790 revert errant clay change 2015-05-07 16:32:37 -04:00
vere
becc52fecd Revert "test roll 6" 
This reverts commit 638ad719a81d9e58f285c3d17ef4238741da6ff0.
 2015-05-07 19:04:47 +00:00
vere
c45ab98654 test roll 6 2015-05-07 18:44:32 +00:00
Henry Ault
fdf8a0639a send bitcoin and view address where you received 2015-05-07 11:26:10 -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
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
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
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