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,753 Commits 768 Branches 10 Tags 215 MiB
166343139c
Commit Graph

4753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raymond Pasco
166343139c Fix up parser validity 
leading ~doz is ok if it's not the only word
leading ~dozzod is never ok
 2016-07-26 10:15:17 -07:00
Raymond Pasco
f3651e40b5 Merge 2016-02-15 breach into scrambler 2016-02-18 04:46:06 -05:00
Raymond Pasco
e1f97f20a4 Merge branch 'breach-20160215-fix' 2016-02-15 19:52:27 -05:00
Raymond Pasco
c43641ab93 Fix a couple broken generators so we can breach 2016-02-15 19:52:18 -05:00
Raymond Pasco
e43be2d15b Merge branch 'breach-20160215' 
A small zuse type error fix, and the ames version bump
 2016-02-15 08:18:54 -05:00
Raymond Pasco
17e7a0dbb6 Bump ames protocol to 1 for breach. 2016-02-15 07:50:40 -05:00
Raymond Pasco
01b33c5ec5 Fix zuse electroplating bug preventing clay merges 
Changed (cask) to a (cask *) to prevent a weird type error.
Without this, clay would fail a (hard (unit rand)).
 2016-02-15 07:47:41 -05: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
5daa7d2592 Merge tag 'hoon-151' into scrambler 
Hoon 151 merge

Conflicts:
	urb/urbit.pill
	urb/zod/arvo/dill.hoon
	urb/zod/arvo/hoon.hoon

Slightly evil: had to remove a ~doznec from lib/helm.hoon
 2016-02-10 15:10:18 -05: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
C. Guy Yarvin
7fde2eb242 Keyword/stem changes, final draft. 2016-02-08 19:35:13 -08:00
C. Guy Yarvin
81938c11b6 Generating new stems, double solid. 2016-02-08 18:17:17 -08:00
C. Guy Yarvin
6924491539 Add new keyword names. 2016-02-08 16:21:04 -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
C. Guy Yarvin
6b5d9438ee About to do second version of keywords. 2016-02-08 13:45:12 -08:00
C. Guy Yarvin
23d56f11e5 Some naming improvements. 2016-02-06 22:44:56 -08:00
Galen Wolfe-Pauly
b71d945168 tree@3e59dc683a 
talk@8d6967e238
 2016-02-06 16:42:31 -08:00
Galen Wolfe-Pauly
aebcc16adb Merge branch 'factor' of https://github.com/ohaitch/urbit into factor 2016-02-05 10:54:25 -08:00
C. Guy Yarvin
b0fd655914 Now with keywords. 2016-02-05 03:47:21 -08:00
C. Guy Yarvin
ed2269120c All stems changed over. 2016-02-05 03:27:26 -08:00
C. Guy Yarvin
26c5cba625 Modified all stems. About to remove old. 2016-02-05 03:10:07 -08:00
C. Guy Yarvin
2393f7c505 Everything changed over but %tssg, %tstr, %wtbr. 2016-02-05 02:52:10 -08:00
C. Guy Yarvin
d85cdd8e39 Everything except %tsgl through %wtdt. 2016-02-05 02:32:37 -08:00
C. Guy Yarvin
f20fb95a34 Everything but wtts-zpzp and wtkt-wtsg. 2016-02-05 02:22:47 -08:00
C. Guy Yarvin
aeb6ebc036 Still unchecked: tsgl thru zpzp. 2016-02-05 02:05:57 -08:00
C. Guy Yarvin
e52edd5d49 Converted use cases %ktwt and alphabetically above. 2016-02-05 01:58:19 -08:00
C. Guy Yarvin
ca18a05a53 Change record. 2016-02-05 01:44:34 -08:00
C. Guy Yarvin
ce8491f5f2 Keyword stems, step 1. 2016-02-05 01:25:58 -08:00
Galen Wolfe-Pauly
37a566021e Odds and ends: login / out, dojo details. 
tree@ced2501277
 2016-02-04 19:56:11 -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
Galen Wolfe-Pauly
ac0ee5f3f0 in-between tree commits 2016-02-04 17:38:14 -08:00
Anton Dyudin
bf11734b85 ape -> app 2016-02-04 16:38:18 -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
d15cf9d5f7 working on hp 2016-02-04 16:00:23 -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
C. Guy Yarvin
76ab967ef6 About to change over to $-. 2016-02-03 22:59:22 -08:00
C. Guy Yarvin
4267697f9e Fully shifted over to modern typed namespace. 2016-02-03 20:51:01 -08:00
C. Guy Yarvin
779f70559b Ford uses new load model. 2016-02-03 19:32:14 -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
C. Guy Yarvin
e3e4b50b08 Stable. 2016-02-03 16:14:35 -08:00
Galen Wolfe-Pauly
bfd52f9e32 sweeping 2016-02-03 16:12:46 -08:00
Raymond Pasco
06903d894d Merge branch 'crub' 
This merge only takes the completed cryptosuite B implementation.
Curve will be enabled later.
 2016-02-03 17:53:50 -05:00
Anton Dyudin
dd2aff37a8 fix metadata reading 2016-02-03 14:43:40 -08:00
Anton Dyudin
7f491f14c9 fix paste relative paths 2016-02-03 13:46:32 -08:00