Commit Graph

102 Commits

Author SHA1 Message Date
~hatteb-mitlyd
676b45de64 fix syntax for ''' 2014-06-26 12:51:50 -07:00
Anton Dyudin
109d6d821b Doq blok roqd, inde doqd 2014-06-18 03:01:17 -07:00
Gavin Whelan
eeb1591fb6 Minor changes 2014-06-07 13:42:48 -04:00
Gavin Whelan
7eea04ce1e Minor interface changes 2014-05-31 14:11:11 -07:00
Gavin Whelan
6177ebbb26 Merge and minor merge changes 2014-05-30 15:59:58 -07:00
Gavin Whelan
aaee76e324 Merging clay fixes 2014-05-30 13:36:51 -07:00
Gavin Whelan
7c56f17a06 Fixing syntax error 2014-05-29 11:06:04 -07:00
Gavin Whelan
a242cea2b2 Merging merge 2014-05-28 12:26:16 -07:00
C. Guy Yarvin
67bc1d59da Merge branch 'newbreach' of github.com:urbit/urbit into newbreach
Conflicts:
	urb/zod/arvo/hoon.hoon
2014-05-20 10:36:10 -07:00
C. Guy Yarvin
2d1c214253 Content types etc. 2014-05-20 10:33:02 -07:00
~hatteb-mitlyd
2a665d6c84 Merge remote-tracking branch 'urbit/master' into newbreach
Conflicts:
	urb/urbit.pill

pill created from fakezod
2014-05-16 15:04:40 -07:00
Gavin Whelan
42b06e823c Fixing &#x; syntax in markdown translator 2014-05-13 13:08:58 -07:00
~hatteb-mitlyd
c2b1290234 Merge remote-tracking branch 'urbit/master' into newbreach
Conflicts:
	urb/urbit.pill

Generate new pill.
2014-05-09 13:26:22 -07:00
johncburnham
1c0ea84ccd oauth 2014-05-09 12:02:36 -07:00
Steve Dee
21d00550ed Merge remote-tracking branch 'urbit/master' into newbreach
Conflicts:
	.gitignore
	Makefile
	urb/urbit.pill

Took both bpt and ed25519, and generated a new pill starting from master's.
2014-05-08 14:53:12 -07:00
Steve Dee
092cb9cd49 Move markdown to try till it's ready 2014-05-06 15:53:06 -07:00
~hatteb-mitlyd
278e38ba2f more leading-zero nonsense 2014-04-30 14:45:55 -07:00
~hatteb-mitlyd
e1cab966aa modify test suite, leading-zeros are bad 2014-04-30 13:52:22 -07:00
~hatteb-mitlyd
758e1607f8 more ed work 2014-04-30 12:59:44 -07:00
Steve Dee
ff4b3d877c Merge branch 'master' into newbreach
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/zuse.hoon
2014-04-29 17:43:30 -07:00
~hatteb-mitlyd
17ebe1a1c4 add ed tests, fix veri 2014-04-29 17:34:55 -07:00
~hatteb-mitlyd
7aeebc2862 Bring simple up-to-date
Fixes #135
2014-04-29 10:19:33 -07:00
Steve Dee
77b65f5ab4 Merge branch 'master' into newbreach
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/ames.hoon
2014-04-25 18:39:29 -07:00
Gavin Whelan
a9774dd698 To allow body styling in markdown 2014-04-25 13:24:59 -07:00
Steve Dee
dca3ea55da Add crude AES test program 2014-04-18 19:04:42 -07:00
~hatteb-mitlyd
73bbeb9544 Merge remote-tracking branch 'urbit/master' into newbreach
take their urbit.pill

Conflicts:
	Makefile
	urb/urbit.pill
	v/sist.c
2014-04-18 10:24:59 -07:00
C. Guy Yarvin
b3a5c41491 Shell console. 2014-04-16 17:49:41 -07:00
Steve Dee
c8655dbeca Merge branch 'master' into newbreach
Took master's pill.

Conflicts:
	Makefile
	urb/urbit.pill
2014-04-16 10:53:50 -07:00
Steve Dee
f611a04cfd Involve all bits of hax in haf
Not that this buys us anything, of course, but hey.
2014-04-16 10:29:34 -07:00
Steven Dee
8d747a3b49 Merge pull request #133 from yebyen/master
whitespace
2014-04-14 14:27:34 -07:00
C. Guy Yarvin
20c6d005b3 Clean up requests from dead connections. 2014-04-14 11:01:18 -07:00
~hatteb-mitlyd
dac62b87e2 sort-of fix jets for Ed25519
puck:ed is correct for at least the single test-point i tried.

sign:ed is still wrong.
2014-04-11 17:17:39 -07:00
~hatteb-mitlyd
8a7a789994 add curve25519 and toy 2014-04-10 15:48:41 -07:00
Kingdon Barrett
296b560934 whitespace 2014-04-10 22:46:03 +00: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
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
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
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
C. Guy Yarvin
0879da2286 Final template tweaks. 2014-04-05 14:25:16 -07:00
C. Guy Yarvin
08c3078647 "Fix" script and style non-escaping. 2014-04-05 12:04:05 -07:00