mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-04 00:14:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
10853 commits 40 branches 136 tags 39 MiB
Commit graph

2283 commits

Author SHA1 Message Date
JohnLunzer
426b1ffec4 Merged with master. Alphabetized xonsh.tools import in test_tools.py 2016-06-17 13:25:36 -04:00
JohnLunzer
1ba3b50090 Updated documenation and changed to direct imports 2016-06-17 12:55:42 -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
JohnLunzer
36f3ec6955 Merge xonsh master. Make hopefully final changes. 2016-06-17 10:11:59 -04:00
Gil Forsyth
4c51daf04e Merge pull request #1249 from xonsh/sort_comp 
Better sorting of completions.
 2016-06-17 09:44:44 -04:00
Morten Enemark Lund
c703315f36 Add changelog entry 2016-06-17 12:51:59 +02:00
VHarisop
733c9bc25b
Added news entry, fixed conflict with master 2016-06-17 12:33:18 +03: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
706f2b60cc fixed merge conflict 2016-06-16 22:59:27 -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
Morten Enemark Lund
9d7e8329c1 Add changelog 2016-06-16 22:37:45 +02:00
Anthony Scopatz
8b3a09be8a updated docs 2016-06-16 12:57:21 -04:00
adam j hartz
2adddd6ea4 changelog 2016-06-16 00:59:58 -04:00
Gil Forsyth
ce4cc0b9ad Merge pull request #1212 from xonsh/rmbash 
Remove Bash from Default Foreign Shells
 2016-06-15 23:57:30 -04:00
Gil Forsyth
ffff589f76 point xonfig wizard to hidden docs attribute 2016-06-15 14:08:28 -04:00
Anthony Scopatz
916dc2a6d4 Merge pull request #1230 from xonsh/source_cmd_prompt 
Source cmd prompt
 2016-06-15 11:52:06 -04:00
Anthony Scopatz
3d239b134a Merge pull request #1239 from xonsh/vi_mode_change 
enable character selection in vi_mode
 2016-06-15 11:35:29 -04:00
Gil Forsyth
06ec4cbd46 enable character selection in vi_mode 
When `open_in_editor` is enabled, the `VI_MODE` binding to open the
editor is `v`, which is unexpected, as `v` should be character
selection.

The `open_in_editor` option has been disabled, but the `Ctrl-X Ctrl-E`
shortcut to open the current buffer in an editor has been explicitly
enabled, so there shouldn't be any change of behavior for anyone except
those who were using `v` to open an editor in `VI_MODE` (which I think
is no one).
 2016-06-15 07:20:43 -04:00
Morten Enemark Lund
67fd98b366 Add change log entry 2016-06-14 20:33:09 +02:00
Morten Enemark Lund
54d3c19e97 Added changelog entry 2016-06-14 19:54:55 +02:00
adam j hartz
f6bd27252b Merge branch 'master' into pipe 2016-06-13 23:51:58 -04:00
adam j hartz
a73f614992 changelog 2016-06-13 23:49:48 -04:00
Morten Enemark Lund
9ce59a8795 Add changelog entry 2016-06-13 16:32:27 +02:00
adam j hartz
213768a3c9 Merge pull request #1216 from pgoelz/master 
Do not throw an exception on 'completer list' if a completer has no docstring
 2016-06-12 18:46:35 -04:00
Paul Goelz
94abe59a5a Add changelog. 2016-06-13 00:37:14 +02:00
Morten Enemark Lund
af50d8c2ec Added change log entry 2016-06-12 23:32:57 +02:00
Anthony Scopatz
3aa3a21eef Merge branch 'master' into rmbash 2016-06-11 22:47:16 -04:00
Anthony Scopatz
0ee3c98c05 bash removal 2016-06-11 22:46:14 -04:00
Anthony Scopatz
b25b057b28 Merge pull request #1210 from cryzed/clean-up-premain 
Clean up argument parsing in premain by removing undo_args hack
 2016-06-11 21:29:52 -04:00
cryzed
433822d7fa Add changelog news file 2016-06-12 03:18:14 +02:00
adam j hartz
fdc73acfa7 merge from master 2016-06-11 21:08:32 -04:00
Anthony Scopatz
8a92da66b1 some prep movements 2016-06-11 16:11:26 -04:00