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
3,441 Commits 768 Branches 10 Tags 215 MiB
8d56ecbf73
Commit Graph

305 Commits

Author SHA1 Message Date
Philip C Monk
9571a2b434 Merge remote-tracking branch 'origin/test' into pending 
Conflicts:
	urb/urbit.pill
 2015-07-14 18:56:05 -04:00
Philip C Monk
3d1cef62e0 bump protocol to 1 2015-07-13 16:15:06 -04:00
Philip C Monk
811c17a9ac Merge remote-tracking branch 'origin/newunix' into test 
Conflicts:
	urb/urbit.pill
	urb/zod/ape/hood.hoon
 2015-06-29 16:04:16 -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
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
277a301036 Merge remote-tracking branch 'origin/master' into typedclay 
Conflicts:
	urb/urbit.pill
 2015-03-10 15:47:22 -04:00
Philip C Monk
ceb3c30a45 add fake network acceleration 2015-03-10 15:07:34 -04: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
0e024a009f move along, nothing to see here 2015-02-27 01:35:41 -05:00
vere
833e522ff1 Continuity roll 2 2015-02-06 21:24:47 +00:00
Anton Dyudin
def54e2321 Actually put out eyre fires 2015-01-30 18:18:22 -08:00
Anton Dyudin
4d17234fd6 Put out eyre fires 2015-01-30 17:48:22 -08:00
Philip C Monk
a73da6dbff bump protocol to 1 2015-01-26 23:38:19 -05:00
C. Guy Yarvin
f552051f4c Initial commit to test branch, with de-flopped gall. 2015-01-16 10:31:43 -08:00
Anton Dyudin
fea0b21789 Merge branch 'auth', by extension pony2 and all associated refactoring. 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
 2015-01-14 19:47:05 -08:00
Anton Dyudin
48ada5795b Auth, debugging build 2015-01-14 17:47:51 -08:00
Steven Dee
0c38ce580f Renew ~tyr's papacy take two 2015-01-12 17:47:13 -05:00
Matt Earnshaw
afeb76b0f0 ruthlessly amputate extraneous arms 2015-01-12 21:49:33 +00:00
Anton Dyudin
39516d2f8c Tile %smsm, replaced instance in ames with ++hard call 2015-01-08 16:10:31 -08:00
vere
a81f60ce7e Merge branch 'master' of https://github.com/urbit/urbit 2014-12-20 02:45:31 +00:00
C. Guy Yarvin
9b61bd7388 Continuity breach to protocol 7. 2014-12-19 11:00:08 -08:00
Philip C Monk
125119ba8d bump protocol to 6 2014-12-18 21:15:39 -05:00
Philip C Monk
bcca4ec405 clean for new era 2014-12-05 16:48:30 -05:00
Philip C Monk
1b79d012c2 fixed some chat problems 2014-11-25 20:02:48 -05:00
Philip C Monk
b7e8fc79dc fixed :ye 2014-11-23 01:10:35 -05:00
Philip C Monk
08ba9a1ecb fixed :ye handling in ames 2014-11-23 00:44:14 -05:00
Anton Dyudin
20141ba0a8 Hi and ye 2014-11-22 21:20:51 -08:00
Philip C Monk
d867428553 bump protocol to 4 2014-11-22 17:38:02 -05:00
Philip C Monk
ed0cb3a14f Merge remote-tracking branch 'origin/master' into test 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/ames.hoon
	v/ames.c
	v/reck.c
	v/unix.c
 2014-11-22 17:37:36 -05:00
Philip C Monk
46c9be6528 give feedback for whether :begin works 2014-11-20 21:17:05 -05:00
Philip C Monk
9564e1bc62 crying -> trying 2014-11-20 17:26:31 -05:00
Anton Dyudin
9f8a3bcc93 Roll protocol 3 2014-11-12 11:55:37 -08:00
Anton Dyudin
bebd0fe253 Protocol roll 2 2014-11-10 10:02:10 -08:00
Anton Dyudin
9ccc1ab038 And by 0 we mean 1 2014-11-09 09:38:15 -08:00
Anton Dyudin
446ab0d8aa Roll protocol 0 2014-11-09 08:35:16 -08: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
34bd31893d Merge remote-tracking branch 'origin/shell' into dish 
Conflicts:
	urb/urbit.pill
	urb/zod/main/app/shell/core.hook
 2014-10-31 13:56:33 -04:00
Anton Dyudin
f6e6620514 Removed $_ bunt meaning 2014-10-30 20:13:40 -07:00
Ubuntu
b2c2ae3374 :begin working except unix sync 2014-10-29 23:07:13 +00:00
Ubuntu
e12a41c08e autosync/unsync works 2014-10-28 19:59:26 +00:00
Steven Dee
b998134a86 Renew ~tyr's papacy 2014-10-27 18:13:56 -04:00
Ubuntu
b1ecf8882a hooked dill up to shell; removed batz 2014-10-22 02:59:05 +00:00
vere
404aa55a71 bump to protocol 7 2014-10-16 01:06:38 +00:00
vere
3fe2ec6b2d bump to protocol 6 2014-10-13 19:07:42 +00:00
Anton Dyudin
aafa48f300 Protocol roll 5 2014-10-09 16:26:10 -07:00
vere
97ca5fb2c8 bump protocol to 4 2014-10-06 21:31:21 +00:00