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

1827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Galen Wolfe-Pauly
652c5afcd2 Merge branch 'master' of github.com:urbit/urbit 2015-06-17 10:21:29 -07:00
Galen Wolfe-Pauly
f28fcb1d7e register -> begin 2015-06-17 10:21:25 -07:00
Galen Wolfe-Pauly
0740c31020 Merge pull request #298 from Tenari/patch-1 
typo fix
 2015-06-16 18:58:45 -07:00
Daniel Zapata
223a534e16 typo fix 2015-06-16 20:56:58 -05:00
Galen Wolfe-Pauly
47857f071d new readme 2015-06-16 18:27:28 -07:00
Galen Wolfe-Pauly
d4e76bf750 simpler readme 2015-06-16 18:25:32 -07:00
Philip C Monk
542b6f843a dealt with some memory leaks 2015-06-16 19:48:34 -04:00
Anton Dyudin
13fce572ea Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
	urb/zod/base/mar/oct3-move.hoon
	urb/zod/base/pub/cloud/fab/hymn.hook
	urb/zod/base/pub/cloud/src/main.js
 2015-06-16 15:19:51 -07:00
Anton Dyudin
3182574f0d clarified bootup printf 2015-06-16 15:03:11 -07:00
Philip C Monk
6ad8eb401e Merge remote-tracking branch 'origin/test' into newunix 
Conflicts:
	urb/urbit.pill
	urb/zod/base/arvo/clay.hoon
 2015-06-16 17:44:47 -04:00
Philip C Monk
88e1296dbb ergo merges 2015-06-16 17:34:21 -04:00
Anton Dyudin
f116c42320 Revert "remove docs for demo", "remove odds and ends", "demo network", "DEMO ONLY: root beak as %demo.", "DEMO ONLY: don't show doznec flapping.", "Prinrtf." 
This reverts commit 8e1e40d75b3ab15c194b6bf9570f3edc46e2de58.
This reverts commit f073c490f9fd7c5abc033af4857df92229877de7.
This reverts commit f187d2d7e01a54823f3e979af9bbd148b398e7e9.
This reverts commit bc272862a73cfce1b118586ca39d3a377d841f1b.
This reverts commit 30a397513f8890a3406dc7ab91c6e067e3bbfbbb.
This reverts commit 4fc6856fb50d88c20a0f533392ca606641c5f38f.

Conflicts:
	urb/urbit.pill
	urb/zod/base/lib/drum.hoon
 2015-06-15 18:10:02 -07:00
Anton Dyudin
af55a9e6bd Merge branch 'test' into demo 
Conflicts:
	urb/urbit.pill
	urb/zod/base/ape/hood.hoon
	urb/zod/base/mar/hoon.hoon
 2015-06-15 15:06:59 -07:00
Anton Dyudin
4559ddefde Revert "Revert "remove docs for demo", "remove odds and ends", "demo network", "DEMO ONLY: root beak as %demo."" 
This reverts commit b07f8c81db3f7ab0a10d1b8ddc58de7c593612fc.

Conflicts:
	urb/urbit.pill
	urb/zod/base/pub/doc/guide/a-ford.md
	urb/zod/base/pub/doc/hoon/library/3bg.md
 2015-06-15 14:56:52 -07:00
Philip C Monk
cfa127d574 better mug checking 2015-06-15 17:52:35 -04:00
Philip C Monk
894f9726be more fixes 2015-06-12 21:01:37 -04:00
Philip C Monk
3a8e368182 fixed more problems 2015-06-12 20:48:16 -04:00
Philip Monk
fe19cb23e7 Merge pull request #291 from rastus-vernon/patch-1 
Fix copyright notice
 2015-06-11 22:23:33 -07:00
Rastus Vernon
11edba2f08 Change copyright owner to "Urbit" 
The copyright notice mentioned the Free Software Foundation, while the
LICENSE.txt file mentions simply "Urbit". It makes sense to change it to
the latter.

Also added myself to contributors.
 2015-06-12 01:19:54 -04:00
Rastus Vernon
933ad886c2 Fix the copyright year 2015-06-12 01:05:22 -04:00
Philip C Monk
4f842a38f8 mount mostly works 2015-06-11 23:52:42 -04:00
Philip C Monk
6f21b511a2 put c errors in stack trace 2015-06-10 23:59:08 -04:00
Henry Ault
4f695e3c25 Merge branch 'demo' of https://github.com/urbit/urbit into demo 2015-06-10 17:01:46 -07:00
ault011
138ca1c14b updated :+helm?begin to :?begin 2015-06-09 17:31:27 -07:00
C. Guy Yarvin
bb26600c9c Merge branch 'demo' of https://github.com/urbit/urbit into demo 2015-06-09 16:12:53 -07:00
C. Guy Yarvin
5a7fa107c2 No file limit. 2015-06-09 16:12:36 -07:00
Philip C Monk
1b09820284 boots! 2015-06-09 17:09:02 -04:00
Philip C Monk
e903c71c78 all compiles 2015-06-09 16:55:07 -04:00
Philip C Monk
cb7a824c18 added %ogre handling 2015-06-09 13:27:22 -04:00
Galen Wolfe-Pauly
f004dec212 Merge branch 'demo' of github.com:urbit/urbit into demo 2015-06-09 10:12:10 -07:00
C. Guy Yarvin
0cacc4ed49 Proper auto directory name. 2015-06-09 01:54:43 -07:00
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