Commit graph

2340 commits

Author SHA1 Message Date
Matthias Bussonnier
51707ef528 Fix docs too 2016-03-22 11:07:16 -07:00
Anthony Scopatz
bcf2cd32fe Merge pull request #732 from scopatz/conda_recipe_update
Update recipe to use git_url specification.
2016-03-12 08:22:01 -06:00
Anthony Scopatz
58fac13387 Merge pull request #728 from Carreau/colors
Fix colors on recent enough pygments
2016-03-12 08:19:12 -06:00
Morten Enemark Lund
3177601788 Update recipe to use git_url specification. 2016-03-12 08:46:16 +01:00
Anthony Scopatz
eb5e8e878f Merge pull request #721 from adqm/reglob
modify regular expression globbing
2016-03-10 23:38:31 -06:00
Matthias Bussonnier
1c6fe456eb Fix colors on recent enough pygments 2016-03-09 13:19:15 -08:00
Gil Forsyth
a049c224c2 Merge pull request #725 from scopatz/bw
black and white color map updates
2016-03-09 10:35:31 -05:00
Gil Forsyth
a80643f6f0 Merge pull request #720 from scopatz/timefix
push fix for namespaces
2016-03-08 06:04:19 -05:00
adam j hartz
1a901494ad update changelog 2016-03-08 00:35:10 -05:00
Anthony Scopatz
79e99f1305 black and white color map updates 2016-03-07 18:12:36 -05:00
Anthony Scopatz
9125e0d68d Merge pull request #714 from scopatz/win_unicode_console
Add optional dependency on the win_unicode_console library
2016-03-07 12:42:00 -05:00
Gil Forsyth
46f5a5ac18 Merge pull request #723 from gitter-badger/gitter-badge
Add a Gitter chat badge to README.rst
2016-03-07 11:52:55 -05:00
The Gitter Badger
2d210b9a4e Add Gitter badge 2016-03-07 16:48:24 +00:00
adam j hartz
ae92455ff5 modify regular expression globbing 2016-03-07 00:03:34 -05:00
Morten Enemark Lund
24753fcc5a Small typo 2016-03-06 22:21:58 +01:00
Morten Enemark Lund
76bd9c66c6 Add section on win_unicode_console to windiws.rst 2016-03-06 22:20:30 +01:00
Morten Enemark Lund
2061157597 Remove the suggestion to alias ls to dir
It only cause confusion to alias ls to dir as the two commands behave very different. It can also cause trouble if the user later installs the UNIX tools through for example 'git for Windows'
2016-03-06 21:59:34 +01:00
Morten Enemark Lund
7c040f59cc Update CHANGELOG.rst 2016-03-06 21:52:54 +01:00
Anthony Scopatz
a417f67b2d push fix for namespaces 2016-03-06 13:21:04 -05:00
Anthony Scopatz
19707c75c9 Merge pull request #719 from gforsyth/ptk_pass_collision
fix collision with ptk multiline dedent and `pass`
2016-03-06 12:28:03 -05:00
Gil Forsyth
381a872481 update multiline tests
only dedent when not on first line of document
2016-03-06 12:16:24 -05:00
Gil Forsyth
e8b7003ee2 fix collision with ptk multiline dedent and pass
This is a bit of an edge case, but the password manager `pass` causes a
few headaches with the multiline carriage return logic.  Specifically,
because `pass` is a `DEDENT_TOKEN` when running `pass` as the password
manager the prompt will delete one indent-length's worth of characters
on a `<ENTER>` press.  This is a one-line fix to make sure that people
 can use `pass` in the PTK shell.
Just running `pass` will be interpreted as a Pythonic `pass`, but
commands like `pass git init` will work.

