Commit Graph

622 Commits

Author SHA1 Message Date
Philip C Monk
c8f5313407 Merge branch 'dish' of https://github.com/urbit/urbit into dish 2014-11-05 14:44:54 -05:00
Philip C Monk
36ef1778ca fixed some ordering issues 2014-11-05 14:39:00 -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
Philip C Monk
b2fb76dbd9 some begin stuff 2014-11-03 16:17:57 -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
Philip C Monk
f2dea88245 prompting :begin seems to work... 2014-10-31 20:53:11 -04: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
Philip C Monk
9b627c6db1 refactored terminal 2014-10-30 21:54:54 -04:00
Anton Dyudin
985adfeb87 Comments, :; kill 2014-10-30 14:57:47 -07:00
Philip C Monk
7231bd8310 refactored terminal 2014-10-30 16:48:37 -04: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
Philip C Monk
1fbd634ff4 added :ticket 2014-10-29 20:37:17 -04:00
Ubuntu
5e39bd46d9 forgot some peripheral files 2014-10-29 23:45:22 +00:00
Ubuntu
b2c2ae3374 :begin working except unix sync 2014-10-29 23:07:13 +00:00
Anton Dyudin
13f71f1e46 Comments, JSON refactoring, ++flit $+(_,? $+(* (unit))) 2014-10-29 13:59:01 -07:00
Anton Dyudin
18c0f91a5e Twitter psals, rash poja/xmlp, di:jo millisecond unix date 2014-10-28 16:13:02 -07:00
Anton Dyudin
4ab1885fe4 Fixed prompt leading / 2014-10-28 13:30:29 -07:00
Anton Dyudin
b03ccf4b2c Added psal:grow:/door/txt/mar
Conflicts:
	urb/zod/main/mar/txt/door.hook
2014-10-26 21:45:18 -07:00
Anton Dyudin
071ac7c460 Added psal:grow:/door/txt/mar 2014-10-26 21:34:40 -07:00
C. Guy Yarvin
d5aee61ff1 Performs a full :solid. 2014-10-25 12:30:36 -07:00
C. Guy Yarvin
47a6b869a8 Almost there. 2014-10-25 05:21:48 -07:00
Anton Dyudin
afaf131c72 Offset input
Conflicts:
	urb/zod/main/app/terminal/hymn/script.js
2014-10-24 13:12:48 -07:00
Anton Dyudin
f25de520d6 Offset input 2014-10-24 13:08:19 -07:00
Anton Dyudin
22feaa507a Term-line restructure: (list ?(tank [%stem tank tank])) 2014-10-24 12:58:04 -07:00
Ubuntu
35e5688b70 added kill and :verb 2014-10-23 22:56:06 +00:00
Ubuntu
6940b69815 forgot term-in 2014-10-23 22:35:03 +00:00
Ubuntu
8840aa0d51 Merge branch 'dish' of https://github.com/urbit/urbit into dish 2014-10-23 21:11:32 +00:00
Ubuntu
c94b900977 auto-convert from json to mark 2014-10-23 21:09:39 +00:00
Ubuntu
f7e2d0674a removed poke-json from terminal 2014-10-23 21:00:23 +00:00
Anton Dyudin
408b948ca2 Shell terminal whitespace 2014-10-23 13:22:01 -07:00
Ubuntu
89a7bc473a removed lines-jon 2014-10-23 03:35:13 +00:00
Ubuntu
0c7a8604f7 Merge branch 'dish' of https://github.com/urbit/urbit into dish 2014-10-23 03:26:20 +00:00
Ubuntu
2d6377f530 Merge branch 'shell' into dish
Conflicts:
	urb/urbit.pill
2014-10-23 03:08:22 +00:00
Ubuntu
65b33a2cd2 deactivated lines-json 2014-10-23 03:02:18 +00:00
Ubuntu
ac28c57bf8 Merge branch 'dish' of https://github.com/urbit/urbit into dish 2014-10-22 23:20:55 +00:00
Ubuntu
3aa2348eab put gars in the correct places 2014-10-22 23:20:34 +00:00
Anton Dyudin
33fcc09519 Path refactoring 2014-10-22 14:49:47 -07:00
Ubuntu
56c1c938d3 requisite structures 2014-10-22 21:28:07 +00:00
Ubuntu
6326d25140 cleaned up terminal code 2014-10-22 19:13:07 +00:00
Ubuntu
d3745596a1 start shell on startup 2014-10-22 17:19:18 +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
Anton Dyudin
63c4ce15ee Removed errant shell ~& 2014-10-16 16:48:57 -07:00
Anton Dyudin
3f74cdfbc6 Continued to fix tall form 2014-10-16 16:42:40 -07:00
Anton Dyudin
70c7ae5da1 Fixed tall form parsing 2014-10-16 15:12:34 -07:00
Anton Dyudin
d395914602 Fixed hymn:grow:js/door 2014-10-16 11:57:24 -07:00
Ubuntu
93e6ea7fb8 eyre heartbeat uses timer vane 2014-10-15 22:05:48 +00:00
Ubuntu
3447af7a22 Merge branch 'shell' of https://github.com/urbit/urbit into shell
Conflicts:
	urb/urbit.pill
2014-10-15 02:28:46 +00:00