ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-18 20:31:40 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,740 Commits 6 Branches 0 Tags 164 MiB
63639dde49
Commit Graph

164 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
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
C. Guy Yarvin
d538089239 Retreated from ++hail:ap. 2016-01-06 23:08:09 -08:00
Philip C Monk
368d07de77 add |track and case option for |merge 2016-01-06 17:16:26 -05:00
C. Guy Yarvin
1a28e52405 Both in one event. 2016-01-04 07:13:22 -08:00
C. Guy Yarvin
b9cd49600c Ready for complex boot sequence. 2016-01-04 06:27:35 -08: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
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
a74d5219fc Stripdown part 2. 2015-12-22 21:19:38 -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
a1c0ec5e26 Cleaned up some cosmetics. 2015-12-20 13:48:02 -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
49647965ef More cleanups; remove some clearly unused files. 2015-12-19 13:53:28 -08:00
C. Guy Yarvin
6d5564b7d6 More cleanups. 2015-12-19 13:00:01 -08:00
C. Guy Yarvin
f017a73d44 oct* compile. 2015-12-18 17:24:34 -08:00
C. Guy Yarvin
b3a08a9fb3 Completed syntax adaptation of main code path. 2015-12-14 14:46:44 -08:00