Commit Graph

3090 Commits

Author SHA1 Message Date
C. Guy Yarvin
4a8fd21963 Merge branch 'test' into demo
Conflicts:
	urb/urbit.pill
2015-06-01 10:59:17 -07:00
Philip C Monk
56c47a8125 Merge branch 'nextbreach' into test
Conflicts:
	urb/zod/base/ape/hood/core.hook
	urb/zod/base/lib/kiln/core.hook
2015-05-31 23:36:30 -04:00
Galen Wolfe-Pauly
9b69907bfa demo network 2015-05-31 12:07:42 -07:00
C. Guy Yarvin
60b5bdacba Fixes. 2015-05-31 12:07:42 -07:00
C. Guy Yarvin
32e87179e9 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-31 01:18:00 -07:00
C. Guy Yarvin
697b911fa8 Various fixes and improvements to oct*. 2015-05-31 01:17:32 -07:00
C. Guy Yarvin
d03d3fcf4e Various fixes and improvements. 2015-05-31 00:19:35 -07:00
Anton Dyudin
072bb7735b transitioned cast to lion, lion to breadth-first, and %tabl not to lose cache due to a missing =. cof cof (again) 2015-05-30 01:28:42 -07:00
Anton Dyudin
8ca9c69be9 userspace cleaning 2015-05-30 00:53:19 -07:00
Anton Dyudin
38839bf941 minor cleaning 2015-05-29 16:48:58 -07:00
C. Guy Yarvin
3f10de5a88 Convert sur/octo. 2015-05-29 15:33:20 -07:00
C. Guy Yarvin
69059e72c0 Split octo into three versions. 2015-05-29 15:24:34 -07:00
C. Guy Yarvin
4a0517f666 Various fixes and improvements. 2015-05-29 15:09:25 -07:00
Anton Dyudin
3e0e63eaa5 fixed styl mark 2015-05-29 15:05:47 -07:00
Anton Dyudin
9747d41e9a reverst %cast ++lion usage until further notice 2015-05-29 15:05:01 -07:00
C. Guy Yarvin
a228f88491 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-29 12:45:27 -07:00
C. Guy Yarvin
1a514466c9 Fix some bugs. Spay talk display. 2015-05-29 12:45:05 -07:00
Anton Dyudin
c4cd7cb075 fix sigh types 2015-05-29 12:27:09 -07:00
Anton Dyudin
7545115853 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-29 12:09:42 -07:00
Anton Dyudin
19fd175abe misc untrackeditude 2015-05-29 12:09:21 -07:00
C. Guy Yarvin
ecff43975d More fixes, etc. 2015-05-29 01:48:14 -07:00
C. Guy Yarvin
4bee29b89c Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/zod/base/ape/octo/core.hook
2015-05-29 01:37:12 -07:00
C. Guy Yarvin
1671375215 Various fixes and improvements. 2015-05-29 01:36:23 -07:00
Anton Dyudin
11b024858f Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-28 16:34:40 -07:00
Anton Dyudin
b56591a002 Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/zod/base/ape/bit/core.hook
2015-05-28 16:34:26 -07:00
Galen Wolfe-Pauly
8888a449cf talk changes 2015-05-28 16:30:06 -07:00
Galen Wolfe-Pauly
fa0d6326c9 octo frontend 2015-05-28 16:16:01 -07:00
Anton Dyudin
d7df3d2ce9 :bit port to hiss v1 2015-05-28 16:07:03 -07:00
Anton Dyudin
1bd371b1cc more liberal casting 2015-05-28 14:36:19 -07:00
C. Guy Yarvin
2b9aafc94e Correct merge from test. 2015-05-28 12:28:12 -07:00
C. Guy Yarvin
82339474c7 Merge branch 'test' into goodtest 2015-05-28 12:17:44 -07:00
C. Guy Yarvin
16004b615e Merge branch 'test' into goodtest
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/dojo/core.hook
	urb/zod/base/ape/hood/core.hook
	urb/zod/base/ape/octo/core.hook
	urb/zod/base/arvo/hoon.hoon
2015-05-28 12:16:10 -07:00
C. Guy Yarvin
cd5026cce5 Yo, didn't add. 2015-05-28 11:28:31 -07:00
Anton Dyudin
3fd544d5a2 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-28 11:10:20 -07:00
Anton Dyudin
132174d9f7 fixed cp-args 2015-05-28 10:38:54 -07:00
Anton Dyudin
a4c42bc7ee cli utils, yet untyped 2015-05-28 10:38:25 -07:00
C. Guy Yarvin
82da3d3adb Semi-fixed octo. 2015-05-28 10:04:24 -07:00
C. Guy Yarvin
ae67dcdf34 Finish moving ++from into bowl. 2015-05-28 00:56:08 -07:00
C. Guy Yarvin
7ec596e1b5 Moved from to bowl. 2015-05-27 23:51:32 -07:00
C. Guy Yarvin
ec1bb36984 Change lat to now. 2015-05-27 20:54:20 -07:00
C. Guy Yarvin
7e841df093 Replaced hide with bowl. 2015-05-27 20:48:25 -07:00
C. Guy Yarvin
217a539e54 Um, commit this. 2015-05-27 20:17:09 -07:00
Anton Dyudin
1f43185e71 cli utils, yet untyped 2015-05-27 19:46:58 -07:00
C. Guy Yarvin
fc07a7e44a Before merging to update gall. 2015-05-27 19:00:53 -07:00
Anton Dyudin
f2e0911933 hiss/sigh typed http requests 2015-05-27 15:34:01 -07:00
Philip C Monk
7fe05c5255 couple of fixes 2015-05-27 13:53:33 -04:00
Henry Ault
6450ed4ca1 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-05-26 17:29:15 -07:00
Henry Ault
ae094a05dc updating joint state 2015-05-26 17:29:02 -07:00
Philip C Monk
dcf4b7ec03 kiln improvements 2015-05-26 20:06:21 -04:00
Anton Dyudin
b18bc0bc24 Merge branch 'master' into test
Conflicts:
	urb/urbit.pill
	urb/zod/base/pub/tree/src/js/components/CodeMirror.coffee
	urb/zod/base/pub/tree/src/js/main.js
2015-05-26 15:12:26 -07:00