urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-12 10:29:01 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,739 Commits 768 Branches 10 Tags 215 MiB
309805f5e7
Commit Graph

210 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
C. Guy Yarvin
24b1e1c5d2 Convert $+ to $-. 2016-02-03 23:12:23 -08:00
C. Guy Yarvin
4267697f9e Fully shifted over to modern typed namespace. 2016-02-03 20:51:01 -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
45cbf5131f ut_find *almost* works, but can't self-compile... 2016-01-22 15:43:56 -08: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
0bbae7e679 split %cy hash out into %cz 2016-01-07 18:54:42 -05:00
Anton Dyudin
cf3e0f826a remove .hook processing 2016-01-06 14:40:40 -08:00
Philip C Monk
368d07de77 add |track and case option for |merge 2016-01-06 17:16:26 -05:00
C. Guy Yarvin
526548ceec Devulcanized, double solid, twigs not yet cleaned up. 2016-01-04 16:01:37 -08:00
C. Guy Yarvin
1b81b5a3f3 About to try switching over. Double solid. 2016-01-03 21:41:35 -08:00
C. Guy Yarvin
836bda4995 Now satisfied with casual containers. 2016-01-01 16:19:06 -08:00
C. Guy Yarvin
19936b94f0 Degenerate type appears vanquished, at least in C. 2015-12-31 20:49:01 -08:00
C. Guy Yarvin
70d809b558 New, non-degenerate ++nost almost works, fails on ++homo. 2015-12-31 02:07:29 -05:00
C. Guy Yarvin
385d47530f Cube type errors fully cleaned up. 2015-12-28 17:01:44 -05:00
C. Guy Yarvin
86022c41d8 %moat is fully vanquished; %atom constants still vestigial. 2015-12-27 16:36:49 -05:00
C. Guy Yarvin
c1a3d64a28 %atom now fully converted to %moat. 2015-12-27 16:01:10 -05:00
C. Guy Yarvin
759f3ef463 Kicked ++us out of ++ut; replaced %clfs with %smfs. 2015-12-26 15:47:04 -05:00
C. Guy Yarvin
e8d575db20 Rename type to span. 2015-12-26 05:07:50 -05:00
C. Guy Yarvin
2c1fbd3eb2 With ++span replaced by ++knot; also, recursion filter in ++tuck. 2015-12-26 04:37:06 -05:00
C. Guy Yarvin
151ceea50d Matched to ++feel, with some temporary bull laming. 2015-12-23 21:30:54 -08:00
C. Guy Yarvin
46f8dcfe94 Now with hygienic $+. 2015-12-21 14:51:41 -08:00
C. Guy Yarvin
ea64696bc6 Fixed vet caching issue. 2015-12-21 14:45:22 -08:00
C. Guy Yarvin
493c66cad4 About to close vetting type loophole. 2015-12-21 12:45: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
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
71ff948b94 Semi-cleaned, but with some strange behavior... 2015-12-08 09:16:55 -08:00
C. Guy Yarvin
1eb9bb92f9 Back with correct, doubly compiling. Clay is old. 2015-12-08 00:11:25 -08:00
C. Guy Yarvin
153e6e897b But with a broken %clay. 2015-12-07 23:57:19 -08:00
C. Guy Yarvin
0f588c9546 %dill, etc. 2015-12-05 17:43:57 -08:00
C. Guy Yarvin
d6889cdf6a %clay translated. 2015-12-05 16:36:54 -08:00
Philip C Monk
fe44f237d9 more doc 2015-11-20 18:09:02 -05:00
Anton Dyudin
b4214fc6fa Wrap non-span clay paths in ' to print valid literals 2015-11-10 11:35:41 -08:00
Philip C Monk
25c64cc4c7 more doc 2015-11-06 17:43:59 -05:00
Philip C Monk
d0c6b3fa63 some clay docs 2015-11-06 17:43:48 -05:00
Philip C Monk
06bda9cd8c fixed lose-changes-when-unrelated-conflict bug 2015-09-18 20:15:36 -04:00
Philip C Monk
5de171f23d RIP %indirect 2015-09-16 19:45:54 -04:00
Philip C Monk
3bfe641b1c added |cancel 2015-09-15 20:24:44 -04:00
Philip C Monk
77eb638240 merge clay card-sending pathways 2015-09-11 20:27:32 -04:00
Philip C Monk
73a5596168 %init doesn't require new desk 2015-09-10 20:25:27 -04:00
Philip C Monk
f75b8a1370 change some our's to her's 2015-09-10 18:37:19 -04:00
Philip C Monk
16cb3f3961 pull marks from correct ships 2015-09-10 17:49:22 -04:00