urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-15 04:22:48 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,696 Commits 768 Branches 10 Tags 215 MiB
ab3bf3a2d3
Commit Graph

1696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip C Monk
b0f8774343 compiles with most functionality 2015-06-08 18:51:11 -04:00
C. Guy Yarvin
0efc544ae9 Various fixes and improvements. 2015-06-08 12:48:35 -07:00
Philip Monk
61bd56e358 Merge pull request #287 from chc4/patch-1 
Proper :talk instructions
 2015-06-07 09:13:11 -07:00
chc4
73972d558c Proper :talk instructions 
Doing a `;join /urbit-meta` from the initial :talk prompt only works if you are running a destroyer. Since this is the readme and it claims they aren't giving out destroyers (;D), there is a good chance the reader is running a sub, which need the full path for the room to join.
 2015-06-06 23:19:48 -04:00
C. Guy Yarvin
503a953f2e Default -c with -w. 2015-06-05 19:29:05 -07:00
Philip C Monk
2097da7bfa Merge remote-tracking branch 'origin/test' into newunix 2015-06-05 19:36:50 -04:00
Philip C Monk
cfbcadd465 finished with %into in 2015-06-05 19:35:41 -04:00
Anton Dyudin
d91068cf52 minor clean-up: dawn.c->down.c, -sqar.c 2015-06-05 15:52:52 -07:00
C. Guy Yarvin
2f8906d34b Merge branch 'demo' of https://github.com/urbit/urbit into demo 
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/clay.hoon
 2015-06-05 15:11:55 -07:00
C. Guy Yarvin
09fe55d33c Remove numerous printfs. 2015-06-05 15:07:40 -07:00
Galen Wolfe-Pauly
0df53b69dd Merge branch 'demo' of github.com:urbit/urbit into demo 2015-06-05 14:09:12 -07:00
Anton Dyudin
5098c77517 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.

Conflicts:
	urb/urbit.pill
 2015-06-05 14:03:30 -07:00
Anton Dyudin
3c5cbb3921 Merge branch 'demo' of https://github.com/urbit/urbit into demo 2015-06-05 13:30:42 -07:00
Anton Dyudin
2f8023a74c Merge branch 'demo' of https://github.com/urbit/urbit into demo 
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/dojo.hoon
 2015-06-05 13:22:29 -07:00
Anton Dyudin
e37c5088ea Revert "Revert "remove docs for demo", "remove odds and ends", "demo network", "DEMO ONLY: root beak as %demo."" 
This reverts commit b112c9ea1efb661d4bb33965b10ad0a511a86a0c.

Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/cloud.hoon
	urb/zod/base/pub/cloud/src/main.js
 2015-06-05 11:58:32 -07:00
Philip C Monk
2f26b60d59 initial work 2015-06-04 22:47:27 -04:00
Anton Dyudin
a78e45b2e1 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-06-04 18:35:23 -07:00
Anton Dyudin
e4acafd518 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
229bcdc67a 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:07:28 -07:00
Anton Dyudin
c0f66dc492 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
4ba5415077 Merge branch 'demo' of https://github.com/urbit/urbit into demo 2015-06-04 16:37:01 -07:00
C. Guy Yarvin
e0318e16e0 Merge branch 'demo' of https://github.com/urbit/urbit into demo 2015-06-04 13:48:19 -07:00
Galen Wolfe-Pauly
fdf77f9b69 Merge branch 'demo' of github.ct push origin demoom:urbit/urbit into demo 2015-06-03 17:30:44 -07:00
Galen Wolfe-Pauly
e871adea36 no demo 2015-06-03 16:39:34 -07:00
Galen Wolfe-Pauly
a3b18f2ed6 no demo 2015-06-03 16:39:11 -07:00
C. Guy Yarvin
2dfcda3923 Merge branch 'demo' of https://github.com/urbit/urbit into demo 2015-06-03 16:36:06 -07:00
C. Guy Yarvin
35fc549411 Remove warnings. 2015-06-03 16:35:54 -07:00
Anton Dyudin
7fd0f0aa1a Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-06-03 15:15:12 -07:00
Anton Dyudin
e768a4f6d7 Merge branch 'test' into demo: ignore fakenet revert 2015-06-03 14:41:24 -07:00
Philip C Monk
14489860bd Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-06-03 17:36:45 -04:00
Philip C Monk
686d260f30 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
Anton Dyudin
7575e3bf99 Revert "demo network" 
This reverts commit f187d2d7e01a54823f3e979af9bbd148b398e7e9.

Conflicts:
	urb/urbit.pill
 2015-06-03 14:19:49 -07:00
C. Guy Yarvin
99a803d127 Merge branch 'demo' of https://github.com/urbit/urbit into demo 2015-06-03 14:12:53 -07:00
Anton Dyudin
f9a4b84798 Merge branch 'demo' of https://github.com/urbit/urbit into demo 
Conflicts:
	urb/urbit.pill
 2015-06-03 13:54:06 -07:00
Anton Dyudin
91834e088b Merge branch 'test' into demo 2015-06-03 13:26:48 -07:00
Anton Dyudin
6ce0af66ae Ignore commit '209cae1bcfaae' into demo 2015-06-03 13:26:11 -07:00
Anton Dyudin
3487a6ec70 Merge branch 'test' into demo 2015-06-03 13:24:37 -07:00
Anton Dyudin
0e6bc0e24c Merge branch 'demo' into test 2015-06-03 13:15:46 -07:00
Anton Dyudin
89a703c954 Ignore commits 'f073c490f9f' and '8e1e40d75' in test. 
Docs kept, "odds and ends" kept
 2015-06-03 13:15:06 -07:00
Anton Dyudin
cae09b4e49 Merge commit 'f073c490f9^' into test 
Conflicts:
	urb/urbit.pill
 2015-06-03 12:54:56 -07:00
Henry Ault
d279d5245c Merge branch 'test' of https://github.com/urbit/urbit into test 2015-06-02 18:36:40 -07:00
Anton Dyudin
ce8b12dde3 Merge branch 'test' of https://github.com/urbit/urbit into test 
Conflicts:
	urb/urbit.pill
 2015-06-02 18:35:56 -07:00
Philip C Monk
33cf8404fb Merge branch 'goningfix' into test 2015-06-02 21:25:16 -04:00
Philip C Monk
c9f7d39f41 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-06-02 21:24:56 -04:00
Philip C Monk
11c36dad35 add sanity assert 2015-06-02 20:35:09 -04:00
Philip C Monk
bdd7f6b171 better fix 2015-06-02 20:13:10 -04:00
C. Guy Yarvin
f93f84ffe0 Various fixes and improvements. 2015-06-02 16:17:55 -07:00
Philip C Monk
529301335b attempting to fix goning problem 2015-06-02 16:40:53 -04:00
Philip C Monk
95867fafcf ignore dry/wet directory distinction 2015-06-02 15:59:39 -04:00
Philip C Monk
0143c3ca21 Merge branch 'test' of https://github.com/urbit/urbit into test 2015-06-02 15:14:27 -04:00