urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-16 14:58:25 +03:00
Code Issues Packages Projects Releases Wiki Activity
7,262 Commits 768 Branches 10 Tags 215 MiB
31cfcfc82f
Commit Graph

7262 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
~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
Steve Dee
df6edc8619 WIP jetted AES 
be:aesc jet appears to be working.
 2014-04-17 18:56:47 -07:00
C. Guy Yarvin
a5c6c134ee clay-reset. 2014-04-17 09:37:22 -07:00
~hatteb-mitlyd
128c995506 working sign:ed jet 2014-04-16 20:28:39 -07:00
C. Guy Yarvin
b3a5c41491 Shell console. 2014-04-16 17:49:41 -07:00
C. Guy Yarvin
4b26bd27d5 Merge branch 'master' of github.com:urbit/urbit 2014-04-16 12:48:10 -07:00
C. Guy Yarvin
b55b408937 Web shell stuff. 2014-04-16 12:47: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
C. Guy Yarvin
2e0dbf2ecf Merge branch 'master' of github.com:urbit/urbit 2014-04-15 18:36:43 -07:00
C. Guy Yarvin
f60a3e31b2 Eyre console stuff. 2014-04-15 18:35:25 -07:00
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
~hatteb-mitlyd
e0dfb10b42 veri jet skeleton, still not working 2014-04-12 19:59:02 -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
a0762ef8c8 first hack at sign:ed jet 2014-04-10 18:05:59 -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
~hatteb-mitlyd
33bb87af0f Merge remote-tracking branch 'urbit/master' into newbreach 
Update to the latest vere
 2014-04-10 12:04:51 -07: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
Steve Dee
09ddf90b62 Use acru/crua in ames 2014-04-09 17:39:40 -07:00
Steve Dee
241dab613b Merge remote-tracking branch 'urbit/master' into newbreach 2014-04-09 17:38:59 -07:00
Steve Dee
87da4c7b96 Revert "WIP crua" 
This reverts commit 7d52517207882e4d719e9de06edcfc4899c2a9d5.
 2014-04-09 17:38:54 -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