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

202 Commits

Author SHA1 Message Date
Philip C Monk
d146f1d9e4 151ization 2016-02-19 17:47:09 -05:00
Anton Dyudin
a2cc5d5333 move tree-comments to separate renderer 2016-02-19 12:01:52 -08:00
Philip C Monk
d285cc5055 151ization complete 
Conflicts:
	Makefile
 2016-02-18 19:12:31 -05:00
Philip C Monk
7268164eba Merge remote-tracking branch 'arvo/master' into HEAD 
Conflicts:
	app/hood.hoon
	arvo/ford.hoon
	gen/cat.hoon
	gen/ls.hoon
	gen/ls/subdir.hoon
 2016-02-18 18:52:34 -05:00
Philip C Monk
67cc10f55a Merge tag 'hoon-151' of https://github.com/juped/urbit into transfer 
Hoon 151 merge

%gh crashes on startup

Conflicts:
    urb/urbit.pill
    urb/zod/app/dojo.hoon
    urb/zod/app/hood.hoon
    urb/zod/arvo/eyre.hoon
    urb/zod/arvo/ford.hoon
    urb/zod/arvo/gall.hoon
    urb/zod/arvo/hoon.hoon
    urb/zod/arvo/zuse.hoon
    urb/zod/gen/cat.hoon
    urb/zod/gen/ls.hoon
    urb/zod/gen/ls/subdir.hoon
 2016-02-18 18:31:26 -05:00
Anton Dyudin
bf2164054d factor out map-to-json 2016-02-17 15:50:03 -08:00
Anton Dyudin
11341be6d7 fix rss renderer 2016-02-17 15:17:46 -08:00
Anton Dyudin
e874ce237a verified mark code 2016-02-17 15:00:12 -08:00
Anton Dyudin
6db85fe1ac more tree 151ization 2016-02-11 16:33:22 -08:00
Anton Dyudin
fb3c53553f add missing /?s 2016-02-11 16:33:21 -08:00
Anton Dyudin
2fbeee9243 more header-comment normalization 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
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
c95bd7af46 wasp-data debug mode urb.verb 2016-02-09 21:15:53 -08:00
Anton Dyudin
71adc8fb50 first try at head-body separation 2016-02-09 21:15:38 -08:00
Anton Dyudin
263730193c type-check ;html:(head body) 2016-02-09 17:24:30 -08:00
Anton Dyudin
8504d823c6 moved ~/on/<dep>.js injection to mar/urb 
The script itself remains in eyre, for usage by error messages.
 2016-02-09 17:09:33 -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
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
Philip C Monk
e5d5d2fb82 gh looks pretty good 2016-02-02 18:41:04 -05: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
Philip C Monk
66c5a99b6e cleanup 2016-01-27 16:50:06 -05:00
Philip C Monk
4a1420d301 initial webhook reading for github 2016-01-25 20:13:08 -05: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
Anton Dyudin
0994ad1976 /pub -> /web, mostly 2015-12-07 12:57:38 -08:00
C. Guy Yarvin
d6b492bc74 Merge remote-tracking branch 'upstream/master' into cabdone 2015-12-05 13:37:28 -08:00
Raymond Pasco
158d5996fe Merge remote-tracking branches 'cgyarvin/nostop' and 'ohaitch/speech-eval' 
Abort instead of suspend
No identifier named "speeeeeeeeeeeech"
 2015-12-02 19:28:41 -05:00
Anton Dyudin
9a587bdae8 rename speeech to something more informative 2015-12-02 11:06:38 -08:00
Anton Dyudin
254bddcc48 twiddle marks, factor out frontmatter parser: close #605 2015-12-01 19:46:16 -08:00
C. Guy Yarvin
831b70ff70 More translation; clean up _rule. 2015-12-01 17:51:08 -08:00
Philip C Monk
e947f3598d add the 'urbit' mark 2015-11-30 20:04:02 -05:00
Anton Dyudin
e82003ec38 added :ask ship request collator, |ask easter egg 2015-11-25 14:42:47 -08:00
Anton Dyudin
b3567240aa added %glyph all-the-bindings talk-report 2015-10-28 19:10:20 -07:00
Anton Dyudin
e7ab4f7c7d message splitting 2015-10-27 16:43:08 -07:00
Anton Dyudin
3f613aaffe Merge branch 'nobreach' into pittyp 2015-10-08 15:24:29 -07:00
Anton Dyudin
a913d92787 pastebin v1 2015-10-08 15:23:05 -07:00
Anton Dyudin
d53508e230 moved sole-back to sole-action %clr 2015-10-07 11:59:01 -07:00
Anton Dyudin
72bab16cf0 marked sole-back 2015-10-07 11:28:15 -07:00
Philip C Monk
7c5860412a fix %talk-telegrams 2015-09-17 15:10:01 -04:00
Anton Dyudin
8d10ee10d9 fixed json tank reading 2015-09-15 16:26:22 -07:00
Anton Dyudin
35a38194b0 Merge branch 'talklog' of https://github.com/philipcmonk/urbit into nobreach 2015-09-15 15:19:51 -07:00
Anton Dyudin
1b67230713 tank handling 2015-09-15 10:50:30 -07:00
Anton Dyudin
4c14bd845a better task rendering for frontend 2015-09-15 10:45:04 -07:00
Anton Dyudin
e0b3f6b2b1 fixed telegrams serialization 2015-09-14 18:03:40 -07:00
Philip C Monk
4d2d972539 unlog 2015-09-14 19:07:47 -04:00
Anton Dyudin
3251e471b4 POST/PUT dojo sink 2015-09-10 16:05:43 -07:00
Philip C Monk
5a71800fb8 Merge branch 'clayhammer' into pending 
Conflicts:
	urb/urbit.pill
	urb/zod/ape/dojo.hoon
	urb/zod/arvo/zuse.hoon
	urb/zod/lib/drum.hoon
	urb/zod/lib/helm.hoon
	urb/zod/lib/kiln.hoon

Also bumped protocol to 4
 2015-09-09 19:15:26 -04:00
Philip C Monk
10d91a0c4d Merge remote-tracking branch 'origin/test' into pending 2015-09-09 17:32:02 -04:00
Anton Dyudin
4c4886f149 GET urls +http://example.com 2015-09-08 16:58:48 -07:00
Philip C Monk
490798b908 disallow multiple simultaneous merges to same desk 2015-09-03 17:14:35 -04:00
Philip C Monk
4ec8907b39 performance improvements 2015-09-03 17:14:35 -04:00
Philip C Monk
c968e8d6b6 forgot a couple of files 2015-09-03 17:14:35 -04:00
Anton Dyudin
72abc4c5df further disqualification 2015-09-03 17:14:34 -04:00
Anton Dyudin
8ee93321de qualified library names in userspace 2015-09-03 17:14:34 -04:00