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,099 Commits 768 Branches 10 Tags 215 MiB
1445aefca4
Commit Graph

1099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pcmonk
1445aefca4 Merge branch 'master' into e2e-real 
Conflicts:
	urb/urbit.pill
 2014-07-25 19:34:51 -07:00
pcmonk
2b4fec9a51 all (well-formed) test apps work 2014-07-25 19:10:24 -07:00
C. Guy Yarvin
d8b3c5f7d5 Remove eyre console code to save memory. 2014-07-25 09:38:22 -07:00
C. Guy Yarvin
2f42a419ea Ford, with some comments to save memory. 2014-07-25 09:26:12 -07:00
C. Guy Yarvin
3aa1580c03 Merge branch 'master' of github.com:urbit/urbit 2014-07-25 09:02:51 -07:00
johncburnham
18b00ae650 a markdown parser 2014-07-25 03:45:46 -07:00
C. Guy Yarvin
faf33d012b Ford compiles - still needs some syntax. 2014-07-24 13:29:16 -07:00
C. Guy Yarvin
f9e53c2541 Merge branch 'master' of github.com:urbit/urbit 2014-07-24 11:16:50 -07:00
C. Guy Yarvin
96e2eef2b2 Fix some indents. 2014-07-24 11:16:39 -07:00
John Dulin
c281cae593 Merge branch 'master' of https://github.com/urbit/urbit 2014-07-23 19:05:30 -07:00
John Dulin
620cebadad Fixed stupid imaginary type in the asset protocol 2014-07-23 19:05:15 -07:00
pcmonk
2b9b533a6f work on making end-to-end acks work 2014-07-23 19:02:50 -07:00
C. Guy Yarvin
20c5c1d5a0 Code complete on ford. 2014-07-23 16:23:53 -07:00
Anton Dyudin
d4cd1cdb47 :update "merge method" clarification 2014-07-23 15:36:10 -07:00
Anton Dyudin
cde3031388 :begin ~ship ~ticket form 2014-07-23 15:15:30 -07:00
Anton Dyudin
7e50755029 Restructured raws/rads:og for =^ result order, added /=pals= %ames .^ 2014-07-23 14:01:52 -07:00
pcmonk
13a4df24a1 cleanup 2014-07-23 11:25:53 -07:00
C. Guy Yarvin
7051a7f711 Merge branch 'master' of github.com:urbit/urbit 2014-07-23 11:17:55 -07:00
C. Guy Yarvin
271e4f2c0e Remove XX. 2014-07-23 11:17:43 -07:00
johncburnham
424fa7398d once more into the breach 2014-07-23 01:31:09 -07:00
johncburnham
58921e9fd4 xml parser II: the richard donner cut 2014-07-22 16:12:38 -07:00
johncburnham
9d4302698d Revert "fixed minor bug in xml parser" 
This reverts commit 908d8d5fde6f03e41adb10bc8163e5cc2c0dc285.
 2014-07-22 15:59:43 -07:00
johncburnham
6bb974f2ec fixed minor bug in xml parser 2014-07-22 12:02:44 -07:00
Jared Hance
4e6e0e79eb Add +-got to ++by. 2014-07-22 10:10:01 -04:00
C. Guy Yarvin
edfae53ddc Fix horrid indentation thing. 2014-07-22 09:32:35 -07:00
C. Guy Yarvin
5d8bca3bea Some hoof tweaks. 2014-07-21 18:55:40 -07:00
C. Guy Yarvin
9c39abae1c Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-21 15:54:29 -07:00
C. Guy Yarvin
2b5e57de2d Replace ++logo with ++mark to match doc. 2014-07-21 15:14:52 -07:00
Anton Dyudin
847253d685 fixed %eyre urb.user inject 2014-07-21 13:38:46 -07:00
Galen Wolfe-Pauly
0ddba5cf1b Merge branch 'master' of https://github.com/urbit/urbit 2014-07-21 11:42:07 -07:00
Galen Wolfe-Pauly
59a5281541 preened urb.js 2014-07-21 11:42:02 -07:00
John Dulin
383b75a47b Merge branch 'master' of https://github.com/urbit/urbit 2014-07-20 23:19:05 -07:00
John Dulin
5152f23085 Added asset [ship guid] logo to /main/sys for streams subscription messages 2014-07-20 23:18:56 -07:00
C. Guy Yarvin
3378245281 Functional build skeleton. 2014-07-20 20:15:02 -07:00
C. Guy Yarvin
ac488f6225 We are very close to the memory limit on :solid! 2014-07-18 19:45:10 -07:00
C. Guy Yarvin
925ae8ccb7 Merge branch 'master' of github.com:urbit/urbit 2014-07-18 17:51:37 -07:00
C. Guy Yarvin
79b91ebd7a New ford skeleton; some hoon cleanups 2014-07-18 17:51:22 -07:00
pcmonk
372ece59d3 unsubscriptions through %eyre 2014-07-18 12:23:35 -07:00
pcmonk
dd7400682b Merge branch 'eyre-stuff' 
Conflicts:
	urb/urbit.pill
 2014-07-17 16:16:28 -07:00
pcmonk
895b4a8f84 clients divorced from apps, streams multiplexed 2014-07-17 16:11:00 -07:00
C. Guy Yarvin
2260d31b1c Merge branch 'master' of github.com:urbit/urbit 2014-07-17 13:56:22 -07:00
C. Guy Yarvin
f3e3eb01e0 Preparing to integrate new ford. 2014-07-17 13:56:08 -07:00
johncburnham
5987ff2f8d improved xml parser 2014-07-16 19:46:46 -07:00
pcmonk
20574f69f7 more work on eyre-stuff -- compiles 2014-07-16 19:10:13 -07:00
Jared Hance
7faf70e14d Some klay changes. 2014-07-16 15:14:12 -04:00
C. Guy Yarvin
b9b6d522b9 Merge branch 'master' of github.com:urbit/urbit 
Conflicts:
	urb/urbit.pill
 2014-07-16 11:56:15 -07:00
C. Guy Yarvin
5b8844207e Minor tweaks. 2014-07-16 11:54:53 -07:00
pcmonk
2df55edb87 Bump protocol number 2014-07-16 11:25:22 -07:00
Jared Hance
3c85c88040 Merge branch 'clay' 
Conflicts:
	urb/urbit.pill
 2014-07-16 13:56:34 -04:00
johncburnham
bbe73c468f added an xml parser 2014-07-15 22:47:43 -07:00