Commit Graph

1819 Commits

Author SHA1 Message Date
C. Guy Yarvin
37af5e178e Merge branch 'test' of https://github.com/urbit/urbit into test 2014-11-18 15:45:43 -08:00
Philip C Monk
67c2d52a2b Merge branch 'test' of https://github.com/urbit/urbit into test 2014-11-18 18:12:36 -05:00
Philip C Monk
b39f01d3d5 better no-terminal-yet error message 2014-11-18 18:12:12 -05:00
C. Guy Yarvin
5fc972cf21 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-11-18 10:39:53 -08:00
C. Guy Yarvin
11bd20d271 More calx adjustments. 2014-11-18 02:49:03 -08:00
Philip C Monk
8ced4d7615 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-11-17 18:34:33 -05:00
Philip C Monk
f2029155d0 added chat command line flags 2014-11-17 18:34:20 -05:00
Philip C Monk
662b3369bd Merge branch 'test' of https://github.com/urbit/urbit into test 2014-11-17 16:20:08 -05:00
Philip C Monk
5c78872942 added private messaging in chat 2014-11-17 16:19:51 -05:00
C. Guy Yarvin
bc587f8ba7 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-11-15 18:19:11 -08:00
C. Guy Yarvin
ec493563d3 Various fixes and improvements. 2014-11-15 17:10:15 -08:00
Philip C Monk
1c7998f5a6 added chat CLI except flags and private 2014-11-14 20:32:19 -05:00
Philip C Monk
686531fd42 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-11-11 19:51:06 -05:00
Philip C Monk
7bbcbba1ba empty line doesn't give syntax error 2014-11-11 19:50:49 -05:00
C. Guy Yarvin
0e269e1594 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-11-11 13:50:06 -08:00
C. Guy Yarvin
1f91fe0984 Solve malloc alignment issues. 2014-11-11 13:49:45 -08:00
Galen Wolfe-Pauly
5e360fe226 Merge branch 'test' of github.com:urbit/urbit into test 2014-11-11 11:55:38 -08:00
Galen Wolfe-Pauly
8e42793116 new chat 2014-11-11 11:55:28 -08:00
C. Guy Yarvin
b54934353f Some jael work. 2014-11-08 02:08:29 -08:00
C. Guy Yarvin
ee8e945e7f Merge branch 'test' of https://github.com/urbit/urbit into test 2014-11-07 14:55:15 -08:00
Philip C Monk
f44d1590be fixed gall bug 2014-11-06 20:22:23 -05:00
Philip C Monk
f9f1ef48e4 Merge remote-tracking branch 'origin/test' into dish 2014-11-06 17:09:18 -05:00
Philip C Monk
ea0224bc7e Merge remote-tracking branch 'origin/test' into dish 2014-11-06 17:05:07 -05: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
Philip C Monk
0c1037cbeb various shell/terminal fixes 2014-11-05 15:35:36 -05:00
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
C. Guy Yarvin
5d474f8b49 Merge branch 'test' of https://github.com/urbit/urbit into test
ssary,
2014-11-04 16:41:26 -08: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
Anton Dyudin
a6ae36ee89 XML printer escapes things again 2014-11-04 13:21:51 -08:00
Anton Dyudin
ff277e356e Merge branch 'shell' of https://github.com/urbit/urbit into shell 2014-11-04 12:32:59 -08:00
Anton Dyudin
6f6930e7af URL parser restructure 2014-11-04 12:32:09 -08:00
Philip C Monk
703be48ef3 Merge branch 'test' into shell
Conflicts:
	urb/urbit.pill
2014-11-04 15:30:16 -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
1a290c720c Fix a ++ap bug. 2014-11-04 12:20:44 -08:00
C. Guy Yarvin
ab64c9493f All pointers now eradicated. 2014-11-04 10:39:56 -08:00
C. Guy Yarvin
a5914e6644 Merge branch 'test' of https://github.com/urbit/urbit into test 2014-11-03 15:13:38 -08:00
C. Guy Yarvin
013edce53c Make it boot on linux. 2014-11-03 15:07:46 -08:00
Philip C Monk
b2fb76dbd9 some begin stuff 2014-11-03 16:17:57 -05:00
Anton Dyudin
9de72b30ca Fixed earn not escaping query string 2014-11-03 00:28:58 -08:00
Anton Dyudin
1dd447001b Restructured earn 2014-11-03 00:05:07 -08:00
Anton Dyudin
bb65c8d467 Fixed ++sifo 2014-11-02 23:49:09 -08:00
Anton Dyudin
e3d1cf1d00 Moved old model epic arms to template explanation 2014-11-02 23:30:45 -08:00
Anton Dyudin
ca1aa94523 Removed pre-ford http handling 2014-11-02 23:27:52 -08: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
21b6d4ec43 Various fixes and improvements. 2014-11-01 15:13:18 -07:00
Philip C Monk
f2dea88245 prompting :begin seems to work... 2014-10-31 20:53:11 -04:00
Anton Dyudin
69b63718cb Restructured deft, added /foo/'tape?'/baz path form 2014-10-31 16:45:09 -07:00