Commit Graph

160 Commits

Author SHA1 Message Date
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
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
e7ea40dd79 h/h refactoring 2014-10-21 19:04:27 -07:00
Ubuntu
fb67d37e2e added %time vane 2014-10-15 02:25:23 +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
C. Guy Yarvin
69de3fdb92 Some support stuff. 2014-09-12 12:55:15 -07:00
Ubuntu
dd1b229b6b separate app identity from instance 2014-09-10 23:35:03 +00:00
Ubuntu
d789f4ec88 more clay refactoring 2014-09-09 18:53:27 +00:00
C. Guy Yarvin
f79aa14786 Better tools for test kernels. 2014-09-06 19:54:25 -07:00
C. Guy Yarvin
d13c0b3ddc Moar test. 2014-09-06 15:43:54 -07:00
C. Guy Yarvin
2840da1066 Simple test pill for memorable. 2014-09-06 14:09:15 -07:00
Anton Dyudin
c6ad315be6 Alphabetica 2014-09-03 00:20:08 -07:00
Anton Dyudin
c2f6bc7d06 Chat repl time 2014-08-28 14:30:02 -07:00
Anton Dyudin
79b8e6aa29 Chat \\ leniency 2014-08-28 12:02:56 -07:00
Anton Dyudin
b2e8cdc593 Reemsymboled :cat, tweaked :poxo 2014-08-18 21:40:11 -07:00
Anton Dyudin
d32d4848b4 more lenient :cat 2014-08-12 23:21:59 -07:00
Anton Dyudin
faf3cbe8b7 :tree is like :ls, but with levels 2014-08-07 14:25:53 -07:00
Anton Dyudin
556b52c907 And by :foal I mean :into 2014-08-07 13:35:31 -07:00
Ubuntu
205276c17e Revert "Minor changes to update..."
This reverts commit de0d03a1921391a17aa27afd15a027615b29a020.
2014-08-06 02:49:07 +00:00
Ubuntu
8736df13c5 fixed chat help bug 2014-08-05 18:35:16 +00:00
Jared Hance
aca0aaf5a6 Minor changes to update... 2014-08-05 11:18:05 -04:00
C. Guy Yarvin
b4b28aa094 Merge branch 'master' of github.com:urbit/urbit 2014-08-02 16:40:49 -07:00
C. Guy Yarvin
d52646f14b Various fixes, renamings, and improvements. 2014-08-02 16:33:22 -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
pcmonk
fe828ce29c chat is working 2014-08-01 16:17:24 -07:00
Jared Hance
4e9d9b44cf Add zapcols 2014-08-01 14:11:46 -04:00
Jared Hance
537e2695ff Merge branch 'master' into klay
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/zuse.hoon
2014-08-01 14:02:51 -04:00
Jared Hance
21034aa855 Various fixes, including timers 2014-08-01 10:54:31 -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
C. Guy Yarvin
46226c3dbf More memory pls. 2014-07-31 13:23:02 -07:00
Anton Dyudin
e43867c6c1 Preliminary doc claim 2014-07-30 16:38:10 -07:00
Jared Hance
c1a4aa7886 Merge branch 'master' into klay
Conflicts:
	urb/urbit.pill
2014-07-30 15:14:38 -04:00
Anton Dyudin
cc9bf52fc8 working* %zuse in chat hax 2014-07-29 18:09:11 -07:00
Anton Dyudin
473944dca1 %zuse in chat hax 2014-07-29 18:05:05 -07:00
Anton Dyudin
15e6734ccb Added :wipe gall %wipe app retcon utility. 2014-07-29 16:45:33 -07:00
Jared Hance
ef94352267 Merge branch 'master' into klay
Conflicts:
	urb/urbit.pill
2014-07-29 13:25:18 -04:00
Jared Hance
dbb5995c9d Trivial fixes 2014-07-28 10:25:07 -04:00
Jared Hance
3a48876a4d Fix referential transparency in %cu 2014-07-25 13:44:06 -04:00
Jared Hance
667ad45403 Semi-working merges. 2014-07-24 15:21:58 -04:00
Jared Hance
fb24594e9e Can boot subs now! 2014-07-24 11:11:40 -04:00
Anton Dyudin
d4cd1cdb47 :update "merge method" clarification 2014-07-23 15:36:10 -07:00
Anton Dyudin
cde3031388 :begin ~ship ~ticket form 2014-07-23 15:15:30 -07:00
C. Guy Yarvin
3378245281 Functional build skeleton. 2014-07-20 20:15:02 -07:00
Jared Hance
3c85c88040 Merge branch 'clay'
Conflicts:
	urb/urbit.pill
2014-07-16 13:56:34 -04:00
pcmonk
0dd086550d add timestamps and textual names for = in chat 2014-07-10 12:01:24 -07:00