Commit Graph

89 Commits

Author SHA1 Message Date
Philip C Monk
31d3788115 Merge remote-tracking branch 'origin/master' into typedclay
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/eyre.hoon
	urb/zod/arvo/hoon.hoon
	urb/zod/arvo/zuse.hoon
	urb/zod/main/app/poke/core.hook
	urb/zod/main/app/reboot/core.hook
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/tree/core.hook
2015-03-05 18:27:07 -05:00
Philip C Monk
0e024a009f move along, nothing to see here 2015-02-27 01:35:41 -05:00
Galen Wolfe-Pauly
261fcc9029 better snips 2015-02-17 12:53:06 -08:00
Galen Wolfe-Pauly
886a91c15f need the psal garb 2015-02-04 17:23:47 -08:00
Galen Wolfe-Pauly
dde694b535 snips 2015-02-04 14:59:15 -08:00
Galen Wolfe-Pauly
b796b9d8e0 class -> className 2015-02-03 13:01:24 -08:00
Galen Wolfe-Pauly
1fee5836ee react mar 2015-01-30 18:02:40 -08:00
Galen Wolfe-Pauly
26d26af927 react door 2015-01-29 17:50:35 -08:00
C. Guy Yarvin
8c0e89949b Stage down to 163. 2015-01-26 16:25:27 -08:00
C. Guy Yarvin
335cb42764 Fix bad merge. 2015-01-26 09:44:09 -08:00
Anton Dyudin
c9caa1538e Merge branch 'exec' into test
Conflicts:
	urb/zod/main/app/shell/core.hook
	urb/zod/main/app/terminal/core.hook
2015-01-25 21:29:21 -08:00
C. Guy Yarvin
920754ad61 Various fixes and improvements. 2015-01-25 17:38:03 -08:00
C. Guy Yarvin
dac4ea96db Merge branch 'test' of https://github.com/urbit/urbit into test
Conflicts:
	urb/urbit.pill
2015-01-22 14:01:39 -08:00
C. Guy Yarvin
f552051f4c Initial commit to test branch, with de-flopped gall. 2015-01-16 10:31:43 -08:00
C. Guy Yarvin
a76eb4f661 Merge branch 'radio'
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
	urb/zod/main/app/talk/core.hook
2015-01-15 12:02:28 -08:00
C. Guy Yarvin
22ef9e18b2 Add old radio back into radio branch. 2015-01-15 11:39:22 -08:00
C. Guy Yarvin
6dfd825b9c Rename radio to rodeo. 2015-01-15 11:32:04 -08:00
Anton Dyudin
43e866939a Printing improvements 2015-01-13 21:38:39 -08:00
Anton Dyudin
9f17771a5d Added .^ %fx 2015-01-07 17:49:57 -08:00
C. Guy Yarvin
23dd79c52c Refactor ++hy. 2015-01-06 12:31:36 -08:00
C. Guy Yarvin
4917dc9e59 Basic radio service now active. 2015-01-05 15:59:57 -08:00
Philip C Monk
83c8d0c278 Merge branch 'radio' of https://github.com/urbit/urbit into radio 2014-12-17 15:38:38 -05:00
Philip C Monk
3eff4d6c2c spam back terminal input 2014-12-17 15:38:23 -05:00
C. Guy Yarvin
2f6449503a Various fixes and improvements. 2014-12-17 10:05:38 -08:00
C. Guy Yarvin
197a79f626 Merge branch 'radio' of https://github.com/urbit/urbit into radio
Conflicts:
	urb/zod/main/mar/radio-report/door.hook
2014-12-16 16:12:06 -08:00
Anton Dyudin
8b386c5711 radio-report comment 2014-12-16 16:03:08 -08:00
C. Guy Yarvin
a7ff16b0b9 Intermediate commit. 2014-12-16 15:46:12 -08:00
Philip C Monk
7e85ae5acc fix sending to twitter 2014-12-11 20:09:59 -05:00
C. Guy Yarvin
6db859f940 Merge branch 'master' into radio 2014-12-10 10:44:07 -08:00
Anton Dyudin
b057258711 Fixed markdown spin 2014-12-09 18:25:47 -08:00
Galen Wolfe-Pauly
0d4a17b411 various fixes and improvements 2014-12-09 18:15:22 -08:00
Galen Wolfe-Pauly
54f5124a1c radio testing 2014-12-09 15:11:30 -08:00
Anton Dyudin
c63674d983 defuture entity grab 2014-12-09 12:33:50 -08:00
Anton Dyudin
5722fe448f Moved sanitization logic to ++normalize 2014-12-08 19:16:00 -08:00
Anton Dyudin
2e8873942a Split mar/down, installed jet hoon-spec 2014-12-08 15:44:20 -08:00
Anton Dyudin
3796d56de7 Moved entity parser to %zuse, cleanup 2014-12-08 14:51:27 -08:00
Anton Dyudin
e34c5317fa Fixed tape !over 2014-12-08 10:41:46 -08:00
Anton Dyudin
e9b6ebae2b report grow:json compiles 2014-12-06 00:12:52 -08:00
Philip C Monk
dfd63c7745 remove markdown printfs 2014-12-05 20:46:52 -05:00
Anton Dyudin
08cda0da1f radio-command/mar json grabbed 2014-12-05 17:18:31 -08:00
Philip C Monk
1ba2800be1 clear terminal backlog in ++prep 2014-12-05 16:09:46 -05:00
Galen Wolfe-Pauly
d70067b090 text/json 2014-12-01 14:38:08 -08:00
Philip C Monk
97a6b0984b :begin takes ship name 2014-11-24 14:53:31 -05:00
Philip C Monk
46c9be6528 give feedback for whether :begin works 2014-11-20 21:17:05 -05:00
Philip C Monk
5c78872942 added private messaging in chat 2014-11-17 16:19:51 -05:00
Galen Wolfe-Pauly
8e42793116 new chat 2014-11-11 11:55:28 -08:00
Philip C Monk
ace87f20f4 Merge remote-tracking branch 'origin/test' into dish
Conflicts:
	i/v/vere.h
2014-11-06 17:04:57 -05:00
Philip C Monk
55fa6d0408 added different password prompt mode 2014-11-05 17:40:18 -05:00
Galen Wolfe-Pauly
0b3a503b75 :~ to ;~ 2014-11-04 16:25:06 -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