ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-23 23:12:04 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,174 Commits 6 Branches 0 Tags 164 MiB
493c5e1c0a
Commit Graph

410 Commits

Author SHA1 Message Date
Galen Wolfe-Pauly
d06a6aacb0 Merge branch t push origin test'test' of github.com:urbit/urbit into test 2015-05-15 12:37:03 -07:00
Galen Wolfe-Pauly
e63ea914ab eyre blocking css 2015-05-15 12:36:56 -07:00
Anton Dyudin
e734911a07 icon v2 2015-05-15 12:15:02 -07:00
Anton Dyudin
1cf20c8fab Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-05-15 11:46:38 -07:00
Anton Dyudin
817f7234a2 web dependency tracking injection 2015-05-15 11:28:01 -07:00
C. Guy Yarvin
6b4f6a80f1 Various fixes. 2015-05-15 01:09:12 -07:00
C. Guy Yarvin
9a60d48e21 Various fixes and improvements. 2015-05-14 16:27:45 -07:00
Galen Wolfe-Pauly
ce53f4c5f1 Merge branch of github.com:urbit/urbit into test 2015-05-14 16:07:14 -07:00
Galen Wolfe-Pauly
24f970eb4f not listening 2015-05-14 16:06:56 -07:00
Philip C Monk
53c01ebe81 removed bad printf 2015-05-14 18:45:22 -04:00
Philip C Monk
999e19e3c2 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-05-14 18:37:39 -04:00
Philip C Monk
ed727923ea Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-14 18:01:42 -04:00
Anton Dyudin
d02e9e44ff Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-14 14:59:57 -07:00
Anton Dyudin
94aa7c7678 switching sole 2015-05-14 14:59:45 -07:00
Galen Wolfe-Pauly
4a13e03bd9 Merge branch 'test' of github.com:urbit/urbit into test 2015-05-14 14:05:30 -07:00
Galen Wolfe-Pauly
64d6e9696e full talk name 2015-05-14 13:57:12 -07:00
Philip C Monk
ee4a39d600 sped up merges 2015-05-14 16:30:03 -04:00
Anton Dyudin
5ac01defea Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-14 13:13:58 -07:00
Anton Dyudin
6656d49283 switchable websole v1 2015-05-14 13:13:45 -07:00
C. Guy Yarvin
e190e20256 Checking in for fun and profit. 2015-05-14 12:24:43 -07:00
Galen Wolfe-Pauly
ab48a5f0f1 path out of talk 2015-05-14 12:21:13 -07:00
Philip C Monk
6b956e0dcb added %scot jet hint 2015-05-14 14:12:12 -04:00
Anton Dyudin
15bcbb23e7 cleaning up %base to %home 2015-05-14 11:04:32 -07:00
Philip C Monk
60365b5ae8 added %slaw jet hint 2015-05-14 13:46:52 -04:00
C. Guy Yarvin
04379dac6e Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-05-13 17:15:06 -07:00
C. Guy Yarvin
cc2a7defb5 Various fixes and improvements. 2015-05-13 16:31:13 -07:00
Galen Wolfe-Pauly
df358f27c4 Merge branch 'test' of github.com:urbit/urbit into test 2015-05-13 16:22:03 -07:00
Galen Wolfe-Pauly
7d733fd85c whom 2015-05-13 16:21:51 -07:00
Anton Dyudin
f39de10190 Merge remote-tracking branch 'origin/test' into do 2015-05-13 16:12:58 -07:00
Philip C Monk
6cb1505288 fixed merges 2015-05-13 17:18:43 -04:00
Anton Dyudin
b60cf4d702 port complete 2015-05-13 13:17:38 -07:00
Anton Dyudin
5d252b315e Merge branch 'test' into do 2015-05-13 12:46:39 -07:00
Anton Dyudin
a8578d4ed2 port1 2015-05-13 12:46:25 -07:00
Anton Dyudin
77796a4fa6 Merge branch 'test' into do 
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/dill.hoon
	urb/zod/base/arvo/gall.hoon
 2015-05-13 12:21:53 -07:00
Henry Ault
a9e358a759 small updates 2015-05-13 06:14:36 -07:00
C. Guy Yarvin
2b940d9346 Various fixes and improvements; test can :?begin. 2015-05-13 01:02:34 -07:00
Henry Ault
552d388e17 working do 2015-05-12 16:35:59 -07:00
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
Galen Wolfe-Pauly
8b2b182cf1 Merge branch 'test' of github.com:urbit/urbit into test 2015-05-12 15:21:25 -07:00
Galen Wolfe-Pauly
6ac76f9f73 octo frontend 2015-05-12 15:21:10 -07:00
C. Guy Yarvin
30d32255b9 Let %them through. 2015-05-12 15:00:18 -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
C. Guy Yarvin
6dcbda8df4 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/helm/core.hook
 2015-05-12 13:36:21 -07:00
