Commit graph

2279 commits

Author SHA1 Message Date
Gil Forsyth
c06d667f44 why not 2016-02-25 18:31:50 -05:00
Anthony Scopatz
9f9cd1894e Merge branch 'gforsyth-ptk_dots' 2016-02-24 15:09:28 -05:00
Anthony Scopatz
c8042e7044 revert recipie manipulation 2016-02-24 15:09:16 -05:00
Gil Forsyth
1b0f67be4b rearrange functions 2016-02-24 13:16:58 -05:00
Gil Forsyth
33cce53ba8 ignore continuation tokens if ptk <= 0.57 2016-02-24 13:12:40 -05:00
Anthony Scopatz
391c0162ca ci fixes 2016-02-24 13:08:22 -05:00
Gil Forsyth
d9275b6ffd Merge branch 'master' of https://github.com/scopatz/xonsh into ptk_dots 2016-02-24 13:08:14 -05:00
Anthony Scopatz
0f0a49b366 Merge pull request #700 from scopatz/another_cmder_workaround
Workaround bug in ConEmu/cmder (windows terminal emulators)
2016-02-24 12:36:58 -05:00
Morten Enemark Lund
09ef87846e Removed tab from code 2016-02-24 14:14:14 +01:00
Morten Enemark Lund
46aadd2f0b Workaround bug in ConEmu/cmder (windows terminal emulators) which prevented git_dirty_working_directory() from working.
Redirection in subprocess caused stdout to be lost. If it happens then retry without redirection.
2016-02-24 09:49:56 +01:00
Gil Forsyth
00599f9f66 ignore continuation tokens if ptk <= 0.57 2016-02-23 19:33:38 -05:00
Gil Forsyth
1b3a2cb337 Merge branch 'master' of https://github.com/scopatz/xonsh into ptk_dots 2016-02-23 19:32:37 -05:00
Gil Forsyth
76fcd989ee Merge pull request #696 from scopatz/rprompt
right prompt implementation
2016-02-23 19:29:40 -05:00
Anthony Scopatz
9f3099cacd fixed merge conflict and flicker issue 2016-02-22 23:28:30 -05:00
Anthony Scopatz
3476e72098 potential fix for ptk promot slowdown 2016-02-22 23:25:09 -05:00
Anthony Scopatz
b60908fcd4 Merge branch 'master' of github.com:scopatz/xonsh 2016-02-21 16:26:02 -05:00
Anthony Scopatz
d794182488 typos 2016-02-21 16:25:16 -05:00
Anthony Scopatz
b9620d32fb hanging fix 2016-02-21 16:14:50 -05:00
Anthony Scopatz
0f6a2dbe67 potential fix for indented subproc mode with comments 2016-02-21 14:37:03 -05:00
Anthony Scopatz
6f2d2bccc2 Merge pull request #697 from Carreau/x-on
Add the x-on shell as a Pun.
2016-02-21 13:20:09 -05:00
Matthias Bussonnier
8734d6ac69 Add the x-on shell as a Pun. 2016-02-21 10:15:23 -08:00
Anthony Scopatz
c9ebd33abf rprompt implementation 2016-02-21 13:00:01 -05:00
Gil Forsyth
1b57e21cc2 Merge pull request #690 from scopatz/make-clean
removes Makefile and related content
2016-02-20 15:37:27 -05:00
Anthony Scopatz
0b88ad7375 added some more color docs 2016-02-20 15:24:19 -05:00
Anthony Scopatz
c2689bcb08 some test fixes 2016-02-20 14:53:00 -05:00
Anthony Scopatz
652c5f6281 Merge branch 'master' into c 2016-02-20 12:41:02 -05:00
Anthony Scopatz
3d42f4c78a Merge pull request #694 from Siecje/686
Adding ls alias suggestion to Windows guide.
2016-02-20 12:40:23 -05:00
Cody Scott
3781d72b7a Adding ls alias suggestion to Windows guide. 2016-02-20 10:43:27 -05:00
Anthony Scopatz
2edef14588 hilarious 2016-02-20 02:47:12 -05:00
Anthony Scopatz
46ea2e589e added hex colors to ansi 2016-02-20 01:17:51 -05:00
Anthony Scopatz
f8ea79606d more pygments color handling 2016-02-19 23:29:07 -05:00
Anthony Scopatz
16f059d120 more pygments color handling 2016-02-19 22:00:52 -05:00
Anthony Scopatz
2b91c82ee2 Merge branch 'bcenv' 2016-02-19 20:41:53 -05:00
Anthony Scopatz
b21733394b not much 2016-02-19 18:59:53 -05:00
Anthony Scopatz
6c91931346 updated 2016-02-19 18:23:12 -05:00
Anthony Scopatz
b1aa2f63a2 man page completere 2016-02-19 01:18:49 -05:00
Anthony Scopatz
0979be1400 pass in env to subproc calls in Completer 2016-02-19 01:02:31 -05:00
Anthony Scopatz
93961ffe5a Merge pull request #683 from moigagoo/master
Fixed `vox rm` and added autodeactivate to `vox activate`
2016-02-19 00:31:48 -05:00
Anthony Scopatz
275fd08d67 removes Makefile and related content 2016-02-19 00:03:09 -05:00
Gil Forsyth
b330ff277d Merge pull request #687 from scopatz/c
Color Refactor
2016-02-18 17:19:06 -05:00
Anthony Scopatz
89f9451c3a updated changelog 2016-02-18 01:06:29 -05:00
Anthony Scopatz
9d9c8bef31 fixed some tests 2016-02-18 00:45:01 -05:00
Anthony Scopatz
5c82ae5ef1 colorize output 2016-02-18 00:23:36 -05:00
Anthony Scopatz
2c215b990a syntax hghlight superhelp 2016-02-18 00:09:42 -05:00
Anthony Scopatz
ebd477db68 fixed history diff color 2016-02-17 23:02:12 -05:00
Anthony Scopatz
21940e9e74 some more modifications 2016-02-17 02:03:08 -05:00
Anthony Scopatz
05bcc5339d color fixes for tracer 2016-02-17 01:47:28 -05:00
Anthony Scopatz
577d6ae3b8 ptk prompt now working 2016-02-16 23:37:03 -05:00
Anthony Scopatz
59a9f429a8 Merge pull request #684 from scopatz/Fix_typos
Fix typos
2016-02-16 15:11:56 -05:00
Konstantin Molchanov
48ace81764 Vox: Activate: Automatically deactivate current env before activating the new one. 2016-02-16 19:35:32 +03:00