Commit Graph

1264 Commits

Author SHA1 Message Date
johncburnham
4e925fa53d git dropped a commit? 2014-08-04 09:54:14 -07:00
Galen Wolfe-Pauly
6852cdec5b Merge branch 'urbjs' 2014-08-03 12:04:55 -07:00
Galen Wolfe-Pauly
98a1d2cce5 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-03 12:04:19 -07:00
C. Guy Yarvin
2908e8aafa Rename pro to mac. 2014-08-02 17:37:36 -07:00
C. Guy Yarvin
d3e3c826b4 Turn off !: to clear some memory room. Grrr... 2014-08-02 16:55:56 -07:00
C. Guy Yarvin
b4b28aa094 Merge branch 'master' of github.com:urbit/urbit 2014-08-02 16:40:49 -07:00
C. Guy Yarvin
d52646f14b Various fixes, renamings, and improvements. 2014-08-02 16:33:22 -07:00
pcmonk
1cb4bb27cb drop redundant acks instead of crashing 2014-08-01 19:04:50 -07:00
johncburnham
6da42a48a4 the markdown parser mysteriously broke 2014-08-01 18:05:54 -07:00
pcmonk
b7f2e2bc79 Merge branch 'master' into klay
Conflicts:
	urb/urbit.pill
2014-08-01 16:53:42 -07:00
pcmonk
a70b13bae5 Merge branch 'master' into e2e-real
Conflicts:
	urb/urbit.pill
2014-08-01 16:46:00 -07:00
pcmonk
eb414be4fa fixed structures 2014-08-01 16:41:46 -07:00
C. Guy Yarvin
3009394270 Merge branch 'master' of github.com:urbit/urbit 2014-08-01 16:39:30 -07:00
C. Guy Yarvin
e97b3c08a5 Various fixes and improvements. 2014-08-01 16:39:15 -07:00
pcmonk
97755be677 Merge branch 'master' into e2e-real
Conflicts:
	urb/urbit.pill
2014-08-01 16:27:44 -07:00
pcmonk
fe828ce29c chat is working 2014-08-01 16:17:24 -07:00
johncburnham
51af8cc7c5 swap files bad 2014-08-01 14:22:31 -07:00
johncburnham
b6b8ca70b2 but actually 2014-08-01 14:16:38 -07:00
johncburnham
737afa1c3c sane doc structure 2014-08-01 14:14:23 -07:00
ault011
d98be5839d added split volumes of "doc-split-me" 2014-08-01 12:51:30 -07:00
Galen Wolfe-Pauly
500acfb39f fixed subs 2014-08-01 11:21:28 -07:00
Jared Hance
4e9d9b44cf Add zapcols 2014-08-01 14:11:46 -04:00
Jared Hance
537e2695ff Merge branch 'master' into klay
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/zuse.hoon
2014-08-01 14:02:51 -04:00
Jared Hance
83e0291f99 256 bit hashes for objects... 2014-08-01 12:40:19 -04:00
Jared Hance
e48181b23e Optimize merge ancestor location 2014-08-01 12:21:26 -04:00
Jared Hance
0512cc6d47 Optimize ++zerg for common case 2014-08-01 11:45:29 -04:00
Jared Hance
a0fedff20c Trivial fixes 2014-08-01 11:35:56 -04:00
Jared Hance
aaeaa07a04 Better :show 2014-08-01 11:34:42 -04:00
Jared Hance
21034aa855 Various fixes, including timers 2014-08-01 10:54:31 -04:00
pcmonk
7d581a3714 most of new chat 2014-07-31 19:44:49 -07:00
Galen Wolfe-Pauly
8178c40b95 urb.js retooling 2014-07-31 16:57:35 -07:00
Galen Wolfe-Pauly
02f62ed48d Merge branch 'master' of https://github.com/urbit/urbit 2014-07-31 16:26:47 -07:00
C. Guy Yarvin
03c714afe5 Merge branch 'turbomem'
Conflicts:
	urb/urbit.pill
2014-07-31 13:38:05 -07:00
C. Guy Yarvin
06776448a0 Merge branch 'master' of github.com:urbit/urbit
Conflicts:
	urb/urbit.pill
2014-07-31 13:25:06 -07:00
C. Guy Yarvin
46226c3dbf More memory pls. 2014-07-31 13:23:02 -07:00
Jared Hance
2769378368 ++forge compiles 2014-07-31 16:17:37 -04:00
ault011
1ab66767cc Merge branch 'master' of https://github.com/urbit/urbit 2014-07-31 13:06:16 -07:00
ault011
7ad9bc9d2e updated ++need 2014-07-31 13:05:55 -07:00
Anton Dyudin
10a7d6be8e Merge branch 'master' of https://github.com/urbit/urbit 2014-07-31 12:24:48 -07:00
Anton Dyudin
8c197777a2 Zongs converter up :3 2014-07-31 12:24:30 -07:00
John Dulin
1974ca3e8e Moved doc.txt over from urbit.org. Unseperated (yet). 2014-07-31 12:16:31 -07:00
John Dulin
aed1aeb1b4 Merge branch 'master' of https://github.com/urbit/urbit 2014-07-31 10:47:01 -07:00
John Dulin
975d69bfb1 Homogenized assignments 2014-07-31 10:46:44 -07:00
Jared Hance
fe2682adc9 Get rid of batz ugly in show/revert 2014-07-31 13:42:02 -04:00
Jared Hance
c9f4fdcf22 Small fixes to :show 2014-07-31 13:32:27 -04:00
Jared Hance
90ebf0155d Better show 2014-07-31 13:30:19 -04:00
johncburnham
5fd348d1e9 roll protocol for breach 2014-07-31 08:25:29 -07:00
Jared Hance
36bd690c18 show.hoon 2014-07-31 11:17:51 -04:00
John Dulin
c50edb134a Doc assignments. 2014-07-31 01:24:03 -07:00
C. Guy Yarvin
f572cabe75 Clean up some markdown stuff. 2014-07-30 21:28:48 -07:00