urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-12 10:29:01 +03:00
Code Issues Packages Projects Releases Wiki Activity
5,303 Commits 768 Branches 10 Tags 215 MiB
2de8328b4c
Commit Graph

217 Commits

Author SHA1 Message Date
Philip C Monk
06bda9cd8c fixed lose-changes-when-unrelated-conflict bug 2015-09-18 20:15:36 -04:00
Philip C Monk
5de171f23d RIP %indirect 2015-09-16 19:45:54 -04:00
Philip C Monk
3bfe641b1c added |cancel 2015-09-15 20:24:44 -04:00
Philip C Monk
77eb638240 merge clay card-sending pathways 2015-09-11 20:27:32 -04:00
Philip C Monk
73a5596168 %init doesn't require new desk 2015-09-10 20:25:27 -04:00
Philip C Monk
f75b8a1370 change some our's to her's 2015-09-10 18:37:19 -04:00
Philip C Monk
16cb3f3961 pull marks from correct ships 2015-09-10 17:49:22 -04:00
Philip C Monk
5a71800fb8 Merge branch 'clayhammer' into pending 
Conflicts:
	urb/urbit.pill
	urb/zod/ape/dojo.hoon
	urb/zod/arvo/zuse.hoon
	urb/zod/lib/drum.hoon
	urb/zod/lib/helm.hoon
	urb/zod/lib/kiln.hoon

Also bumped protocol to 4
 2015-09-09 19:15:26 -04:00
Philip C Monk
13a01c3e36 merge from commit rather than desk 2015-09-09 17:08:10 -04:00
vere
a3a93b6dac fix crash 2015-09-08 19:24:31 +00:00
Philip C Monk
d0389ec2c1 reworked ++ankh and ++soba 2015-09-05 21:14:00 -04:00
Philip C Monk
584dc5e9a9 fixed some bugs 2015-09-04 20:15:05 -04:00
Philip C Monk
490798b908 disallow multiple simultaneous merges to same desk 2015-09-03 17:14:35 -04:00
Philip C Monk
4ec8907b39 performance improvements 2015-09-03 17:14:35 -04:00
Philip C Monk
8059a5fffa rewrite clay event dispatch 2015-08-13 20:11:59 -04:00
Philip C Monk
5e0ba075b0 fixed various clay problems 2015-07-14 18:32:12 -04:00
Anton Dyudin
d03e1df1be changed silk structure 2015-07-10 11:51:47 -07:00
Anton Dyudin
8435b965e3 reorder ++mash interface, fix %clay/kiln usage of such 2015-07-08 16:45:17 -07:00
Anton Dyudin
1c57c4d4f5 updated %ford silk interface as per specification 2015-07-07 10:34:21 -07:00
Philip C Monk
54c98f2085 Merge remote-tracking branch 'origin/master' into newunix 
Conflicts:
	urb/urbit.pill
 2015-06-29 15:40:14 -04:00