If someone has a xsh script that uses `pass` it should be wrapped in
`$[]`.
2016-03-04 10:26:18 -05:00
adam j hartz
d3795eaeac Merge pull request #718 from scopatz/nohup
lstrip before $[$[ check
2016-03-03 14:21:12 -05:00
Anthony Scopatz
9cb1a135ae lstrip before $[$[ check 2016-03-03 13:29:46 -05:00
Anthony Scopatz
033e767078 Merge branch 'adqm-fix_double_wrapping_check' 2016-03-03 13:00:35 -05:00
Anthony Scopatz
ad21481f46 Merge branch 'fix_double_wrapping_check' of github.com:adqm/xonsh into adqm-fix_double_wrapping_check 2016-03-03 12:59:56 -05:00
adam j hartz
5ca7d340e8 oops 2016-03-02 17:42:34 -05:00
adam j hartz
340b70999c better check for avoiding double-wrapping 2016-03-02 16:45:43 -05:00
Morten Enemark Lund
98e04122a8 Fixed problem where 'WIN_UNICODE_CONSOLE' was missing when running tests with mocked environment.
Added default value when getting 'WIN_UNICODE_CONSOLE' envvar.
2016-03-02 12:51:07 +01:00
Morten Enemark Lund
8c66dfc725 Merge pull request #713 from scopatz/ansicon
makes ANSICON non-configurable
2016-03-01 23:25:24 +01:00
Morten Enemark Lund
dfa2a1178b Add optional dependency on the win_unicode_console library which enables utf-8 support in windows terminals. ( https://pypi.python.org/pypi/win_unicode_console ) 2016-03-01 23:19:04 +01:00
Anthony Scopatz
17a4545323 makes ANSICON non-configurable 2016-03-01 13:10:07 -05:00
Anthony Scopatz
241d7910ab Merge branch 'wiz' 2016-03-01 13:08:54 -05:00
Anthony Scopatz
a4c6e6d5ce fixed conflict 2016-03-01 12:59:28 -05:00
Morten Enemark Lund
57be553d41 Merge pull request #695 from scopatz/c
More colors: fixes and features
2016-03-01 07:21:46 +01:00
Anthony Scopatz
6d68766bd8 Merge pull request #706 from scopatz/git_dirty_work_dir
Ignore untracked files when considering if git workdir is dirty
2016-02-29 12:31:19 -05:00
Morten Enemark Lund
3ca0e00677 Update xonshrc.rst
Add snippets/tricks section to the xonshrc documentation
2016-02-28 23:24:02 +01:00
Anthony Scopatz
9dc1ba2222 env var fix 2016-02-27 17:46:35 -05:00
Anthony Scopatz
b7f85873ea updated monokai and made updating colors easier 2016-02-27 17:31:57 -05:00
Anthony Scopatz
6469579cd3 more default ANSI colors 2016-02-27 14:07:28 -05:00
Anthony Scopatz
eb05112714 new default colors in ptk 2016-02-27 13:58:15 -05:00
Anthony Scopatz
f3ce69e936 Merge branch 'master' into c 2016-02-27 12:49:19 -05:00
Anthony Scopatz
445454dc61 fix linefeeds in xonfig wizard on windows 2016-02-27 12:45:52 -05:00
Morten Enemark Lund
b0b2252420 Add option to include untracked files in git_dirty_working_directory 2016-02-27 09:57:12 +01:00
Anthony Scopatz
462184fce9 Merge pull request #705 from gforsyth/xonshi
Small addition to index.rst
2016-02-26 22:55:21 -05:00
Morten Enemark Lund
cff2893773 Update CHANGELOG.rst 2016-02-26 19:52:12 +01:00
Anthony Scopatz
fc5a481bf6 Merge pull request #704 from gforsyth/rip_legacy_python
add `tempfile` import to try statement to fail py27 gracefully
2016-02-26 11:03:22 -05:00
Morten Enemark Lund
cb2388254b Ignore untracked files when considering if git workdir is dirty 2016-02-26 13:41:45 +01:00
Gil Forsyth
c06d667f44 why not 2016-02-25 18:31:50 -05:00
Gil Forsyth
1e1c01caae put tempfile import in separate try statement
because install shouldn't fail just because someone doesn't have
setuptools...
2016-02-25 17:57:29 -05:00