Commit Graph

234 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
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
Philip C Monk
5d40a20598 Merge remote-tracking branch 'origin/shell' into dish
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
	urb/zod/main/app/terminal/hymn/script.js
2014-10-30 16:48:18 -04:00
Anton Dyudin
080512a129 Refactored xml* to poxo and poxa 2014-10-30 13:33:15 -07:00
Anton Dyudin
0e988b588d Removed tyq:ag 2014-10-28 13:15:44 -07:00
Ubuntu
c9d0ec374a Merge branch 'shell' into dish
Conflicts:
	urb/urbit.pill
2014-10-23 21:11:10 +00:00
Ubuntu
c94b900977 auto-convert from json to mark 2014-10-23 21:09:39 +00:00
Ubuntu
0a2c2938e4 Merge branch 'shell' into dish
Conflicts:
	urb/urbit.pill
2014-10-23 03:20:13 +00:00
Ubuntu
c363149abe Merge branch 'shell' of https://github.com/urbit/urbit into shell
Conflicts:
	urb/urbit.pill
2014-10-23 03:17:03 +00:00
Ubuntu
6fda6d75f1 have eyre convert to json 2014-10-23 03:13:10 +00:00
Ubuntu
2d6377f530 Merge branch 'shell' into dish
Conflicts:
	urb/urbit.pill
2014-10-23 03:08:22 +00:00
Ubuntu
b1ecf8882a hooked dill up to shell; removed batz 2014-10-22 02:59:05 +00:00
Anton Dyudin
e7ea40dd79 h/h refactoring 2014-10-21 19:04:27 -07:00
Ubuntu
c0769ca2ea removed clay timer from unix.c 2014-10-16 22:54:01 +00:00
Galen Wolfe-Pauly
b4f6e6920f Fixed %eyre nyp in epic 2014-10-16 12:53:38 -07:00
Ubuntu
93e6ea7fb8 eyre heartbeat uses timer vane 2014-10-15 22:05:48 +00:00
Anton Dyudin
9b6ad8967c UTF-8 inject 2014-10-10 16:52:20 -07:00
Anton Dyudin
355c7c122d Minor restructuring 2014-10-10 16:34:29 -07:00
Anton Dyudin
0e95d953e8 Guarded JSON parse errors 2014-10-10 15:17:28 -07:00
Ubuntu
3f3e8b2e79 more printfs 2014-10-08 01:00:55 +00:00
Ubuntu
3f4c9b8af4 mystery printfs 2014-10-08 00:32:37 +00:00
Ubuntu
5ed630ef61 forgot to commit eyre, gall 2014-10-03 22:32:10 +00:00
C. Guy Yarvin
9f22287791 Merges and bugfixes. 2014-09-16 17:29:12 -07:00
Ubuntu
dd1b229b6b separate app identity from instance 2014-09-10 23:35:03 +00:00
Anton Dyudin
f4adae2471 Removed redundant duty args 2014-09-09 12:46:42 -07:00
Ubuntu
539c6c2710 now you can subscribe to individual directories 2014-09-05 22:10:11 +00:00
Anton Dyudin
d83db302f6 /gep/hart.js long-poll utils factored out 2014-09-04 14:37:29 -07:00
Galen Wolfe-Pauly
a9ca22a5a4 Better aut.ced hacks 2014-09-03 11:41:25 -07:00
Galen Wolfe-Pauly
8aa3c5ab3d Revert "Url aut hacks"
This reverts commit bbe14dd81309574eab0f56d875d5231d85f6ff13.
2014-09-03 11:32:48 -07:00
Anton Dyudin
ad5058d039 Url aut hacks 2014-09-03 11:09:00 -07:00
Galen Wolfe-Pauly
2f24750980 Merge branch 'master' into test 2014-08-19 18:13:49 -07:00
Galen Wolfe-Pauly
86c4defc40 heartbeater 2014-08-19 18:11:41 -07:00
Ubuntu
38f1f3b4a7 reenabled heartbeat drops 2014-08-20 01:05:05 +00:00
Galen Wolfe-Pauly
29d86662ab heartbeat consistency 2014-08-18 14:20:51 -07:00
Galen Wolfe-Pauly
5d203f9461 No !: in eyre 2014-08-18 14:09:14 -07:00
Galen Wolfe-Pauly
6c16e01046 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-18 13:30:44 -07:00
Galen Wolfe-Pauly
f3e5867cb5 eyre heartbeat fix 2014-08-18 13:30:33 -07:00
Ubuntu
91164ee9c7 added harmless printf 2014-08-18 20:28:26 +00:00
Ubuntu
30d5841158 fixed eyre injection ordering 2014-08-18 19:53:43 +00:00
Galen Wolfe-Pauly
c3dc727e90 Merge branch 'master' of https://github.com/urbit/urbit 2014-08-13 16:27:09 -07:00
Galen Wolfe-Pauly
0bec3a87bf dont overwrite bind 2014-08-13 16:18:58 -07:00
Anton Dyudin
063fbc6db6 Fixed %eyre window.urb queuing 2014-08-13 15:50:49 -07:00
C. Guy Yarvin
058d3d866f Various fixes and improvements. 2014-08-11 17:12:51 -07:00
Galen Wolfe-Pauly
db727ccf13 no console logs in production 2014-08-11 12:57:25 -07:00
C. Guy Yarvin
cc3733e6d4 Various mainly stylistic improvements. 2014-08-11 00:47:46 -07:00
C. Guy Yarvin
2a10f4dd34 Improve some eyre printfs. 2014-08-10 21:43:43 -07:00
C. Guy Yarvin
fe9c4c8a85 Various fixes and improvements. 2014-08-10 20:09:56 -07:00