Philip C Monk
dada87fa14 fix no-sync-duct again 2015-06-29 15:31:33 -04:00
Philip C Monk
c9539452e2 Merge remote-tracking branch 'origin/newunix' 
Conflicts:
	urb/urbit.pill
	urb/zod/base/mar/bit-accounts.hoon
	urb/zod/base/mar/bit-addr-made.hoon
	urb/zod/base/mar/bit-addr-request.hoon
	urb/zod/base/mar/bit-api-call.hoon
	urb/zod/base/mar/bit-get-token.hoon
	urb/zod/base/mar/bit-transaction.hoon
	urb/zod/base/mar/bit/accounts.hoon
	urb/zod/base/mar/bit/addr-made.hoon
	urb/zod/base/mar/bit/addr-request.hoon
	urb/zod/base/mar/bit/api-call.hoon
	urb/zod/base/mar/bit/get-token.hoon
	urb/zod/base/mar/bit/transaction.hoon
	urb/zod/base/mar/cloud-auth.hoon
	urb/zod/base/mar/cloud-secret.hoon
	urb/zod/base/mar/cloud/auth.hoon
	urb/zod/base/mar/cloud/secret.hoon
	urb/zod/base/mar/dill-belt.hoon
	urb/zod/base/mar/dill-blit.hoon
	urb/zod/base/mar/dill/belt.hoon
	urb/zod/base/mar/dill/blit.hoon
	urb/zod/base/mar/oct3-move.hoon
	urb/zod/base/mar/oct3-update.hoon
	urb/zod/base/mar/oct3/move.hoon
	urb/zod/base/mar/oct3/update.hoon
	urb/zod/base/mar/oct4-move.hoon
	urb/zod/base/mar/oct4-update.hoon
	urb/zod/base/mar/oct4/move.hoon
	urb/zod/base/mar/oct4/update.hoon
	urb/zod/base/mar/sole-action.hoon
	urb/zod/base/mar/sole-effect.hoon
	urb/zod/base/mar/sole/action.hoon
	urb/zod/base/mar/sole/effect.hoon
	urb/zod/base/mar/talk-command.hoon
	urb/zod/base/mar/talk-report.hoon
	urb/zod/base/mar/talk/command.hoon
	urb/zod/base/mar/talk/report.hoon
	urb/zod/mar/bit-accounts.hoon
	urb/zod/mar/bit-addr-made.hoon
	urb/zod/mar/bit-addr-request.hoon
	urb/zod/mar/bit-api-call.hoon
	urb/zod/mar/bit-get-token.hoon
	urb/zod/mar/bit-transaction.hoon
	urb/zod/mar/cloud-auth.hoon
	urb/zod/mar/cloud-auth/door.hook
	urb/zod/mar/cloud-secret.hoon
	urb/zod/mar/cloud-secret/door.hook
	urb/zod/mar/dill-belt.hoon
	urb/zod/mar/dill-blit.hoon
	urb/zod/mar/oct3-move.hoon
	urb/zod/mar/oct3-update.hoon
	urb/zod/mar/oct4-move.hoon
	urb/zod/mar/oct4-update.hoon
	urb/zod/mar/sole-action.hoon
	urb/zod/mar/sole-effect.hoon
	urb/zod/mar/talk-command.hoon
	urb/zod/mar/talk-report.hoon
 2015-06-23 19:28:46 -04:00
Philip C Monk
3f9b8942da respond to subscription even if "nothing changed" 
fixes #320
 2015-06-23 18:22:26 -04:00
Philip C Monk
63a94bc415 fix no-sync-duct bug 2015-06-19 18:08:57 -04:00
Philip C Monk
72ef5c2cbd urb/zod/base -> urb/zod 2015-06-19 17:16:48 -04:00
Philip C Monk
f55f5bc295 moving stuff around 2015-03-11 20:37:37 -04:00
Philip C Monk
7bf9db3b1a merging across network works 2015-03-11 15:43:44 -04:00
Philip C Monk
7c04b9b9f8 boots 2015-03-10 20:54:39 -04:00
Philip C Monk
3406a1e9a4 waypoint 2015-03-10 19:56:08 -04:00
Philip C Monk
030cae0cde waypoint 2015-03-10 17:09:53 -04:00
Philip C Monk
c5fb969904 remove extraneous printfs 2015-03-09 17:36:04 -04:00
Philip C Monk
1d6e199d65 merging across network tentatively works 2015-03-06 17:28:55 -05:00
Philip C Monk
459604b7df first over-the-network typed merge 2015-03-06 16:07:34 -05:00
Philip C Monk
4f2e514563 waypoint 2015-03-05 20:19:54 -05:00
Philip C Monk
31d3788115 Merge remote-tracking branch 'origin/master' into typedclay 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/eyre.hoon
	urb/zod/arvo/hoon.hoon
	urb/zod/arvo/zuse.hoon
	urb/zod/main/app/poke/core.hook
	urb/zod/main/app/reboot/core.hook
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/tree/core.hook
 2015-03-05 18:27:07 -05:00
Philip C Monk
092a2822e9 progress toward sub-booting 2015-03-04 19:36:29 -05:00
Philip C Monk
55e8072b3b arvo side of getting subs to boot 2015-03-03 20:05:41 -05:00
Philip C Monk
0e024a009f move along, nothing to see here 2015-02-27 01:35:41 -05:00
Philip C Monk
56fe217022 fix ye olde dotket bug 
fixes #194
 2014-12-09 17:59:31 -05:00
