urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-07 13:37:36 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,851 Commits 768 Branches 10 Tags 215 MiB
e1480cb570
Commit Graph

183 Commits

Author SHA1 Message Date
Raymond Pasco
e1480cb570 Merge remote-tracking branches 'philipcmonk/ford-fix', 'ray/lune-nule' and 'ohaitch/talk-comments' 
Conflicts:
	mar/tree/comments.hoon

Fix off-by-one in marks that was removing the last byte of clay files
Add ++lune/++nule Unix textfile arms
Route .tree 'comments' input through talk
 2016-02-29 17:11:50 -05:00
Anton Dyudin
1cf56bd06b added comment hash identifier 2016-02-25 18:41:29 -08:00
Philip C Monk
17d6fccced reset on initial pull 2016-02-25 18:19:44 -05:00
Anton Dyudin
d331391486 proxy tree comments through talk 
urbit/tree@bdebe54
 2016-02-25 12:38:00 -08:00
Raymond Pasco
259eb79cb8 Merge remote-tracking branches 'curtis/swaggle', 'anton/fix-init-no-data' and 'anton/fix-generators' 
Conflicts:
	gen/hood/begin.hoon
	gen/moon.hoon

Fix ++swag electroplating-induced bug
Fix boot process for galaxies
Finish 151izing the source tree
 2016-02-17 19:35:36 -05:00
Anton Dyudin
bf2164054d factor out map-to-json 2016-02-17 15:50:03 -08:00
Anton Dyudin
73bcc66007 remaining libraries 2016-02-17 15:36:43 -08:00
Raymond Pasco
84ae855cce Merge remote-tracking branch 'ohaitch/tree-apps' 
The proverbial various fixes and improvements
 2016-02-16 15:49:15 -05:00
Anton Dyudin
9b2ae7f460 fix lib/write 2016-02-11 16:33:22 -08:00
Anton Dyudin
8a6bb31ed0 151ify tree hooks 2016-02-11 16:33:22 -08:00
Anton Dyudin
fb3c53553f add missing /?s 2016-02-11 16:33:21 -08:00
Anton Dyudin
81297bc162 Merge branch 'hoon-151' into tree-comments 
Merge hoon 151
 2016-02-10 19:43:53 -08:00
Anton Dyudin
07bbbee2cc fix mis-translated / to + 2016-02-10 18:58:14 -08:00
Raymond Pasco
73029e9aef Merge remote-tracking branch 'ohaitch/ford-wipe' 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/ford.hoon
	urb/zod/arvo/gall.hoon
	urb/zod/arvo/zuse.hoon
	urb/zod/gen/hood/overload.hoon
	urb/zod/lib/kiln.hoon

NB: Was briefly hotfixed to master, if you care about trivia
 2016-02-10 18:12:24 -05:00
Anton Dyudin
e047aa6690 add %f %wipe cache-clear command, for |overload 2016-02-10 14:36:17 -08:00
Raymond Pasco
309805f5e7 Merge in Hoon 151 
Complicated merge of Hoon 151. This commit is a major sequence point.
 2016-02-10 14:03:28 -05:00
Anton Dyudin
fbc5c6c21a html-entities newline 2016-02-09 21:15:53 -08:00
Anton Dyudin
bd143385c5 Merge branch 'data-dep' into tree-comments 
handle chrome/data separation in an official manner
 2016-02-09 21:15:52 -08:00
Anton Dyudin
71adc8fb50 first try at head-body separation 2016-02-09 21:15:38 -08:00
Anton Dyudin
5677254816 move /~date.comments-md to /comments/~date.md 
when outputing tree comments
 2016-02-09 11:55:43 -08:00
Raymond Pasco
d5e097e82a Merge remote-tracking branch 'galenwp/factor' 
Conflicts:
	urb/urbit.pill
	urb/zod/ape/bit.hoon
	urb/zod/arvo/eyre.hoon
	urb/zod/mar/hook.hoon
	urb/zod/pub/bit/fab/hymn.hook
	urb/zod/pub/docs/dev/hoon/principles/1-twigs.md
	urb/zod/pub/docs/dev/hoon/principles/2-syntax.md
	urb/zod/pub/docs/dev/hoon/reference/odors.md
	urb/zod/pub/docs/dev/hoon/reference/pronunciation.md
	urb/zod/pub/docs/dev/hoon/runes/sg/sgcn.md
	urb/zod/pub/docs/dev/hoon/runes/sm.md
	urb/zod/pub/docs/dev/hoon/runes/sm/smsg.md
	urb/zod/pub/docs/dev/hoon/runes/sm/smzz.md
	urb/zod/pub/docs/dev/hoon/runes/ts/tssg.md
	urb/zod/pub/docs/dev/hoon/runes/wt/wthz.md
	urb/zod/pub/docs/dev/hoon/runes/wt/wtls.md
	urb/zod/pub/docs/dev/hoon/runes/zp/zpzp.md
	urb/zod/pub/docs/theory/whitepaper.md
	urb/zod/pub/docs/user/appliance.md
	urb/zod/pub/docs/user/intro.md
	urb/zod/pub/docs/user/talk.md

