Commit Graph

542 Commits

Author SHA1 Message Date
Steve Dee
680b666026 Generate tree diffs, comment out jamfile umph 2014-04-15 18:28:38 -07:00
Steve Dee
69ef62338b Apply tree diffs 2014-04-15 18:28:38 -07:00
C. Guy Yarvin
c899e40277 Merge branch 'master' of github.com:urbit/urbit 2014-04-15 17:49:22 -07:00
C. Guy Yarvin
7db0bbf04b Add @ui. 2014-04-15 17:49:11 -07:00
Steve Dee
93193477cc Don't generate diffs we can't apply 2014-04-15 17:43:15 -07:00
Steve Dee
1d347ede31 Tree edit 2014-04-15 16:47:57 -07:00
Steve Dee
79e34e3929 Map union jet 2014-04-15 13:07:11 -07:00
C. Guy Yarvin
66a68f4ce5 Merge branch 'master' of github.com:urbit/urbit 2014-04-15 10:33:01 -07:00
C. Guy Yarvin
3d9983f39e More advanced and faster. 2014-04-15 10:32:48 -07:00
Steve Dee
3904660cdf Remove redundant(?) woof
A structurally identical decl exists in hoon.hoon, so I'm assuming this
is redundant.
2014-04-14 19:20:21 -07:00
Steven Dee
8d747a3b49 Merge pull request #133 from yebyen/master
whitespace
2014-04-14 14:27:34 -07:00
C. Guy Yarvin
9630807126 Remove debug printf. 2014-04-14 11:53:57 -07:00
C. Guy Yarvin
e0a6db7ddc More gentle handling for unacceptable inconsistencies. 2014-04-14 11:43:06 -07:00
C. Guy Yarvin
7208047f0e Sometimes we need trailing whitespace. 2014-04-14 11:22:36 -07:00
C. Guy Yarvin
20c6d005b3 Clean up requests from dead connections. 2014-04-14 11:01:18 -07:00
Kingdon Barrett
296b560934 whitespace 2014-04-10 22:46:03 +00:00
Steven Dee
3cd048c463 Merge pull request #132 from yebyen/patch-1
Remove vim swap file
2014-04-10 12:02:31 -07:00
yebyen
88999ee6cd Oops
Probably should not have been committed... vim .swp file
2014-04-10 11:28:41 -04:00
Gavin Whelan
22210dfd3a Merge branch 'master' of https://github.com/urbit/urbit 2014-04-09 18:18:00 -07:00
Gavin Whelan
918bbd09e8 Fixing bad markdown->html 2014-04-09 18:17:26 -07:00
C. Guy Yarvin
363de441ca Merge branch 'master' of github.com:urbit/urbit 2014-04-09 18:01:55 -07:00
C. Guy Yarvin
e866603ae6 Some fixes. 2014-04-09 18:01:46 -07:00
Gavin Whelan
afc9833f17 Css for markdown example 2014-04-09 17:58:59 -07:00
Gavin Whelan
1550228408 Merge branch 'master' of github.com:urbit/urbit 2014-04-09 17:15:11 -07:00
C. Guy Yarvin
24f0d3cfb1 Good pill, no debug. 2014-04-09 17:06:33 -07:00
C. Guy Yarvin
ffd462591f Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/zod/arvo/zuse.hoon
2014-04-09 16:52:25 -07:00
C. Guy Yarvin
9178eba744 Script fixes. 2014-04-09 16:51:19 -07:00
Gavin Whelan
f36faa5e3b Merge branch 'master' of github.com:urbit/urbit 2014-04-09 16:48:29 -07:00
Gavin Whelan
2860413be3 Fixing breakage from reformatting 2014-04-09 16:25:11 -07:00
Gavin Whelan
a1cb94b1e4 hoon regex 2014-04-09 13:35:28 -07:00
Steve Dee
02f8900165 One change that didn't make it in 2014-04-09 13:03:02 -07:00
Steve Dee
8e0604c4d2 Sign the input message, not the whole sealed noun 2014-04-09 12:59:09 -07:00
Steve Dee
0d901a8608 Trailing whitespace
Repeat after me:

    find urb/zod/ -type f -name *.hoon | xargs sed -i '' -e 's/[[:space:]]*$//'
2014-04-08 17:34:29 -07:00
C. Guy Yarvin
d28162053e Fix syntax error. 2014-04-08 15:56:07 -07:00
C. Guy Yarvin
2676054930 Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/zod/arvo/eyre.hoon
	urb/zod/arvo/hoon.hoon
2014-04-08 15:28:36 -07:00
C. Guy Yarvin
deaa14d27a Various fixes and improvements. 2014-04-08 15:26:01 -07:00
Steve Dee
b54dea7533 New cryptosuite interface
`seal`/`tear` now imply `sign`/`sure` and take the public key of
the other party. As this muddies the `pu`/`se` distinction, we lump
all asym ops under `as`.
2014-04-08 10:59:49 -07:00
Steve Dee
57954fc639 Formatting 2014-04-07 10:19:16 -07:00
Steve Dee
977a7fc702 Trailing whitespace
You guys. The default git precommit hook checks for this. You can enable
it by copying and pasting this command into a shell in your Urbit
checkout:

    cp .git/hooks/precommit{.sample,}
2014-04-07 10:19:02 -07:00
C. Guy Yarvin
9b865ed8f6 Merge branch 'master' of github.com:urbit/urbit 2014-04-07 09:50:11 -07:00
Gavin Whelan
6a1f0dbd73 Merge branch 'master' of https://github.com/urbit/urbit 2014-04-07 08:54:30 -07:00
Gavin Whelan
95f2306ad1 Added Markdown translator and some example markdown. 2014-04-07 08:52:44 -07:00
Gavin Whelan
d5beee7c7c Merge branch 'master' of github.com:urbit/urbit 2014-04-07 03:02:10 -07:00
C. Guy Yarvin
0879da2286 Final template tweaks. 2014-04-05 14:25:16 -07:00
johncburnham
fae7517934 Merge pull request #130 from ngvrnd/patch-2
fix typo...
2014-04-05 13:16:28 -07:00
C. Guy Yarvin
08c3078647 "Fix" script and style non-escaping. 2014-04-05 12:04:05 -07:00
C. Guy Yarvin
bd21f15624 Merge branch 'master' of github.com:urbit/urbit 2014-04-04 15:36:21 -07:00
C. Guy Yarvin
80b6707039 More template tweaks. 2014-04-04 15:35:59 -07:00
johncburnham
bea2dd0d55 added some comments to hoon.hoon 2014-04-04 03:00:26 -07:00
C. Guy Yarvin
d97f32f4d5 Merge branch 'master' of github.com:urbit/urbit 2014-04-02 18:07:29 -07:00