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

3426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
C. Guy Yarvin
831cd4757e Merge branch 'demo' of https://github.com/urbit/urbit into demo 2015-06-09 16:12:53 -07:00
Galen Wolfe-Pauly
76dfbc4110 Merge branch 'demo' of github.com:urbit/urbit into demo 2015-06-09 14:57:02 -07:00
Galen Wolfe-Pauly
9076c6074b talk detail 2015-06-09 14:56:54 -07:00
Philip C Monk
b13941458b all compiles 2015-06-09 16:55:07 -04:00
Anton Dyudin
a0c5212ee3 work around ^~ language issue, restore lib/talk 
Conflicts:
	urb/zod/base/lib/talk.hoon
 2015-06-09 12:21:54 -07:00
Anton Dyudin
a02f8d0f06 work around ^~ language issue, restore lib/talk 2015-06-09 12:20:51 -07:00
Philip C Monk
07fc0a5def basic clay stuff written, haven't compiled 2015-06-09 15:18:32 -04:00
Henry Ault
277886d092 list images 2015-06-09 10:35:02 -07:00
Galen Wolfe-Pauly
ae4ddbb50b Merge branch 'demo' of github.com:urbit/urbit into demo 2015-06-09 10:12:10 -07:00
C. Guy Yarvin
63a71c7200 Some tweaks. 2015-06-09 08:23:40 -07:00
C. Guy Yarvin
e09301dd48 Fix obsolete-beak and gall-misordering bugs. 2015-06-08 23:53:39 -07:00
Galen Wolfe-Pauly
d030d5dc82 Merge branch 'demo' of github.com:urbit/urbit into demo 2015-06-08 18:14:51 -07:00
Galen Wolfe-Pauly
a4e3254c8a fonts and some talk details 2015-06-08 18:14:18 -07:00
C. Guy Yarvin
d290c2288b But compiling. 2015-06-08 17:06:42 -07:00
C. Guy Yarvin
5c745dbcc4 Prinrtf. 2015-06-08 17:05:43 -07:00
C. Guy Yarvin
e35e682bd4 Yes. 2015-06-08 16:48:46 -07:00
C. Guy Yarvin
edb77b95cb But actually compiling. 2015-06-08 16:46:56 -07:00
C. Guy Yarvin
ecc39e0fef Printf. 2015-06-08 16:46:26 -07:00
C. Guy Yarvin
1d09626776 Less. 2015-06-08 16:36:14 -07:00
C. Guy Yarvin
b9b470ae78 Moar! 2015-06-08 16:20:50 -07:00
C. Guy Yarvin
50beabda7f Right. 2015-06-08 16:17:06 -07:00
C. Guy Yarvin
5a17929381 Right. 2015-06-08 15:53:43 -07:00
C. Guy Yarvin
50d0d7e5fa Moar printf. 2015-06-08 15:52:51 -07:00
C. Guy Yarvin
481a8cc2d0 Moar printf. 2015-06-08 15:41:38 -07:00
C. Guy Yarvin
4a10194d5c Typo. 2015-06-08 15:17:47 -07:00
C. Guy Yarvin
5865526981 Debug printfs. 2015-06-08 15:16:04 -07:00
C. Guy Yarvin
a4cf8b1d0e Fix auth url in bit. Add app/ in %app talk report. 2015-06-08 14:30:32 -07:00
C. Guy Yarvin
d155f0497f Various fixes and improvements. 2015-06-08 12:48:35 -07:00
C. Guy Yarvin
c584282cd1 Bandaid 2, a gross one. 2015-06-06 22:49:53 -07:00
C. Guy Yarvin
5818f4c437 Disable olz mechanism in ames. 2015-06-06 22:00:18 -07:00
Philip C Monk
b308b48a78 Merge remote-tracking branch 'origin/test' into newunix 2015-06-05 19:36:50 -04:00
C. Guy Yarvin
2c7b323c88 Merge branch 'demo' of https://github.com/urbit/urbit into demo 2015-06-05 16:02:01 -07:00
C. Guy Yarvin
458ece32f3 Work around bizarre *envelope bug. 2015-06-05 16:01:44 -07:00
Anton Dyudin
e2ec03fb56 stray core.hook 2015-06-05 15:59:39 -07:00
Anton Dyudin
b644040e7a minor clean-up: dawn.c->down.c, -sqar.c 2015-06-05 15:52:52 -07:00
Galen Wolfe-Pauly
f837e082b6 nock spec 2015-06-05 15:45:52 -07:00
C. Guy Yarvin
6334937f1a New pill. 2015-06-05 15:33:07 -07:00
Anton Dyudin
7b4e85bad4 psal -> elem 2015-06-05 15:20:26 -07:00
C. Guy Yarvin
acc4b61cda 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
2888822f70 Remove numerous printfs. 2015-06-05 15:07:40 -07:00
Galen Wolfe-Pauly
493c5e1c0a minor cm css 2015-06-05 14:11:03 -07:00
Galen Wolfe-Pauly
8f84e30e44 Merge branch 'demo' of github.com:urbit/urbit into demo 2015-06-05 14:09:12 -07:00
Galen Wolfe-Pauly
5cd6aff30e codemirror css 2015-06-05 14:09:02 -07:00
Anton Dyudin
80ac6ffe0a 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
5fee8a558e fix tree relative path 2015-06-05 13:32:29 -07:00
Anton Dyudin
7dee1f7466 Merge branch 'demo' of https://github.com/urbit/urbit into demo 2015-06-05 13:30:42 -07:00
Anton Dyudin
89a76c488b 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
bfa80ec64b abstract oct3 fab over desk 2015-06-05 12:50:34 -07:00
Henry Ault
4a370a7318 talk bug, instructions in asana 2015-06-05 12:36:58 -07:00
Anton Dyudin
b9de345874 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