Commit Graph

208 Commits

Author SHA1 Message Date
Galen Wolfe-Pauly
0f4507a31b structure for comments written to %c 2016-03-03 16:36:39 -08:00
Raymond Pasco
a0358c17d9 Merge branches 'breach-20160302' and 'cgyarvin-teaching', remote-tracking branches 'ohaitch/talk-read-component', 'ohaitch/virtualize-pact-hoon' and 'ohaitch/eyre-sec'
Conflicts:
	arvo/eyre.hoon

Breaching changes for 2016-03-02
Language/dojo improvements for teaching.
add web/listen.hoon module for listening to comment changes
virtualize ++pact %hoon side-path
Eyre security drivers
2016-03-02 21:21:23 -05:00
Anton Dyudin
e0d0fb6504 better bad-key error 2016-03-02 16:47:49 -08:00
Raymond Pasco
e1480cb570 Merge remote-tracking branches 'philipcmonk/ford-fix', 'ray/lune-nule' and 'ohaitch/talk-comments'
Conflicts:
	mar/tree/comments.hoon

Fix off-by-one in marks that was removing the last byte of clay files
Add ++lune/++nule Unix textfile arms
Route .tree 'comments' input through talk
2016-02-29 17:11:50 -05:00
Anton Dyudin
1cf56bd06b added comment hash identifier 2016-02-25 18:41:29 -08:00
Philip C Monk
17d6fccced reset on initial pull 2016-02-25 18:19:44 -05:00
Anton Dyudin
d331391486 proxy tree comments through talk
urbit/tree@bdebe54
2016-02-25 12:38:00 -08:00
Henry Ault
8420037d74 better handling of refresh tokens, port numbers 2016-02-24 01:11:24 -08:00
Henry Ault
c71aa2d7c4 add +gmail-list, :gmail|send 2016-02-23 20:09:37 -08:00
Henry Ault
4c7fbe2a90 151ify driver 2016-02-23 19:50:30 -08:00
Henry Ault
c16488d6af 151 up and running baby 2016-02-22 17:50:21 -08:00
Philip C Monk
ec37ec2dd5 151ized gmail 2016-02-19 15:33:56 -05: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
Raymond Pasco
259eb79cb8 Merge remote-tracking branches 'curtis/swaggle', 'anton/fix-init-no-data' and 'anton/fix-generators'
Conflicts:
	gen/hood/begin.hoon
	gen/moon.hoon

Fix ++swag electroplating-induced bug
Fix boot process for galaxies
Finish 151izing the source tree
2016-02-17 19:35:36 -05:00
Anton Dyudin
bf2164054d factor out map-to-json 2016-02-17 15:50:03 -08:00
Anton Dyudin
73bcc66007 remaining libraries 2016-02-17 15:36:43 -08:00
Raymond Pasco
84ae855cce Merge remote-tracking branch 'ohaitch/tree-apps'
The proverbial various fixes and improvements
2016-02-16 15:49:15 -05:00
Anton Dyudin
9b2ae7f460 fix lib/write 2016-02-11 16:33:22 -08:00
Anton Dyudin
8a6bb31ed0 151ify tree hooks 2016-02-11 16:33:22 -08:00
Anton Dyudin
fb3c53553f add missing /?s 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
Henry Ault
6268b5f6aa finally working google auth flow; do not delete! 2016-02-10 17:27:14 -08:00
Henry Ault
0e3a28ea5c Merge branch 'eyre-sec' of https://github.com/ohaitch/urbit into eyre-sec
wanted |init-oauth2
2016-02-10 15:21:10 -08: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
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
fbc5c6c21a html-entities newline 2016-02-09 21:15:53 -08:00
Anton Dyudin
bd143385c5 Merge branch 'data-dep' into tree-comments
handle chrome/data separation in an official manner
2016-02-09 21:15:52 -08:00
Anton Dyudin
71adc8fb50 first try at head-body separation 2016-02-09 21:15:38 -08:00
Anton Dyudin
5677254816 move /~date.comments-md to /comments/~date.md
when outputing tree comments
2016-02-09 11:55:43 -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
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
Anton Dyudin
1a61fe4378 added |init-oauth2 secrets dialog 2016-02-04 15:03:51 -08:00
Philip C Monk
abf111fb91 Merge remote-tracking branch 'anton/eyre-sec' into eyre-sec 2016-02-04 15:11:05 -05: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