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
3,160 Commits 6 Branches 0 Tags 164 MiB
e760115f8a
Commit Graph

131 Commits

Author SHA1 Message Date
Anton Dyudin
e760115f8a Merge branch 'demo' into test 
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/cloud.hoon
	urb/zod/base/arvo/gall.hoon
	urb/zod/base/mar/oct2-move.hoon
	urb/zod/base/mar/oct2-update.hoon
 2015-06-04 17:16:13 -07:00
Anton Dyudin
b32c688648 Revert "remove docs for demo", "remove odds and ends", "demo network", "DEMO ONLY: root beak as %demo." 
This reverts commit 8e1e40d75b3ab15c194b6bf9570f3edc46e2de58.
This reverts commit f073c490f9fd7c5abc033af4857df92229877de7.
This reverts commit f187d2d7e01a54823f3e979af9bbd148b398e7e9.
This reverts commit bc272862a73cfce1b118586ca39d3a377d841f1b.
 2015-06-04 16:56:30 -07:00
Anton Dyudin
09e4021349 added %core silk, transitioned mar lib ape etc. 2015-06-04 15:16:48 -07:00
C. Guy Yarvin
27c102e6fb Merge branch 'demo' of https://github.com/urbit/urbit into demo 2015-06-04 13:48:19 -07:00
C. Guy Yarvin
a0156a472a First phase of gall beak redo. 2015-06-04 13:47:49 -07:00
Henry Ault
224939f6e9 trying to booth gce s with external ips 2015-06-03 17:49:20 -07:00
Galen Wolfe-Pauly
e4ab9c4aed Merge branch 'demo' of github.ct push origin demoom:urbit/urbit into demo 2015-06-03 17:30:44 -07:00
Galen Wolfe-Pauly
5b48108ae6 formatting, &c 2015-06-03 17:29:56 -07:00
Anton Dyudin
08c5fb4719 doubly-wet from-* in hood 2015-06-03 15:16:32 -07:00
Philip C Monk
1357ce6198 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/hood/core.hook
	urb/zod/base/lib/helm/core.hook
 2015-06-03 17:31:37 -04:00
Philip C Monk
3307443e12 use kiln for initial autosync 2015-06-03 17:18:13 -04:00
C. Guy Yarvin
7d4bc90020 Merge branch 'demo' of https://github.com/urbit/urbit into demo 2015-06-03 14:12:53 -07:00
C. Guy Yarvin
ddea34f856 Fix hand-sent moves. 2015-06-03 13:46:53 -07:00
Anton Dyudin
75fd854f40 Merge branch 'demo' into test 2015-06-03 13:15:46 -07:00
Anton Dyudin
63ae7612f6 Merge commit 'f073c490f9^' into test 
Conflicts:
	urb/urbit.pill
 2015-06-03 12:54:56 -07:00
Anton Dyudin
b996b7ff5f fix %url speech type change 2015-06-03 11:44:40 -07:00
Henry Ault
7f16f641bd weird talk bug 2015-06-02 18:36:23 -07:00
C. Guy Yarvin
5b5054e8f6 Various fixes and improvements. 2015-06-02 16:17:55 -07:00
Galen Wolfe-Pauly
c81d742f60 remove odds and ends 2015-06-02 15:59:10 -07:00
C. Guy Yarvin
22a7829b80 Clean up prep and some debugging msgs. 2015-06-02 14:30:00 -07:00
C. Guy Yarvin
52555291bc Fix hood to route errors properly through :talk. 2015-06-02 13:52:33 -07:00
Henry Ault
088397fac7 merging back into test 2015-06-02 13:15:40 -07:00
C. Guy Yarvin
282a9ec75f Various fixes and improvements. 2015-06-02 11:36:56 -07:00
C. Guy Yarvin
3db089b444 Merge branch 'test' into demo 
Conflicts:
	urb/urbit.pill
 2015-06-01 16:47:09 -07:00
C. Guy Yarvin
29ffce7aa6 Various cleanups for demo. 2015-06-01 16:25:22 -07:00
Philip C Monk
54bca477d5 fix validate-foreign-plops 2015-06-01 16:46:36 -04:00
C. Guy Yarvin
c9e785bb48 Support | syntax for hood stuff. 2015-06-01 13:46:22 -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
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
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
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
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
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
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
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
Anton Dyudin
a4c42bc7ee cli utils, yet untyped 2015-05-28 10:38:25 -07:00