Commit graph

3163 commits

Author SHA1 Message Date
Guillaume Leclerc
d41cd28ec2 Merge remote-tracking branch 'origin/master' into fix-895 2016-05-23 09:03:41 +02:00
adam j hartz
044b96f24a fixes for ioredirect lexing 2016-05-23 03:00:23 -04:00
Morten Enemark Lund
f153865cc2 Merge pull request #974 from scopatz/strstore
added store_as_str to vardocs
2016-05-23 08:58:50 +02:00
Morten Enemark Lund
54faaad6fc Fix tests on windows. 2016-05-23 08:42:09 +02:00
adam j hartz
cafc5ffe4a huge lexer overhaul. still some bugs... 2016-05-23 02:41:30 -04:00
Anthony Scopatz
a6cba35ae8 Merge pull request #988 from scopatz/win_bash_completion
Win bash completion
2016-05-23 02:22:51 -04:00
Morten Enemark Lund
c506bd8e8c Fix missing end bracket 2016-05-23 08:09:16 +02:00
Morten Enemark Lund
ee082a614e Update CHANGELOG.rst 2016-05-23 08:09:15 +02:00
Morten Enemark Lund
a95eebd19e Fix bash completion on windows when completion files have spaces in their names. 2016-05-23 08:09:15 +02:00
adam j hartz
052950db06 remove debugging variable change 2016-05-23 01:15:02 -04:00
adam j hartz
60ad616344 consolidate tokenizers into a single file 2016-05-23 01:13:20 -04:00
Anthony Scopatz
da8299b3b4 added changelog about kernel 2016-05-23 00:01:27 -04:00
Anthony Scopatz
7360fe154d Merge branch 'jinst' 2016-05-22 23:59:38 -04:00
Anthony Scopatz
a0f29f0403 Merge branch 'mwiebe-bat_text' 2016-05-22 23:57:29 -04:00
Anthony Scopatz
5b88f2b098 Merge pull request #991 from adqm/fix_command_cache
fix for command cache
2016-05-22 23:47:03 -04:00
Mark Wiebe
22ae563144 The .json files which are lazyjson should have LF line endings 2016-05-22 20:11:51 -07:00
Mark Wiebe
9e49901245 Add explicit extension ->text/binary mapping in .gitattributes 2016-05-22 18:40:52 -07:00
adam j hartz
2b40a6907c still prevent adding directories to cache 2016-05-22 21:16:40 -04:00
adam j hartz
c4c103714b fix for command cache 2016-05-22 21:09:05 -04:00
Anthony Scopatz
b765e641d9 install hook improvements 2016-05-22 17:51:42 -04:00
Anthony Scopatz
5a26e391d9 Merge pull request #986 from gforsyth/deprecate_early_ptk
remove prompt_toolkit < v1.0.0 support
2016-05-22 13:09:33 -04:00
Anthony Scopatz
b1909e44d3 Merge pull request #987 from adqm/better_completion_quoting
(slightly) better string quoting for windows completion
2016-05-22 13:02:30 -04:00
adam j hartz
697a7eb1b8 slightly better string quoting for windows completion 2016-05-22 11:39:36 -04:00
Gil Forsyth
ae479ce2eb remove prompt_toolkit < v1.0.0 support
As per #980 this removes all of the cased code for dealing with various
versions of prompt_toolkit in favor of supporting only v1.0.0+
2016-05-22 10:11:46 -04:00
Anthony Scopatz
68026b2112 Merge pull request #982 from adqm/atdollar_docs
Slightly more substantial tutorial entry for @$
2016-05-21 22:37:00 -04:00
adam j hartz
af0eb74b6b slightly more substantial tutorial entry for @$ 2016-05-21 22:29:48 -04:00
Anthony Scopatz
5e16e413c1 Merge pull request #979 from adqm/be_a_better_listener
Respect decisions made about SHELL_TYPE in rc files
2016-05-21 22:05:04 -04:00
adam j hartz
93cd4e4e43 respect decisions made about SHELL_TYPE in rc files 2016-05-21 21:53:26 -04:00
Anthony Scopatz
6b90b11bd8 Merge pull request #970 from Carreau/__main__
Allow python -m xonsh
2016-05-21 15:19:32 -04:00
Anthony Scopatz
362a098d84 added store_as_str to vardocs 2016-05-21 15:03:27 -04:00
Matthias Bussonnier
ef72317693 Allow python -m xonsh
It seams more pythonistic than `python -m xonsh.main`
2016-05-21 11:44:28 -07:00
Anthony Scopatz
088b17f4e5 Merge branch 'adqm-jobs' 2016-05-21 13:59:23 -04:00
adam j hartz
76a74c5422 switch back from integers to strings 2016-05-21 13:54:02 -04:00
adam j hartz
35677ee6e2 changelog 2016-05-21 13:51:48 -04:00
adam j hartz
6a88d66f53 actually fix the parsing bug 2016-05-21 13:51:48 -04:00
adam j hartz
69fe66d723 windows job control fixes 2016-05-21 13:51:48 -04:00
adam j hartz
235b026441 allow jobs to be started in the background again 2016-05-21 13:51:48 -04:00
adam j hartz
017c91ac8d windows job fixes 2016-05-21 13:51:48 -04:00
adam j hartz
bf48aeaab3 bring back current job name in title bar 2016-05-21 13:51:48 -04:00
adam j hartz
3eaa8e4358 windows job control, slight refactor 2016-05-21 13:51:48 -04:00
adam j hartz
be76d17104 several small pep8 changes 2016-05-21 13:51:48 -04:00
Guillaume Leclerc
3cf679b7dd fix job control on complex tasks 2016-05-21 13:51:48 -04:00
Guillaume Leclerc
aac758fcb3 fix vim and others 2016-05-21 13:51:47 -04:00
Guillaume Leclerc
da87db120a remove useless field 2016-05-21 13:51:47 -04:00
Guillaume Leclerc
6db71b929d huge refactor and flow simplification, fixes bg command, linux only 2016-05-21 13:51:47 -04:00
Guillaume Leclerc
c3dc22b28f fix job and strange behavior (some tasks were spawned with no reason) 2016-05-21 13:51:47 -04:00
Guillaume Leclerc
8a45ffb9e9 fix #855 2016-05-21 13:51:47 -04:00
Morten Enemark Lund
8ac0033174 Merge pull request #926 from adqm/syntax
Proposal: Syntax Changes (from #921)
2016-05-21 17:07:34 +02:00
adam j hartz
1128615250 syntax highlighting for new operator 2016-05-21 10:29:44 -04:00
adam j hartz
c260eafc11 changelog update 2016-05-21 10:29:44 -04:00