C. Guy Yarvin
5665fb132a Various cleanups. 2015-05-12 13:10:22 -07:00
Anton Dyudin
fdbf46ce16 added json octo interfaces 2015-05-12 12:57:58 -07:00
Anton Dyudin
23939c6dfd Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-11 17:51:00 -07:00
Anton Dyudin
5d718597c5 sole transmute fix 2015-05-11 17:50:40 -07:00
C. Guy Yarvin
6952ecaa75 Switch from helm to hood. 2015-05-11 17:43:47 -07:00
C. Guy Yarvin
2cfe3c252b Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-11 17:32:47 -07:00
C. Guy Yarvin
1f2ed6ae76 Merge old helm code into hood/kiln. 2015-05-11 17:31:37 -07:00
Anton Dyudin
0eaaa00f6f cherry-pick 8caa882 'add tym to dojo' 2015-05-11 12:09:41 -07:00
C. Guy Yarvin
9e84fca27e Fix %mack. 2015-05-11 11:16:04 -07:00
C. Guy Yarvin
1a7b72fbe9 Forgot a file. 2015-05-11 11:05:14 -07:00
C. Guy Yarvin
66f7b16d5e Various fixes and improvements. 2015-05-11 10:53:47 -07:00
Henry Ault
16d4b63594 Merge branch 'master' of https://github.com/urbit/urbit into do 2015-05-10 16:44:53 -07:00
C. Guy Yarvin
b3027a328b And %gall is reborn. 2015-05-09 15:55:05 -07:00
C. Guy Yarvin
fa5f5dc786 Didn't mean to chek in a broken helm. 2015-05-09 15:35:57 -07:00
C. Guy Yarvin
e7791411cb The great god %gall is dead. 2015-05-09 13:49:11 -07:00
C. Guy Yarvin
33761503cb Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2015-05-09 13:47:51 -07:00
C. Guy Yarvin
b8317260a9 Deprecate old apps to improve name completion. 2015-05-09 13:40:53 -07:00
C. Guy Yarvin
ea5ab48776 Various fixes and improvements. 2015-05-09 13:38:33 -07:00
C. Guy Yarvin
cf6cd46177 Various fixes and improvements. 2015-05-08 18:08:18 -07:00
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
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
Galen Wolfe-Pauly
d7a2dd9905 off by one 2015-05-07 12:16:48 -07:00
vere
becc52fecd Revert "test roll 6" 
This reverts commit 638ad719a81d9e58f285c3d17ef4238741da6ff0.
 2015-05-07 19:04:47 +00:00
Galen Wolfe-Pauly
b4f0dc6143 audience 2015-05-07 11:47:25 -07: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
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
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
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
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
Philip C Monk
c53d71fc33 stack overflow-inducing dill 2015-05-06 15:55:47 -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
62cb2f2812 Revert "Revert "Jetted scrypt"" 2015-05-03 16:31:45 -07:00
cgyarvin
7d6815b009 Revert "Jetted scrypt" 2015-05-03 16:28:51 -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
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
Anton Dyudin
4c2e39b74b dep-missed drop 2015-05-01 12:03:02 -07:00
Florian Steinel
c9b832d811 fix link to the guides 2015-05-01 15:18:01 +02:00
Anton Dyudin
8eba67cf03 norm mark beaks 2015-04-30 17:34:57 -07:00
Philip C Monk
38e20772a6 Merge branch 'master' of https://github.com/urbit/urbit 2015-04-30 17:09:18 -04:00
Philip C Monk
a672eb691e forgot to commit cat/helm/unix 2015-04-30 17:09:02 -04:00
Philip C Monk
b97b04a552 get rid of swapfile 2015-04-30 17:01:41 -04:00
Philip C Monk
6457c00c28 comment out %camping 2015-04-30 15:58:39 -04:00
Anton Dyudin
8240fc7723 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-04-30 12:49:17 -07:00
Anton Dyudin
7ebfeda9a5 fixed main/ imports to base/ 2015-04-30 12:37:46 -07:00
Philip C Monk
d30dfc5270 bumped protocol number to 3 2015-04-30 14:52:51 -04:00
Philip C Monk
fb74e61885 moved ford dependencies to new model 2015-04-30 14:37:22 -04:00
Philip C Monk
75d4e2fbad added %next clay subscription type 2015-04-29 21:23:46 -04:00
Philip C Monk
ed698889f6 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-04-29 19:03:59 -04:00
Philip C Monk
f03263852c main->base, arvo events depth-first 2015-04-29 18:48:45 -04:00