312 commits

Author	SHA1	Message	Date
Anthony Scopatz	bdca28c91d	docs for with!	2016-08-31 01:31:45 -04:00
Konstantinos Tsakiltzidis	9754098e42	Merge pull request #1644 from xonsh/msub ... Subprocess Macros	2016-08-31 04:00:07 +03:00
Anthony Scopatz	914d6038ec	Merge pull request #1643 from xonsh/better_ptk_completion_display ... Better ptk completion display	2016-08-29 23:10:31 -04:00
Konstantinos Tsakiltzidis	0b27499490	Merge pull request #1386 from xonsh/test_xsh ... Collecting `test*.xsh` files when testing	2016-08-30 03:01:36 +03:00
Anthony Scopatz	c147feb884	Merge pull request #1640 from laerus/hist ... History indexing API	2016-08-29 19:38:11 -04:00
Anthony Scopatz	3f5882d63d	Merge branch 'master' into msub	2016-08-29 12:17:18 -04:00
laerus	1b948bdb76	Merge branch 'master' of https://github.com/xonsh/xonsh into hist	2016-08-29 16:52:36 +03:00
laerus	40dcc4d7d5	news fix	2016-08-29 16:38:29 +03:00
laerus	70b802da33	linux guide update	2016-08-29 15:56:43 +03:00
laerus	500963ae8b	get_portions	2016-08-29 13:42:40 +03:00
Morten Enemark Lund	06ea1dac73	Update changelog	2016-08-29 08:48:28 +02:00
Morten Enemark Lund	eb79dd119a	Added a changelog entry	2016-08-29 08:47:56 +02:00
laerus	494e0dc81f	Merge branch 'master' of https://github.com/xonsh/xonsh into hist	2016-08-28 18:22:12 +03:00
Romain Bignon	ddfa4e1e59	add changelog	2016-08-28 16:24:43 +02:00
Anthony Scopatz	a884eec931	Merge branch 'm' into msub	2016-08-28 09:30:32 -04:00
Anthony Scopatz	2be49eab81	Merge branch 'master' into m	2016-08-28 09:30:09 -04:00
Anthony Scopatz	68476835b8	Merge pull request #1641 from astronouth7303/events-docs ... [WIP] Events Documentation	2016-08-28 09:26:42 -04:00
laerus	628f353e37	Merge branch 'master' into hist	2016-08-28 15:41:08 +03:00
Gil Forsyth	0223905752	fix news entry	2016-08-27 21:32:09 -04:00
Anthony Scopatz	4dda6d3fce	fixed more test conflicts	2016-08-27 21:15:10 -04:00
Anthony Scopatz	0f70303624	fixed conflicts with tests	2016-08-27 21:13:57 -04:00
Anthony Scopatz	5e68e536e8	Merge pull request #1592 from xonsh/more_syntax_errors ... Handle More Syntax Errors	2016-08-27 21:11:58 -04:00
Anthony Scopatz	d30bcf97ce	a few more	2016-08-27 20:02:45 -04:00
Gil Forsyth	fdddaba884	add news entry	2016-08-27 17:24:21 -04:00
Jamie Bliss	866725dd2b	Speculative url	2016-08-27 11:24:43 -04:00
Jamie Bliss	6990d29ba5	Basic events newsitem	2016-08-27 11:13:56 -04:00
laerus	e7540488f7	history magic	2016-08-27 17:30:53 +03:00
Anthony Scopatz	a78ada5c3f	fixed merge conflicts	2016-08-27 10:19:42 -04:00
Anthony Scopatz	e0c8ecbc42	Merge pull request #1636 from laerus/dfile ... xonsh module __file__ attribute	2016-08-27 08:28:10 -04:00
Anthony Scopatz	ace8a2b57e	Merge branch 'master' into m	2016-08-26 21:30:05 -04:00
laerus	3bf460687a	__file__	2016-08-27 03:01:18 +03:00
BlahGeek	6604464465	Merge branch 'master' into add-completion-confirm	2016-08-26 13:21:09 +08:00
BlahGeek	fbe2f1c60f	rename COMPLETION_CONFIRM -> COMPLETIONS_CONFIRM	2016-08-25 22:24:43 +08:00
Anthony Scopatz	6e4b438ff8	Merge branch 'master' into tilde	2016-08-25 09:26:25 -04:00
Anthony Scopatz	50e2f80e10	more tilde expansions	2016-08-25 01:04:08 -04:00
Anthony Scopatz	9a958f2eba	more expand vars	2016-08-25 00:35:02 -04:00
BlahGeek	9e5b88657e	Merge branch 'master' into add-completion-confirm	2016-08-25 12:02:10 +08:00
Anthony Scopatz	fa76a979e7	Merge branch 'master' into m	2016-08-24 23:57:23 -04:00
Anthony Scopatz	e60defd2ec	Merge pull request #1611 from xonsh/no_completion_brackets ... Option to turn off completion brackets	2016-08-24 23:50:41 -04:00
Gil Forsyth	ae8f800f16	Merge pull request #1602 from blahgeek/fix-bash-completion ... New implementation of bash completer	2016-08-24 07:49:38 -04:00
BlahGeek	e5c913ac42	add changelog	2016-08-24 10:27:20 +08:00
laerus	783eef7eb7	news entry	2016-08-24 04:21:52 +03:00
Gil Forsyth	2f96365257	add changelog	2016-08-23 12:48:27 -04:00
BlahGeek	188fee34dd	rewrite bash completer	2016-08-23 22:04:43 +08:00
Gil Forsyth	5c8f0354fa	Merge branch 'master' into allnames	2016-08-23 08:46:25 -04:00
Anthony Scopatz	7373893db1	Merge pull request #1599 from blahgeek/fix-bare-tuple-of-tuples ... fix parsing for bare tuple of tuples	2016-08-22 06:25:39 -04:00
BlahGeek	10093a9f86	add changelog	2016-08-22 10:00:11 +08:00
Bob Hyman	69f6163236	track change in real working directory, keep n:\devwork\work\xonsh in sync.	2016-08-21 21:32:19 -04:00
Bob Hyman	f30f58d019	Merge branch 'misc_fix' into track_wd	2016-08-21 21:30:52 -04:00
Gil Forsyth	fbe61006f7	Merge pull request #1603 from xonsh/syncp ... yacc_debug loads parser on same thread.	2016-08-21 18:31:55 -04:00