Commit graph

3660 commits

Author SHA1 Message Date
Anthony Scopatz
1fad151450 more unicode amalgamate fixes 2016-06-17 16:05:46 -04:00
Morten Enemark Lund
4a85511ae8 Merge pull request #1264 from xonsh/xonfig
xonfig updates
2016-06-17 20:55:05 +02:00
Anthony Scopatz
72bb179155 Merge branch 'JohnLunzer-history-all' 2016-06-17 13:52:15 -04:00
Anthony Scopatz
3dc6703e45 some hist doc changes 2016-06-17 13:52:05 -04:00
Anthony Scopatz
292a922af7 Merge branch 'history-all' of https://github.com/JohnLunzer/xonsh into JohnLunzer-history-all 2016-06-17 13:44:57 -04:00
JohnLunzer
426b1ffec4 Merged with master. Alphabetized xonsh.tools import in test_tools.py 2016-06-17 13:25:36 -04:00
adam j hartz
5ff89d4f60 Merge pull request #1266 from xonsh/exit
fix for xonsh exit
2016-06-17 13:10:25 -04:00
JohnLunzer
1ba3b50090 Updated documenation and changed to direct imports 2016-06-17 12:55:42 -04:00
Anthony Scopatz
fb4ea40816 fixed name 2016-06-17 12:47:25 -04:00
Anthony Scopatz
1aff84a86b fix for xonsh exit 2016-06-17 12:37:55 -04:00
Gil Forsyth
ffd69861ca Merge pull request #1265 from xonsh/nu
removed unicode from platform
2016-06-17 12:18:34 -04:00
Anthony Scopatz
25382df2b8 removed unicode from platform 2016-06-17 12:00:30 -04:00
Gil Forsyth
08db3e7b70 Merge pull request #1255 from laerus/moar-docs-i1118
more information about library dependencies
2016-06-17 11:39:36 -04:00
Anthony Scopatz
a4359e1377 Merge branch 'master' of github.com:scopatz/xonsh 2016-06-17 11:37:30 -04:00
Anthony Scopatz
7a1f931745 Merge branch 'VHarisop-path_expand' 2016-06-17 11:37:21 -04:00
Anthony Scopatz
f3095f698f Merge branch 'path_expand' of https://github.com/VHarisop/xonsh into VHarisop-path_expand 2016-06-17 11:35:57 -04:00
Anthony Scopatz
ee033b6216 Merge pull request #1258 from DangerOnTheRanger/patch-1
add xonsh-apt-tabcomplete to xontribs.json
2016-06-17 11:18:40 -04:00
Konstantinos Tsakiltzidis
0332a22d13 prompt_toolkit requires pygments 2016-06-17 18:17:17 +03:00
Anthony Scopatz
da136fd549 xonfig updates 2016-06-17 11:15:08 -04:00
JohnLunzer
2d7274e01b Fixed silly whitespace issue 2016-06-17 10:15:52 -04:00
JohnLunzer
36f3ec6955 Merge xonsh master. Make hopefully final changes. 2016-06-17 10:11:59 -04:00
laerus
a0fe8cac86 'more info' 2016-06-17 16:57:43 +03:00
Kermit Alexander II
58832bbaab add xonsh-apt-tabcomplete to xontribs.json 2016-06-17 08:47:18 -05:00
Gil Forsyth
4c51daf04e Merge pull request #1249 from xonsh/sort_comp
Better sorting of completions.
2016-06-17 09:44:44 -04:00
Gil Forsyth
81530ef57c Merge pull request #1244 from xonsh/quoted_path_completions
Fix missing completions
2016-06-17 09:13:30 -04:00
Morten Enemark Lund
8034cf4cba Merge pull request #1254 from laerus/bash-to-xhs-doc
'updates instructions in bash_to_xsh.rst'
2016-06-17 15:07:55 +02:00
laerus
c38e35978c 'more information about library dependencies' 2016-06-17 15:53:41 +03:00
Morten Enemark Lund
b7d1c57add Final updates 2016-06-17 14:24:05 +02:00
Morten Enemark Lund
d458eb1a9a Also apply filtfunc to stuff we add after the quoting 2016-06-17 14:03:21 +02:00
laerus
840815c806 Merge branch 'master' into bash-to-xhs-doc 2016-06-17 14:30:11 +03:00
laerus
4336b01d10 'updates instruction about the retrieval of the return code of last command' 2016-06-17 14:08:58 +03:00
Morten Enemark Lund
0597c97d12 Changed to a much simpler solution where it isdir() is run before quoting the paths names. 2016-06-17 12:52:00 +02:00
Morten Enemark Lund
cec182f8f0 Fix wrong group reference 2016-06-17 12:51:59 +02:00
Morten Enemark Lund
14d818b3c5 Support triple quotes. RegEx craziness. 2016-06-17 12:51:59 +02:00
Morten Enemark Lund
c703315f36 Add changelog entry 2016-06-17 12:51:59 +02:00
Morten Enemark Lund
70acb5d793 Use regex expression to find unquoted version of the strings. 2016-06-17 12:51:58 +02:00
Morten Enemark Lund
e28968e90b Fixed quoted paths not being recognized as directories 2016-06-17 12:51:58 +02:00
VHarisop
733c9bc25b
Added news entry, fixed conflict with master 2016-06-17 12:33:18 +03:00
Morten Enemark Lund
ce79bb7ad3 Merge pull request #1220 from xonsh/amal
Amalgamate Source
2016-06-17 10:21:02 +02:00
Anthony Scopatz
58374309bc Merge branch 'master' into amal 2016-06-17 00:28:33 -04:00
Anthony Scopatz
af1f01ce92 Merge pull request #1226 from adqm/pipe
Fix for pipeline issues
2016-06-17 00:27:47 -04:00
Anthony Scopatz
7a1e07c487 made regex lazy 2016-06-16 23:06:06 -04:00
Anthony Scopatz
706f2b60cc fixed merge conflict 2016-06-16 22:59:27 -04:00
Anthony Scopatz
1d3f68523e Merge branch 'adqm-more_search' 2016-06-16 22:52:50 -04:00
Anthony Scopatz
f37514f4a7 Merge branch 'more_search' of https://github.com/adqm/xonsh into adqm-more_search 2016-06-16 22:51:27 -04:00
Anthony Scopatz
9796518163 some more minor fixes 2016-06-16 21:41:46 -04:00
Anthony Scopatz
1fc3a2efa2 more env 2016-06-16 21:21:57 -04:00
Anthony Scopatz
5fd1d4f4a8 tracer and docs 2016-06-16 20:58:53 -04:00
Anthony Scopatz
4948b51a84 feedback 2016-06-16 20:20:10 -04:00
Morten Enemark Lund
9d7e8329c1 Add changelog 2016-06-16 22:37:45 +02:00