urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-13 16:03:36 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,745 Commits 768 Branches 10 Tags 215 MiB
c43641ab93
Commit Graph

132 Commits

Author SHA1 Message Date
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
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
Anton Dyudin
83af2347c4 :talk &foo ~.channel now :talk|foo ~.channel 2016-02-04 18:12:48 -08:00
Anton Dyudin
268d62cfe5 moved some tree-combine logic to marks 2016-02-04 16:27:55 -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
Anton Dyudin
065bc10999 Merge branch 'factor' of https://github.com/galenwp/urbit into factor 
Conflict: paste fixed in factor, deleted in glen/factor
 2016-02-03 17:52:42 -08:00
Galen Wolfe-Pauly
bfd52f9e32 sweeping 2016-02-03 16:12:46 -08:00
Anton Dyudin
dd2aff37a8 fix metadata reading 2016-02-03 14:43:40 -08:00
Anton Dyudin
a2081a7482 transfered /@ to "include by date", /& now "cast to mark" 2016-02-01 15:58:48 -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
e987337bfb In the middle of internal merge. 2016-01-29 18:25:52 -08:00
Anton Dyudin
4cc89df474 fix hoon source not rendering in tree 2016-01-29 17:36:37 -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
a0a2cdf64f Revert "Cleanup commit #1; revert this when ready to merge." 
This reverts commit c12823babc63665e30fe4e3935ccda80601d6cf8.
 2016-01-25 16:49:09 -08:00
Philip C Monk
0f0d08356c fix marks for new lore/role 2016-01-13 16:19:09 -05:00
Anton Dyudin
5f87a2d997 classic garb 2016-01-06 13:49:13 -08:00
Anton Dyudin
0c473d2083 fix examples, remove mdy, react marks 2016-01-06 12:58:26 -08:00
Anton Dyudin
ca1502ed77 no more hook files! 
- index factored into index ren
- paste json assigned new %paste-new mark
- /!mark/ horn added to execute hoon as generating said mark
  + app front pages moved accordingly
- 404 moved to md
 2016-01-05 19:15:43 -08:00
C. Guy Yarvin
84a0846379 Double-solid before devulcanization transition attempt. 2016-01-03 16:23:19 -08:00
C. Guy Yarvin
ddae003feb Devulcanization artifacts out of vanes. 2016-01-03 01:22:57 -08:00
C. Guy Yarvin
836bda4995 Now satisfied with casual containers. 2016-01-01 16:19:06 -08:00
C. Guy Yarvin
f6d54ae941 Cleanup commit #1; revert this when ready to merge. 2015-12-22 21:04:35 -08:00
Anton Dyudin
4efa26c2d9 moved /% to ren, changed /% to act on virtual path only 2015-12-21 17:29:47 -08:00
C. Guy Yarvin
9fa3e1c23f Final conversion of # to +. 2015-12-20 13:16:39 -08:00
C. Guy Yarvin
860dff2d26 Convert + to / in codebase. 2015-12-20 12:50:45 -08:00
C. Guy Yarvin
ff3c38b0a5 Meets last commit. 2015-12-20 12:46:32 -08:00
C. Guy Yarvin
2519413c4f Switch / to # for + to /. 2015-12-20 03:48:17 -08:00
C. Guy Yarvin
b3a08a9fb3 Completed syntax adaptation of main code path. 2015-12-14 14:46:44 -08:00
C. Guy Yarvin
c36210cdce Cab cleanup, pass 1. 2015-12-14 14:21:10 -08:00
C. Guy Yarvin
a45f0c6dc4 Full modern syntax. 2015-12-13 23:58:14 -08:00
C. Guy Yarvin
04ca90b9b5 Mostly without $^. 2015-12-13 22:21:19 -08:00
C. Guy Yarvin
53b1351836 Mostly detoxified rogue %ktts. 2015-12-12 18:51:23 -08:00
C. Guy Yarvin
2ed547b87a Properly disable ap jets. 2015-12-12 16:35:35 -08:00
C. Guy Yarvin
513f1b8814 Last, correct commit with conventional syntax. 2015-12-11 19:55:53 -08:00
C. Guy Yarvin
cb89113986 cabclean cleaned up, except for some %talk stuff. 2015-12-10 17:28:33 -08:00
Anton Dyudin
2231f29fdc delete button, less refreshing 2015-12-10 14:04:59 -08:00
C. Guy Yarvin
05bbab743d Still some minor mark, etc, cleanups, and talk. 2015-12-10 01:34:00 -08:00
C. Guy Yarvin
2b4e85c976 Self-booting with old syntax illegal. 2015-12-10 01:17:19 -08:00
C. Guy Yarvin
8d8d81cbf9 Cleaned up some marks. 2015-12-09 20:05:58 -08:00
Anton Dyudin
f6b1a6779a tree edit mode button, read-only mime source view 2015-12-08 18:25:51 -08:00
Anton Dyudin
4ef7983522 added redirect handling 2015-12-07 16:56:51 -08:00