Commit Graph

291 Commits

Author SHA1 Message Date
Philip C Monk
4466b6ff46 boots again 2015-01-21 20:47:49 -05: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
vere
2482bceff1 bump protocol to 3 2014-10-02 23:12:44 +00:00
vere
a2786b12a9 bump protocol to 2 2014-09-30 00:51:18 +00:00
Ubuntu
3f7c68fe7d bump protocol to 1 2014-09-29 18:02:32 +00:00
Ubuntu
5b95fbe4a4 remove %bad-key printf 2014-09-26 18:32:21 +00:00
vere
3df24efda5 bump protocol to 0 2014-09-26 17:34:54 +00:00
Ubuntu
fb2e290b32 first shell apps 2014-09-25 00:37:29 +00:00
Ubuntu
a0b8e49f65 Merge branch 'master' of https://github.com/urbit/urbit 2014-09-24 01:50:34 +00:00
vere
57a1088a2b bump protocol to 7 2014-09-24 01:47:31 +00:00
Ubuntu
3cc061b5d8 claimed ~tug 2014-09-24 01:42:21 +00:00
Anton Dyudin
e356f54e1d ~fyr demoted from ++crub fingerprint (oops) 2014-09-23 18:26:10 -07:00
vere
2108f6c223 bump to protocol number 6 2014-09-23 05:59:08 +00:00
Anton Dyudin
ab73ecb798 Protocol roll 5 2014-09-20 13:01:14 -07:00
Anton Dyudin
0419256713 Protocol roll 4 2014-09-18 19:48:35 -07:00
C. Guy Yarvin
9f22287791 Merges and bugfixes. 2014-09-16 17:29:12 -07:00