6680 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	48a39a761c	Merge branch 'welcome'	2017-02-28 00:19:17 -05:00
Anthony Scopatz	d7626affe5	typo fix	2017-02-28 00:18:51 -05:00
Morten Enemark Lund	76fe9e9e3f	Flake	2017-02-27 23:42:16 +01:00
Anthony Scopatz	91fd3065ad	Merge pull request #2278 from xonsh/conftest ... conftest xonsh_builtins teardown	2017-02-27 17:38:37 -05:00
Morten Enemark Lund	41d3fdd683	Change note	2017-02-27 23:31:21 +01:00
Morten Enemark Lund	f12a48ea22	Remove lower line	2017-02-27 23:23:21 +01:00
Morten Enemark Lund	65d6fc140b	Remove taglines with unicode characters.	2017-02-27 23:22:19 +01:00
Morten Enemark Lund	21eaf68027	Add news entry	2017-02-27 23:20:08 +01:00
Morten Enemark Lund	52cd1c406e	Add welcome screen and xonfig option to launch tutorial	2017-02-27 23:16:05 +01:00
Anthony Scopatz	0973539c5c	Merge pull request #2277 from xonsh/fix_history_replay ... only remove attribute if it exists	2017-02-27 15:29:46 -05:00
laerus	4a2ff3aa58	conftest xonsh_builtins teardown	2017-02-27 21:44:58 +02: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
Hugo Wang	8920cc3d4e	Merge pull request #2260 from xonsh/subshell ... Subshells	2017-02-27 09:22:55 +08: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	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