Philip C Monk
1b79d012c2 fixed some chat problems 2014-11-25 20:02:48 -05:00
Philip C Monk
3e2a16a3ea fixed :begin entropy bug 2014-11-20 17:40:59 -05:00
Philip C Monk
f51f4ae580 wise man said, a commit is better than a stash 2014-11-20 16:00:40 -05:00
Philip C Monk
dcec7f962f added helpful waiting messages during sync 2014-11-18 19:10:11 -05:00
Philip C Monk
c6f86e7b6a Merge branch 'test' into dish 
Conflicts:
	include/v/vere.h
	urb/urbit.pill
	urb/zod/arvo/ames.hoon
	urb/zod/arvo/hoon.hoon
	v/loop.c
	v/raft.c
 2014-11-04 16:42:02 -05:00
Philip C Monk
5242925469 Merge branch 'test' into shell 
Conflicts:
	include/v/vere.h
	urb/urbit.pill
	urb/zod/arvo/clay.hoon
	urb/zod/arvo/eyre.hoon
	urb/zod/arvo/hoon.hoon
	urb/zod/main/mar/hook/door.hook
	urb/zod/main/mar/psal/door.hook
	urb/zod/main/mar/txt/door.hook
	urb/zod/main/pub/src/doc/ref/vol/1.md
	v/loop.c
	v/raft.c
	v/reck.c
	v/unix.c
 2014-11-04 15:22:33 -05:00
C. Guy Yarvin
d707ae35ea Merge branch 'test' into memorable 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
	urb/zod/arvo/zuse.hoon
	urb/zod/main/pub/src/doc/ref/vol/4c.md
	v/reck.c
 2014-11-02 02:03:13 -08:00
C. Guy Yarvin
4f29307601 Various fixes and improvements. 2014-10-31 15:36:01 -07:00
Philip C Monk
1fbd634ff4 added :ticket 2014-10-29 20:37:17 -04:00
Ubuntu
e12a41c08e autosync/unsync works 2014-10-28 19:59:26 +00:00
Ubuntu
8f1bf03d50 autosync seems to be working 2014-10-28 01:50:07 +00:00
Ubuntu
b1ecf8882a hooked dill up to shell; removed batz 2014-10-22 02:59:05 +00:00
Ubuntu
656bce55a3 weaned clay off its own timer 2014-10-16 20:42:45 +00:00
C. Guy Yarvin
9f22287791 Merges and bugfixes. 2014-09-16 17:29:12 -07:00
Ubuntu
fabf390eac updated clay doc and code 2014-09-16 14:19:15 +00:00
Ubuntu
102fced646 clay fixes 2014-09-11 18:52:25 +00:00
Ubuntu
d0d80f6ce2 clay foreign request doc done 2014-09-10 19:52:06 +00:00
Ubuntu
c405a4bd7a some clay refactoring 2014-09-09 00:21:40 +00:00
Ubuntu
ef15359455 clay bug fix 2014-09-05 22:59:56 +00:00
Ubuntu
539c6c2710 now you can subscribe to individual directories 2014-09-05 22:10:11 +00:00
C. Guy Yarvin
906a27b19b Fix "every other" sync bug. 2014-08-13 15:47:08 -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
C. Guy Yarvin
46226c3dbf More memory pls. 2014-07-31 13:23:02 -07:00
Jared Hance
8f62bce5f4 Remove printfs 2014-07-30 15:09:59 -04:00
Jared Hance
68fb76214d Fix referential transparency in %merg 2014-07-29 13:43:20 -04:00
Jared Hance
3a48876a4d Fix referential transparency in %cu 2014-07-25 13:44:06 -04:00
Jared Hance
873bd9b208 Simple change 2014-07-25 08:53:39 -04:00
Jared Hance
bb18c8b086 Unix sync out. 2014-07-24 11:47:11 -04:00
Jared Hance
fb24594e9e Can boot subs now! 2014-07-24 11:11:40 -04:00
Jared Hance
27f38c45bd Merge branch 'master' into klay 
Conflicts:
	urb/zod/arvo/zuse.hoon
 2014-07-22 15:03:59 -04:00
