834 commits

Author	SHA1	Message	Date
Morten Enemark Lund	fbe39de926	Merge pull request #2273 from xonsh/badglob ... Bad globs	2017-02-28 08:59:01 +01:00
Morten Enemark Lund	0c119f3fa1	Merge pull request #2256 from xonsh/partial ... Partial proxy partial friendly	2017-02-28 08:55:33 +01:00
Anthony Scopatz	13d507e4f8	fixed conflicts	2017-02-27 21:14:41 -05:00
Morten Enemark Lund	21eaf68027	Add news entry	2017-02-27 23:20:08 +01: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
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	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
Anthony Scopatz	f598ffd9ab	Merge branch 'master' into badglob	2017-02-26 18:16:27 -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	02faca09ba	Merge branch 'master' into subshell	2017-02-26 16:20:00 -05:00
Anthony Scopatz	11da7fe12a	New JSON utils module	2017-02-26 15:42:36 -05: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
Anthony Scopatz	879196a597	fixed import encodings	2017-02-26 01:57:41 -05:00
Anthony Scopatz	3236f3507f	invalidate code cache whenever the xonshe version changes	2017-02-26 01:07:16 -05:00
Anthony Scopatz	1b2a4a5e52	Redirection no longer require a space	2017-02-25 23:25:42 -05:00
adam j hartz	5536db130a	news entry	2017-02-25 22:01:07 -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
Gil Forsyth	1a209547b8	Merge pull request #2250 from xonsh/rediral ... Enable alias redirections	2017-02-25 20:19:31 -05:00
Anthony Scopatz	6cbbcb75ed	unthreadable xontrib command	2017-02-25 14:51:47 -05:00
Morten Enemark Lund	f85a0c2ec1	Merge pull request #2255 from xonsh/extargs ... Added extra_args to foreign shell aliases	2017-02-25 20:30:44 +01:00
Anthony Scopatz	5e53bb01cc	partial proxy partial friendly	2017-02-25 14:30:32 -05:00
Morten Enemark Lund	1c59eb18e2	Merge pull request #2247 from xonsh/ji ... print jobs when interactive	2017-02-25 20:20:59 +01:00
Anthony Scopatz	c7bc1784e4	added extra_args to foreihn shell aliases	2017-02-25 13:39:10 -05:00
Anthony Scopatz	a116eff72b	fixed merge conflicts	2017-02-25 12:04:54 -05:00
Morten Enemark Lund	b8d348f951	Pep8 and spelling fixes	2017-02-25 16:37:25 +01:00
Morten Enemark Lund	9baef96584	Add PTK feature to new entry	2017-02-25 16:23:41 +01:00
Morten Enemark Lund	29acafaa17	Add news entry	2017-02-25 13:37:46 +01:00
Morten Enemark Lund	8588725912	Merge pull request #2249 from xonsh/argp ... Catch system exits	2017-02-25 12:13:46 +01:00
Anthony Scopatz	2c5f13ef27	Enable alias redirections	2017-02-25 01:50:23 -05:00
Anthony Scopatz	45b9b2c8b5	news	2017-02-25 01:07:58 -05:00
Anthony Scopatz	230a61193c	Fixed del (x, y)	2017-02-25 00:50:56 -05:00
Anthony Scopatz	010f665e34	yup	2017-02-25 00:18:50 -05:00
Anthony Scopatz	f4112cf0b1	some more qtoue fixes	2017-02-24 23:55:12 -05:00
Anthony Scopatz	80211c04e5	Merge branch 'feat/resolve_symlinks' of https://github.com/StreakyCobra/xonsh into StreakyCobra-feat/resolve_symlinks	2017-02-24 01:00:53 -05:00
Anthony Scopatz	3d637bb186	zsh v5.2 fixes	2017-02-24 00:50:43 -05:00
Hugo Wang	165ab29d40	flag nvim as unthreadable	2017-02-24 10:50:55 +08:00