Jared Hance
|
125b0a9603
|
Fix hashes in ++azel
|
2014-08-05 10:10:15 -04:00 |
|
C. Guy Yarvin
|
5d4dd0272a
|
Merge branch 'master' of github.com:urbit/urbit
Conflicts:
urb/urbit.pill
|
2014-08-04 18:20:00 -07:00 |
|
C. Guy Yarvin
|
1d49dc93cc
|
Ames protocol to 3.
|
2014-08-04 18:19:15 -07:00 |
|
Ubuntu
|
702f8eef85
|
fixed subscriptions in %eyre
|
2014-08-04 22:49:34 +00:00 |
|
Ubuntu
|
0efc0a8933
|
Merge branch 'master' of https://github.com/urbit/urbit
|
2014-08-04 21:52:40 +00:00 |
|
Ubuntu
|
0df2b977a3
|
fix %eyre on firefox and ack subscriptions
|
2014-08-04 21:51:24 +00:00 |
|
Galen Wolfe-Pauly
|
feee558c08
|
Merge branch 'master' of https://github.com/urbit/urbit
|
2014-08-04 13:22:08 -07:00 |
|
C. Guy Yarvin
|
a4a3c67664
|
Protocol to 2.
|
2014-08-04 12:51:34 -07:00 |
|
Galen Wolfe-Pauly
|
257d240523
|
Merge branch 'master' of https://github.com/urbit/urbit
|
2014-08-04 12:50:37 -07:00 |
|
C. Guy Yarvin
|
bac72d4277
|
Delete annpying ringtf.
|
2014-08-04 12:40:40 -07:00 |
|
Galen Wolfe-Pauly
|
68238ba57e
|
Merge branch 'master' of https://github.com/urbit/urbit
|
2014-08-04 12:38:02 -07:00 |
|
Galen Wolfe-Pauly
|
f00f19bc58
|
better eyre subscriptions
|
2014-08-04 12:37:43 -07:00 |
|
C. Guy Yarvin
|
e772988cae
|
Moving to protocol 1.
|
2014-08-04 10:46:37 -07:00 |
|
johncburnham
|
e2118154a2
|
Merge branch 'master' of https://github.com/urbit/urbit
Conflicts:
urb/zod/arvo/ames.hoon
|
2014-08-04 10:19:56 -07:00 |
|
johncburnham
|
86e0312934
|
bad commit
|
2014-08-04 10:18:58 -07:00 |
|
C. Guy Yarvin
|
d08bf31fc0
|
A great renaming, and other works.
|
2014-08-04 10:18:26 -07:00 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
johncburnham
|
5fd348d1e9
|
roll protocol for breach
|
2014-07-31 08:25:29 -07:00 |
|
C. Guy Yarvin
|
f572cabe75
|
Clean up some markdown stuff.
|
2014-07-30 21:28:48 -07:00 |
|
C. Guy Yarvin
|
21691f4330
|
Fix structures in structures; str -> sur.
|
2014-07-30 15:56:56 -07:00 |
|
Jared Hance
|
c1a4aa7886
|
Merge branch 'master' into klay
Conflicts:
urb/urbit.pill
|
2014-07-30 15:14:38 -04:00 |
|
Jared Hance
|
8f62bce5f4
|
Remove printfs
|
2014-07-30 15:09:59 -04:00 |
|
Jared Hance
|
968a002d68
|
Various fixes to make this thing usable
|
2014-07-30 14:56:51 -04:00 |
|
pcmonk
|
fb8bf21a2e
|
Merge branch 'master' of https://github.com/urbit/urbit
|
2014-07-30 11:12:30 -07:00 |
|