ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-15 02:48:06 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,846 Commits 6 Branches 0 Tags 164 MiB
1cf20c8fab
Commit Graph

74 Commits

Author SHA1 Message Date
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
9a60d48e21 Various fixes and improvements. 2015-05-14 16:27:45 -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
8ba1b0ccf3 switching sole 2015-05-14 15:01:31 -07:00
Anton Dyudin
94aa7c7678 switching sole 2015-05-14 14:59:45 -07:00
Philip C Monk
ee4a39d600 sped up merges 2015-05-14 16:30:03 -04:00
Anton Dyudin
6656d49283 switchable websole v1 2015-05-14 13:13:45 -07:00
Anton Dyudin
15bcbb23e7 cleaning up %base to %home 2015-05-14 11:04:32 -07: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
Philip C Monk
6cb1505288 fixed merges 2015-05-13 17:18:43 -04:00
C. Guy Yarvin
2b940d9346 Various fixes and improvements; test can :?begin. 2015-05-13 01:02:34 -07:00
C. Guy Yarvin
30d32255b9 Let %them through. 2015-05-12 15:00:18 -07: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
C. Guy Yarvin
6952ecaa75 Switch from helm to hood. 2015-05-11 17:43:47 -07:00
C. Guy Yarvin
1f2ed6ae76 Merge old helm code into hood/kiln. 2015-05-11 17:31:37 -07:00
C. Guy Yarvin
9e84fca27e Fix %mack. 2015-05-11 11:16:04 -07:00
C. Guy Yarvin
b3027a328b And %gall is reborn. 2015-05-09 15:55:05 -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
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
C. Guy Yarvin
fbf9930b34 test now switched over to behn. 2015-05-08 16:02:50 -07:00
C. Guy Yarvin
e15fcdbcda Unbreak eyre. 2015-05-08 13:57:34 -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
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
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
Anton Dyudin
b8c3720c28 continuity roll 5 2015-05-07 10:36:29 -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
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