Commit graph

3288 commits

Author SHA1 Message Date
adam j hartz
85bc3588eb update changelog 2016-06-09 02:51:32 -04:00
adam j hartz
4953aca299 Merge branch 'nocompinscrpt' of https://github.com/adqm/xonsh into nocompinscrpt 2016-06-09 02:48:48 -04:00
Anthony Scopatz
cb1a3cb4f0 Merge pull request #1184 from mszu/patch-1
Fix typo in tutorial
2016-06-08 22:49:09 -04:00
Mark Szumowski
d408049705 Fix typo in tutorial 2016-06-09 12:47:07 +10:00
adam j hartz
d36eb8066d Merge branch 'cryzed-feature-1169' 2016-06-08 20:25:08 -04:00
cryzed
0843818515 Fix small typo and add documentation for XONSH_SOURCE 2016-06-09 02:13:19 +02:00
adam j hartz
be54245ad3 merge from cryzed:fix-1173 into master 2016-06-08 20:09:08 -04:00
cryzed
2fcc19e89c Move changelog line to current developments 2016-06-09 01:57:08 +02:00
cryzed
cbffccf57a Move changelog line to current developments 2016-06-09 01:56:37 +02:00
cryzed
d0fa91daf9 Implement suggestions made on IRC and GitHub 2016-06-09 01:55:53 +02:00
cryzed
d9408c4335 Added line to changelog 2016-06-09 01:35:07 +02:00
cryzed
218e94cecb Added line to changelog 2016-06-09 01:31:27 +02:00
cryzed
f2b0a35023 Added line to changelog 2016-06-09 01:29:45 +02:00
cryzed
3037ff96e9 Fix #1173 2016-06-09 01:21:27 +02:00
cryzed
b5a06a4d43 Fix #1075 2016-06-09 00:53:09 +02:00
cryzed
53c2697166 Implement #1169 2016-06-09 00:50:52 +02:00
cryzed
e79cc64a58 Remove duplicate "-c" key in arg_undoers dict 2016-06-09 00:49:03 +02:00
adam j hartz
5130782777 version bump to 0.3.4 2016-06-08 14:25:52 -04:00
adam j hartz
7cc777a066 update bash to xonsh guide 2016-06-07 23:19:31 -04:00
adam j hartz
4b3f1391c0 adam's updates to defaults_on_win branch 2016-06-07 22:52:07 -04:00
adam j hartz
61a9b47252 Merge branch 'defaults_on_win' of https://github.com/scopatz/xonsh into melund-defaults_on_win 2016-06-07 22:47:45 -04:00
Anthony Scopatz
08f50db1e6 Merge branch 'adqm-crash' 2016-06-07 21:27:31 -04:00
adam j hartz
3a72da39d2 use what's already there 2016-06-07 21:05:05 -04:00
adam j hartz
e383043803 changelog 2016-06-07 20:50:13 -04:00
adam j hartz
378f8635ab fix crash, modify wizard behavior 2016-06-07 20:50:08 -04:00
Anthony Scopatz
12e2c45443 Merge branch 'adqm-no_zsh_prompt' 2016-06-07 20:14:54 -04:00
Anthony Scopatz
09ce9e7c2f Merge branch 'no_zsh_prompt' of https://github.com/adqm/xonsh into adqm-no_zsh_prompt 2016-06-07 20:14:03 -04:00
adam j hartz
87f311e23d fix nameerror 2016-06-07 20:08:42 -04:00
Anthony Scopatz
fc363a90c7 Merge pull request #1147 from Carreau/coverage
Enable (some) coverage.
2016-06-07 19:27:35 -04:00
adam j hartz
0498ad964c remove extra paren 2016-06-07 18:06:54 -04:00
adam j hartz
411ccade7d docs 2016-06-07 17:50:40 -04:00
adam j hartz
0a3f29f016 refactor, per suggestions 2016-06-07 17:43:21 -04:00
adam j hartz
27e8409760 merge from master 2016-06-07 17:28:50 -04:00
adam j hartz
ec7874e537 merge from master 2016-06-07 16:56:42 -04:00
adam j hartz
bf5948af3f add brief documentation about cygwin 2016-06-07 16:43:56 -04:00
adam j hartz
2191abd382 Merge branch 'cygwin' of https://github.com/OllieTerrance-forks/xonsh into OllieTerrance-cygwin 2016-06-07 16:08:15 -04:00
Gil Forsyth
0cc436868e Merge pull request #1159 from xonsh/conda_install_doc
Suggest to add conda-forge as a default channel
2016-06-07 15:46:23 -04:00
Ollie Terrance
2dd2abcf36 Add Cygwin pthread_sigmask note to changelog 2016-06-07 19:22:20 +01:00
Ollie Terrance
b2eb139a38 Add Cygwin to xonfig output 2016-06-07 19:17:52 +01:00
Ollie Terrance
891a9faffc Cygwin: don't use pthread_sigmask
The signal library doesn't provide this on Windows or Cygwin.
2016-06-07 19:17:52 +01:00
Morten Enemark Lund
02f22ff185 Merge pull request #1157 from xonsh/fix_fix_contributing
fix contributing linking
2016-06-07 18:44:23 +02:00
Gil Forsyth
8beaacd8d4 fix contributing linking
GitHub doesn't play nice re: displaying files that are symlinked.  Hard
links don't work at all.  This makes the "main" devguide RST file
CONTRIBUTING.rst and then creates devguide.rst as a symlink.

I've tested this with Sphinx and it works fine for generating
documentation.
2016-06-07 09:09:54 -04:00
Morten Enemark Lund
13e235e8e9 Suggest to add conda-forge as a default channel 2016-06-07 10:41:08 +02:00
Morten Enemark Lund
11adbef4c3 Combine two if ON_WINDOWS blocks 2016-06-07 08:28:50 +02:00
Morten Enemark Lund
423fe1a056 PEP 8 2016-06-07 08:24:42 +02:00
Morten Enemark Lund
3a9092fb2e Forgot to remove pdb trace 2016-06-07 08:24:42 +02:00
Morten Enemark Lund
aebaa1209f Add entries to CHANGELOG.rst 2016-06-07 08:24:42 +02:00
Morten Enemark Lund
3f8f8f9981 Fix crash when bash is not found on Windows. Also, look up GitForWindows (e.g. MSYS bash) if bash is not on PATH. 2016-06-07 08:24:41 +02:00
adam j hartz
dd7729d5f0 fix typo 2016-06-07 00:47:37 -04:00
adam j hartz
b9e5b84067 ignore PROMPT from other shells at init time 2016-06-07 00:24:37 -04:00