6926 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
laerus	4a2ff3aa58	conftest xonsh_builtins teardown	2017-02-27 21:44:58 +02:00
Anthony Scopatz	be9ca2a385	yet another fix	2017-02-27 14:11:39 -05:00
Anthony Scopatz	ae620c2e98	newline test fix	2017-02-27 11:40:02 -05:00
Gil Forsyth	f71e191cd8	only remove attribute if it exists ... Attempt to fix #2264 which only rears its head during history replay (on linux).	2017-02-27 10:55:14 -05:00
Morten Enemark Lund	b5f48cdcee	Merge pull request #2270 from xonsh/jsonutils ... New JSON utils module	2017-02-27 09:53:27 +01:00
Morten Enemark Lund	750ce78b67	Merge pull request #2275 from xonsh/ptkcomp ... Fixed up ptk completer a bit	2017-02-27 09:51:55 +01:00
Morten Enemark Lund	2eb927a0ff	Merge pull request #2274 from xonsh/ao ... Require whitespace for and/or tokens in subproc mode	2017-02-27 09:43:32 +01:00
Morten Enemark Lund	a165563520	Merge pull request #2276 from xonsh/ntenv ... Use nt.environ on windows	2017-02-27 09:40:14 +01:00
Anthony Scopatz	44e6e3c233	minor xp fix	2017-02-27 01:45:50 -05:00
Anthony Scopatz	b3e6a80191	Use nt.environ on windows	2017-02-27 01:35:09 -05:00
Anthony Scopatz	b46020f1d4	fixed up ptk completer a bit	2017-02-27 01:07:24 -05:00
Anthony Scopatz	cefd8d395d	Require whitespace for and/or tokens in subproc mode	2017-02-26 22:42:29 -05:00
Anthony Scopatz	131389a4c4	flake	2017-02-26 22:01:38 -05:00
Anthony Scopatz	b0dce1af1e	fixes and tests for bad globs	2017-02-26 21:54:39 -05:00
Anthony Scopatz	e656a5eb21	Merge branch 'master' into badglob	2017-02-26 20:56:57 -05:00
Hugo Wang	8920cc3d4e	Merge pull request #2260 from xonsh/subshell ... Subshells	2017-02-27 09:22:55 +08:00
Anthony Scopatz	dc551e413a	more fixes	2017-02-26 19:33:08 -05:00
Gil Forsyth	04c991b393	Merge pull request #2266 from xonsh/delcwd ... No longer crash when PWD is removed	2017-02-26 18:45:24 -05:00
Gil Forsyth	a7e5a32e05	Merge pull request #2272 from xonsh/gtt ... Error 25 in give terminal to	2017-02-26 18:32:14 -05:00
Anthony Scopatz	f70a2b67a0	try to replace a god	2017-02-26 18:21:39 -05:00
Anthony Scopatz	f598ffd9ab	Merge branch 'master' into badglob	2017-02-26 18:16:27 -05:00
Anthony Scopatz	43534f9de7	more highlighting fixes	2017-02-26 18:11:17 -05:00
Anthony Scopatz	9b135d1820	Error 25 in give terminal to	2017-02-26 17:50:45 -05:00
Anthony Scopatz	9f9a5cfe79	more subshell fixes	2017-02-26 17:44:06 -05:00
Gil Forsyth	83efd76e4e	Merge pull request #2267 from xonsh/nullsub ... Escape null bytes before Popen	2017-02-26 17:18:21 -05:00
Morten Enemark Lund	ffe08aaaab	Merge pull request #2261 from xonsh/nsredir ... Redirection no longer require a space	2017-02-26 22:49:55 +01:00
Anthony Scopatz	78adcf6882	minor fixes	2017-02-26 16:31:44 -05:00
Anthony Scopatz	02faca09ba	Merge branch 'master' into subshell	2017-02-26 16:20:00 -05:00
Anthony Scopatz	2d850ba766	flake	2017-02-26 15:51:17 -05:00
Anthony Scopatz	11da7fe12a	New JSON utils module	2017-02-26 15:42:36 -05:00
Morten Enemark Lund	f66616a56c	Merge pull request #2268 from xonsh/winuserexp ... Added expand user function for windows	2017-02-26 20:57:14 +01:00
Anthony Scopatz	f6e34eb9a4	Added expand user function for windows	2017-02-26 14:46:11 -05:00
Anthony Scopatz	a96dedc296	Escape null bytes	2017-02-26 13:10:46 -05:00
Anthony Scopatz	4f3910fe32	No longer crash when PWD is removed	2017-02-26 12:49:26 -05:00
Morten Enemark Lund	e572c85532	Merge pull request #2241 from xonsh/zsh ... zsh v5.2 fixes	2017-02-26 17:25:39 +01:00
Morten Enemark Lund	839cd3ee22	Merge pull request #2263 from xonsh/impenc ... Fixed import encodings	2017-02-26 14:45:28 +01:00
Morten Enemark Lund	f544e63699	Merge pull request #2262 from xonsh/ic ... Invalidate code cache whenever the xonsh version changes	2017-02-26 14:32:06 +01:00
Anthony Scopatz	879196a597	fixed import encodings	2017-02-26 01:57:41 -05:00
Anthony Scopatz	727550f9ef	added python version to code cache	2017-02-26 01:27:07 -05:00
Anthony Scopatz	3236f3507f	invalidate code cache whenever the xonshe version changes	2017-02-26 01:07:16 -05:00
Anthony Scopatz	a4de707aff	Merge pull request #2259 from adqm/at_generator ... allow generators and bare tuples in @(...)	2017-02-26 00:23:04 -05:00
Anthony Scopatz	1b2a4a5e52	Redirection no longer require a space	2017-02-25 23:25:42 -05:00
adam j hartz	e2999b8497	some tests	2017-02-25 22:39:10 -05:00
adam j hartz	5536db130a	news entry	2017-02-25 22:01:07 -05:00
adam j hartz	9eaf6ab7ef	scopatz's suggestion	2017-02-25 21:55:47 -05:00
adam j hartz	585c21ddbb	Merge branch 'at_generator' of github.com:adqm/xonsh into at_generator	2017-02-25 21:54:41 -05:00
Anthony Scopatz	4dbbcf56e8	CI fixes	2017-02-25 21:45:32 -05:00
Anthony Scopatz	c2d25d02aa	Merge branch 'master' into subshell	2017-02-25 21:40:13 -05:00
Anthony Scopatz	b7d57b696a	added news	2017-02-25 21:32:47 -05:00
Anthony Scopatz	4b304b1763	fixed replay tests	2017-02-25 21:28:28 -05:00