urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-14 11:08:45 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,293 Commits 768 Branches 10 Tags 215 MiB
03362d6cb6
Commit Graph

929 Commits

Author SHA1 Message Date
Jared Hance
03362d6cb6 Various fixes to merge 2014-08-07 14:07:04 -04:00
Anton Dyudin
56c9d62871 Fixed %eyre inject not to stop on newlines 2014-08-06 17:06:36 -07:00
C. Guy Yarvin
ea6366ef0e A bigger bandaid. 2014-08-06 14:03:33 -07:00
C. Guy Yarvin
26cfffd043 Install another bandaid. 2014-08-06 13:15:20 -07:00
Ubuntu
705b7812bb bump protocol number 2014-08-06 18:00:41 +00:00
Jared Hance
48ffc3ded9 Add ++zeas, future ++zeal 2014-08-06 13:31:42 -04:00
Jared Hance
24f522281c Some %fine merges weren't doing anything, oops 2014-08-06 09:49:10 -04:00
Jared Hance
6bc5ecd9ad Fix this/that 2014-08-06 09:11:17 -04:00
C. Guy Yarvin
ac33a315bb Remove "keywords" in hood. 2014-08-05 17:17:36 -07:00
C. Guy Yarvin
e74b381e7e Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-08-05 15:33:52 -07:00
C. Guy Yarvin
a37bad2337 Some debugging improvements. 2014-08-05 15:30:08 -07:00
Anton Dyudin
f3f793e1b3 Fixed eyre inject, demo app 2014-08-05 15:09:19 -07:00
C. Guy Yarvin
93ee3f741d Various fixes and improvements. 2014-08-05 13:24:26 -07:00
C. Guy Yarvin
b44358ac73 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-08-05 12:50:16 -07:00
vere
165a37626c bump protocol 2014-08-05 19:25:09 +00:00
Galen Wolfe-Pauly
2bc1c1a877 callbacks and put data 2014-08-05 11:45:59 -07:00
Jared Hance
a86b55ab96 More FP fixes. I hate FP. 2014-08-05 12:08:59 -04:00
Jared Hance
5727b136d6 Floating point fix 2014-08-05 11:27:55 -04:00
Jared Hance
125b0a9603 Fix hashes in ++azel 2014-08-05 10:10:15 -04:00
C. Guy Yarvin
722b6c556b Some renamings. 2014-08-04 20:23:29 -07: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