Commit Graph

534 Commits

Author SHA1 Message Date
~hatteb-mitlyd
7aeebc2862 Bring simple up-to-date
Fixes #135
2014-04-29 10:19:33 -07:00
C. Guy Yarvin
12fffaab52 Merge branch 'master' of github.com:urbit/urbit 2014-04-28 15:24:52 -07:00
C. Guy Yarvin
b979188071 Typed cards. 2014-04-28 15:24:32 -07:00
johncburnham
e0b74d84e7 but really 2014-04-27 16:26:29 -07:00
johncburnham
1a55cc84f7 delete printf 2014-04-27 16:25:33 -07:00
johncburnham
994a99a130 added ++shan (sha-1) and ++not (binary not) 2014-04-27 16:19:58 -07:00
C. Guy Yarvin
b32913fd3e Merge branch 'master' of github.com:urbit/urbit 2014-04-25 13:50:06 -07:00
C. Guy Yarvin
3370694de0 Some eyre improvements. 2014-04-25 13:49:52 -07:00
Gavin Whelan
a9774dd698 To allow body styling in markdown 2014-04-25 13:24:59 -07:00
C. Guy Yarvin
76e018c7a6 Merge branch 'master' of github.com:urbit/urbit 2014-04-25 12:28:06 -07:00
C. Guy Yarvin
c0dc329c57 Error page now reloads. 2014-04-25 12:27:48 -07:00
Galen Wolfe-Pauly
795ea36b60 let this merge be done 2014-04-25 10:56:34 -07:00
C. Guy Yarvin
da0dcfc636 Merge branch 'master' of github.com:urbit/urbit
is merge is necessary,
2014-04-25 10:37:54 -07:00
~hatteb-mitlyd
0022500a44 new protocol for breach 2014-04-25 10:24:59 -07:00
Galen Wolfe-Pauly
a0f820f993 Merge branch 'master' of https://github.com/urbit/urbit 2014-04-25 10:17:44 -07:00
Galen Wolfe-Pauly
433c87bbac cli updates 2014-04-25 10:17:39 -07:00
C. Guy Yarvin
9d740a9feb Merge branch 'master' of github.com:urbit/urbit 2014-04-24 14:30:57 -07:00
C. Guy Yarvin
3bfe888a65 Support %pc for SSO. 2014-04-24 14:30:40 -07:00
~hatteb-mitlyd
5cda6ad41a use a non-noun-based hashtable to jam 2014-04-23 19:55:53 -07:00
C. Guy Yarvin
1435cc620b Eyre does not do inappropriate forwarding. 2014-04-23 14:47:48 -07:00
~hatteb-mitlyd
af56112410 roll proto revision for breach 2014-04-23 12:50:47 -07:00
C. Guy Yarvin
edc1c43f2f Remove some ames printfs; fix a warning. 2014-04-23 12:32:08 -07:00
C. Guy Yarvin
cac95f440a Add sekrit code to web shell. 2014-04-23 12:26:22 -07:00
C. Guy Yarvin
7329ea5343 Merge branch 'master' of github.com:urbit/urbit 2014-04-23 10:03:05 -07:00
C. Guy Yarvin
2c3c4c8b1d Fix ames timer to actually work. 2014-04-23 10:02:36 -07:00
Steve Dee
c53ba0af7d Whitespace: the invisible killer
Includes our first ever pass over the jets. Yikes.
2014-04-21 18:22:11 -07:00
C. Guy Yarvin
507f006ba4 Jar and jug. 2014-04-21 15:25:35 -07:00
~hatteb-mitlyd
0439e81882 new new proto rev, new new pill 2014-04-21 15:18:42 -07:00
~hatteb-mitlyd
9c6f6f70f6 new proto rev, new pill 2014-04-21 15:12:28 -07:00
johncburnham
768c552714 well that's embarassing 2014-04-21 11:11:13 -07:00
C. Guy Yarvin
37aeaa7d7d Fix previous commit. 2014-04-21 10:22:16 -07:00
C. Guy Yarvin
ff5f37ad1c Merge branch 'master' of github.com:urbit/urbit 2014-04-21 10:02:34 -07:00
C. Guy Yarvin
5e5303496f Login and stuff. 2014-04-21 10:02:09 -07:00
johncburnham
ff160e0443 added utc library 2014-04-18 20:27:19 -07:00
Galen Wolfe-Pauly
39bf710edf Merge branch 'master' into welcome 2014-04-18 11:07:05 -07:00
C. Guy Yarvin
a5c6c134ee clay-reset. 2014-04-17 09:37:22 -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
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