urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-15 21:03:10 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,812 Commits 768 Branches 10 Tags 215 MiB
662b3369bd
Commit Graph

250 Commits

Author SHA1 Message Date
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
Ubuntu
b1ecf8882a hooked dill up to shell; removed batz 2014-10-22 02:59:05 +00:00
Ubuntu
fb2e290b32 first shell apps 2014-09-25 00:37:29 +00:00
C. Guy Yarvin
9f22287791 Merges and bugfixes. 2014-09-16 17:29:12 -07:00
Anton Dyudin
acca268df3 Partially fixed %gall .^ 2014-09-13 17:56:36 -07:00
Ubuntu
dd1b229b6b separate app identity from instance 2014-09-10 23:35:03 +00:00
vere
41a1eb9cc1 bump protocol number 2014-09-09 23:12:09 +00:00
vere
9c5a438955 bump protocol number 2014-09-08 21:06:21 +00:00
Ubuntu
f84354bdcd Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2014-09-05 16:22:22 +00:00
johncburnham
05068f17e1 roll breach protocol 2014-09-01 20:07:55 -07:00
Ubuntu
af394c1907 Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2014-09-01 17:43:49 +00:00
Ubuntu
e92d03213e bump protocol number 2014-09-01 16:55:14 +00:00
Ubuntu
13d4772a95 Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2014-08-28 17:20:02 +00:00
Ubuntu
cde357f317 bump protocol number and add Anton's carrier 2014-08-28 16:59:44 +00:00
Ubuntu
5c107029f6 almost done with lifecycle of a packet 2014-08-27 01:45:26 +00:00
Ubuntu
ee80bb021f Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2014-08-25 15:09:50 +00:00
vere
5b9fd272c6 bump protocol number 2014-08-24 22:13:27 +00:00
Ubuntu
554a22660b Merge branch 'master' into test 
Conflicts:
	urb/urbit.pill
 2014-08-21 20:08:32 +00:00
Anton Dyudin
3d454f2acf Am I doing this right? 2014-08-21 12:15:05 -07:00
johncburnham
d408ebc495 breach protocol roll 2014-08-21 06:08:56 -07:00
johncburnham
4a59dfc9d4 carriers 2014-08-18 20:17:40 -07:00
johncburnham
4ac0c678d5 roll protocol for breach 2014-08-18 00:05:57 -07:00
johncburnham
adaaca8735 roll breach protocol 2014-08-11 19:21:54 -07:00
vere
920c998f1b roll protocol again 2014-08-09 20:59:52 +00:00
johncburnham
3861f41ba0 roll protocol 2014-08-09 13:22:33 -07:00
Ubuntu
705b7812bb bump protocol number 2014-08-06 18:00:41 +00:00
vere
165a37626c bump protocol 2014-08-05 19:25:09 +00:00
C. Guy Yarvin
1d49dc93cc Ames protocol to 3. 2014-08-04 18:19:15 -07:00
C. Guy Yarvin
a4a3c67664 Protocol to 2. 2014-08-04 12:51:34 -07:00
C. Guy Yarvin
e772988cae Moving to protocol 1. 2014-08-04 10:46:37 -07:00
johncburnham
86e0312934 bad commit 2014-08-04 10:18:58 -07:00
johncburnham
4e925fa53d git dropped a commit? 2014-08-04 09:54:14 -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
97755be677 Merge branch 'master' into e2e-real 
Conflicts:
	urb/urbit.pill
 2014-08-01 16:27:44 -07:00
Jared Hance
4e9d9b44cf Add zapcols 2014-08-01 14:11:46 -04:00
pcmonk
7d581a3714 most of new chat 2014-07-31 19:44:49 -07:00
C. Guy Yarvin
03c714afe5 Merge branch 'turbomem' 
Conflicts:
	urb/urbit.pill
 2014-07-31 13:38:05 -07:00
johncburnham
5fd348d1e9 roll protocol for breach 2014-07-31 08:25:29 -07:00
pcmonk
f34071c4ff e2e-acks in a consistent state, ready to merge 2014-07-28 11:44:56 -07:00
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
pcmonk
2b9b533a6f work on making end-to-end acks work 2014-07-23 19:02:50 -07:00