Commit graph

2225 commits

Author SHA1 Message Date
Anthony Scopatz
88b57b3198 Merge pull request #1316 from pgoelz/sortglob
Sort results from globbing expressions
2016-06-28 16:43:55 -04:00
Paul Goelz
ad51990b2b Realize many of scopatz' suggestions 2016-06-28 20:36:17 +02:00
Anthony Scopatz
c63e4191fa Merge branch 'master' into bgmod 2016-06-27 23:32:46 -04:00
Anthony Scopatz
3cf47dfa7d fixed checkout issue 2016-06-27 23:31:15 -04:00
Hugo Wang
d86166acf1 update words 2016-06-28 11:24:23 +08:00
Hugo Wang
52e7aaf1b3 typo 2016-06-28 11:22:22 +08:00
Hugo Wang
8e77be6cb8 added news file 2016-06-28 11:20:08 +08:00
Anthony Scopatz
4dffde658f rm mod 2016-06-27 23:02:27 -04:00
Anthony Scopatz
b49a6934b0 path fix 2016-06-27 21:03:44 -04:00
Anthony Scopatz
4a2d927744 news 2016-06-27 20:55:27 -04:00
Paul Goelz
3cf38a7f65 Merge branch 'master' of https://github.com/xonsh/xonsh into sortglob 2016-06-26 22:15:03 +02:00
Anthony Scopatz
caea29cba6 pkg news 2016-06-26 14:47:27 -04:00
Anthony Scopatz
115a095647 version bump to 0.4.2 2016-06-26 12:25:14 -04:00
Gil Forsyth
5847a1166b Merge pull request #1345 from xonsh/mani
Script Manifest
2016-06-26 12:19:56 -04:00
Anthony Scopatz
47f8fbe47a manifest nest 2016-06-26 11:59:15 -04:00
Gil Forsyth
ebb21fc9c4 add changelog and remove spurious MANIFEST entry 2016-06-26 10:07:12 -04:00
Anthony Scopatz
ce3d21e21d Merge branch 'dont_select_first' 2016-06-25 18:25:57 -04:00
Gil Forsyth
8febf51c26 add changelog and note about forked code 2016-06-25 14:01:53 -04:00
Anthony Scopatz
e97d02db16 fixed conflict 2016-06-25 12:34:55 -04:00
Anthony Scopatz
c6f573f11b version bump to 0.4.1 2016-06-24 17:40:40 -04:00
Anthony Scopatz
57f362ab17 amalgamate fix 2016-06-24 16:35:11 -04:00
Anthony Scopatz
03bda46acd version bump to 0.4.0 2016-06-24 14:23:19 -04:00
Gil Forsyth
6d98baa7d0 Merge branch 'master' into pytest_port 2016-06-23 15:52:53 -04:00
Gil Forsyth
58c34f2395 add changelog 2016-06-23 15:49:58 -04:00
Anthony Scopatz
9603611851 Merge pull request #1277 from laerus/xonsh-argument-fix-i1073
complain on invalid cli arguments
2016-06-23 12:25:37 -04:00
Paul Goelz
d6f48fc877 Add change log for sortglob. 2016-06-22 23:35:48 +02:00
Anthony Scopatz
9047b7408c fixed newline env issue 2016-06-22 14:15:35 -04:00
Anthony Scopatz
a32638cbb4 Merge branch 'master' into cc 2016-06-21 14:20:13 -04:00
Lucas Inojosa
263203dad7 CHANGELOG for #1233 2016-06-21 12:04:56 -03:00
Anthony Scopatz
f094bad69f Merge branch 'master' into cc 2016-06-21 10:56:14 -04:00
Anthony Scopatz
15084eb3d1 added news for pid 2016-06-20 21:28:00 -04:00
Anthony Scopatz
a3c28654d4 added news 2016-06-20 13:29:42 -04:00
laerus
b61dc35cd2 Merge branch 'master' into xonsh-argument-fix-i1073 2016-06-19 16:01:50 +03:00
Anthony Scopatz
43d487c243 Merge pull request #1273 from youtux/fix-main-config-file
fix bug in main: args.config_path not being used
2016-06-18 14:33:23 -04:00
Anthony Scopatz
96d965652d Merge pull request #1271 from xonsh/fix_alias
Fix aliases that reference them self
2016-06-18 14:31:59 -04:00
laerus
dccb3aed29 news update 2016-06-18 20:39:15 +03:00
Gil Forsyth
ead6bb9a32 Merge pull request #1274 from youtux/wizard-foreign-shell-prompt
Be more explicit in foreign shell wizard
2016-06-18 10:22:36 -04:00
Alessio Bogon
71e3c007f1 Add the news. 2016-06-18 16:12:41 +02:00
Alessio Bogon
5b42064950 fix bug in main: args.config_path not being used 2016-06-18 00:46:06 +02:00
Alessio Bogon
1a23ae1a0c Add the news. 2016-06-18 00:27:37 +02:00
Morten Enemark Lund
efb44b9f83 add changelog 2016-06-17 22:58:36 +02:00
Anthony Scopatz
3dc6703e45 some hist doc changes 2016-06-17 13:52:05 -04:00
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