Jared Hance
5ba302978c Broken. 2014-07-22 14:56:04 -04:00
C. Guy Yarvin
2b5e57de2d Replace ++logo with ++mark to match doc. 2014-07-21 15:14:52 -07:00
Jared Hance
2bcde8f6ee Initial klay stuff. 
Clay.hoon doesn't work yet, haven't done subscriptions.

Should probably changes yakis to only reference yaki mugs rather than
yakis themselves - and have a blob map in the dome. Otherwise
subscriptions and merges will suck for large stuff.
 2014-07-17 11:40:52 -04:00
Jared Hance
3c85c88040 Merge branch 'clay' 
Conflicts:
	urb/urbit.pill
 2014-07-16 13:56:34 -04:00
Jared Hance
d549b6a4fe Fix revision origin. 2014-07-10 10:24:29 -04:00
pcmonk
2c15e0c0bf %send effect does not need to drop through anymore 2014-07-09 14:42:08 -07:00
Jared Hance
235583e858 Almost there... 2014-07-09 16:56:23 -04:00
Jared Hance
8703188407 Restructure clay. 
Hopefully this is the only commit that would require a breach.

Writing a data transition would be trivial later.

Still need to fix ++domo.
 2014-07-09 15:11:25 -04:00
Jared Hance
c787b33b8e More ++doze in %clay changes... 
Still trying to figure out the %clay model.
 2014-07-07 10:59:11 -04:00
Jared Hance
1242d1b456 Rewrite ++doze in %clay. 
I'm always a fan of removing ugly names just for a single call.
 2014-07-07 10:29:47 -04:00
Anton Dyudin
afa76048e0 comment fixes 2014-07-01 15:51:42 -07:00
C. Guy Yarvin
f939071722 Various fixes and improvements. 2014-06-24 10:32:59 -07:00
C. Guy Yarvin
23186f9a24 Some renaming. 2014-06-21 22:49:10 -07:00
C. Guy Yarvin
caebe96b2f About halfway refactored. 2014-06-21 15:06:42 -07:00
C. Guy Yarvin
bfd17aae6c Reversed toss order. 2014-06-21 11:42:34 -07:00
C. Guy Yarvin
5a1963fd52 Intermediate point in vane protocol change. 2014-06-19 22:49:39 -07:00
C. Guy Yarvin
d6b1ecde47 Various fixes and improvements. 2014-06-19 11:53:16 -07:00
C. Guy Yarvin
120760563c Various fixes and improvements. 2014-06-11 07:06:36 -07:00
C. Guy Yarvin
82a9ce1211 Merge branch 'nextbreach' of github.com:urbit/urbit into nextbreach 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
 2014-06-07 19:56:38 -07:00
C. Guy Yarvin
ff2c010efe Applications properly self-reload. 2014-06-07 19:45:00 -07:00
Gavin Whelan
3bb02fe9d7 Fixing typo 2014-06-06 18:07:47 -04:00
Gavin Whelan
32e8bb7d96 merge fixes 
Conflicts:
	urb/zod/arvo/clay.hoon
 2014-06-06 15:03:24 -04:00
C. Guy Yarvin
d51bc114aa More vane cleaanups 2014-06-05 16:00:19 -07:00
C. Guy Yarvin
6befd64507 More vane restructuring. 2014-06-05 15:14:49 -07:00
C. Guy Yarvin
90fe034995 %batz reasonably healthy on nextbreach. 2014-06-05 12:17:25 -07:00
C. Guy Yarvin
85a7688693 Various fixes and improvements. 2014-06-04 10:56:30 -07:00
C. Guy Yarvin
2f00948780 Merge branch 'nextbreach' of github.com:urbit/urbit into nextbreach 
Conflicts:
	urb/urbit.pill
 2014-06-04 03:44:33 -07:00
C. Guy Yarvin
6e00dd5ee3 Tighten types on some vanes. 2014-06-04 03:40:09 -07:00
C. Guy Yarvin
0df8aeeb67 Some vane cleanups, etc. 2014-06-02 22:07:32 -07:00
Gavin Whelan
4b4ba12e1c Merge branch 'master' of https://github.com/urbit/urbit 2014-06-02 09:19:06 -04:00