Merged Galen and Anton's web refactoring work
 2016-02-08 16:14:03 -08:00
Anton Dyudin
c05e96c62f fix hoon location header information 2016-02-04 19:05:37 -08:00
Anton Dyudin
e1c1da92c2 standardize location-header structure 2016-02-04 18:57:44 -08:00
Galen Wolfe-Pauly
2a95c443ed Merge branch 'factor' of github.com:ohAitch/urbit into factor 
Conflicts:
	urb/zod/web/tree/main.js

(had a newer main.js)

talk@26b0befe86
tree@621235bf52
 2016-02-04 16:16:18 -08:00
Galen Wolfe-Pauly
087911e581 sweeping with anton 2016-02-04 11:52:00 -08:00
C. Guy Yarvin
24b1e1c5d2 Convert $+ to $-. 2016-02-03 23:12:23 -08:00
Anton Dyudin
e77bda234e add comments to tree 
https://github.com/urbit/tree/tree/0a9c5a0
 2016-02-03 17:53:38 -08:00
Galen Wolfe-Pauly
bfd52f9e32 sweeping 2016-02-03 16:12:46 -08:00
Anton Dyudin
f1b3451c1d minor cleaning 2016-02-02 13:24:20 -08:00
Anton Dyudin
53006273ee Don't inject ;meta(urb_front) if frontmatter is empty/nonexistent 2016-02-01 11:53:25 -08:00
C. Guy Yarvin
049f1defb2 151 merge is double solid. 2016-01-31 22:16:26 -08:00
C. Guy Yarvin
25d791e2a4 Merge remote-tracking branch 'upstream/master' into newdeal 2016-01-31 20:37:49 -08:00
C. Guy Yarvin
761f588cc6 Fix various marks, etc. 2016-01-30 19:37:03 -08:00
C. Guy Yarvin
4c7a8e6f32 Removed %work. 2016-01-30 15:52:55 -08:00
C. Guy Yarvin
6c71b1cdf3 Fix oct*. Check in %work to delete it. 2016-01-30 15:44:22 -08:00
C. Guy Yarvin
8edc8d4361 Sigh. 2016-01-30 14:32:49 -08:00
C. Guy Yarvin
b4469d0aa3 Fix some shit code in lib/tree.hoon. 2016-01-29 20:40:01 -08:00
C. Guy Yarvin
e987337bfb In the middle of internal merge. 2016-01-29 18:25:52 -08:00
Anton Dyudin
d1e6db156d Merge branch 'eyre-root-beam' into ford-ren - requested for glen/factor merge 2016-01-29 14:41:19 -08:00
C. Guy Yarvin
fc1068dfae Revert "Stripdown part 2." 
This reverts commit afcc1cb9a80db3a687d7a2a1dc3bf1be38df5b68.
 2016-01-25 16:52:58 -08:00
C. Guy Yarvin
a0a2cdf64f Revert "Cleanup commit #1; revert this when ready to merge." 
This reverts commit c12823babc63665e30fe4e3935ccda80601d6cf8.
 2016-01-25 16:49:09 -08:00
C. Guy Yarvin
0231d41cb6 .^ fully transitioned. 2016-01-25 16:47:58 -08:00
Anton Dyudin
8fedb7d119 Don't inject ;meta(urb_front) if frontmatter is empty/nonexistent 2016-01-25 13:53:12 -08:00
C. Guy Yarvin
fdc328e71a Enforce type sanity on .=. 2016-01-24 19:37:41 -08:00
Philip C Monk
b793d72121 Merge remote-tracking branches 'ray/fixlore', 'my/loremark', 'my/fancy-autoreload' and 'my/fixmerge' 2016-01-13 16:22:51 -05:00
Philip C Monk
d369819b1d default case correctly in |merge 
also, get rid of extra ~& in kiln
 2016-01-13 15:11:25 -05:00
Philip C Monk
c48f26ce7d autoreload sanely 2016-01-12 16:20:57 -05:00
Raymond Pasco
cde64c834d Merge remote-tracking branch 'philipcmonk/cy-without-hash' 
Conflicts:
	urb/urbit.pill

Clay arcana (%cy to faster %cz)
 2016-01-11 10:57:30 -05:00
Philip C Monk
9725cf492a forgot a urb/zod/lib/kiln.hoony -> urb/zod/lib/kiln.hoonz 2016-01-09 18:41:05 -05:00
Philip C Monk
0bbae7e679 split %cy hash out into %cz 2016-01-07 18:54:42 -05:00