Commit graph

3515 commits

Author SHA1 Message Date
adam j hartz
04ab2bbef8 merge from master 2016-06-09 03:17:23 -04:00
Morten Enemark Lund
a7d45f6ea5 Merge pull request #1187 from adqm/nocompinscrpt
No completer in script
2016-06-09 09:02:33 +02:00
Anthony Scopatz
18c456e865 bumped vc branch timeout 2016-06-09 03:01:47 -04:00
Brian Visel
051e8e9a29 Updated changelog 2016-06-09 03:01:28 -04:00
Anthony Scopatz
e2c6a82ad9 fixed conflict 2016-06-09 02:58:44 -04:00
Brian Visel
397e6cb40c Use XonshCalledProcessError in CompletedCommand.__iter__ 2016-06-09 02:56:48 -04:00
adam j hartz
f5627047e8 merge from master 2016-06-09 02:56:10 -04:00
Brian Visel
897afff4eb Added XonshCalledProcessError, that and XonshError now builtins 2016-06-09 02:54:20 -04:00
adam j hartz
e92f82098e merge from master 2016-06-09 02:52:31 -04:00
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
cc0f7f3033 Merge pull request #1185 from mitnk/fix-prompt-and-title
Fix crash caused by malformed prompt or title
2016-06-09 02:45:42 -04:00
adam j hartz
722f34dc37 Merge pull request #1125 from xonsh/dist
Blocks Anonymous
2016-06-09 02:42:51 -04:00
Hugo Wang
9cb616d48f updated except 2016-06-09 06:17:27 +00:00
Anthony Scopatz
4f4270079c more 2016-06-09 01:55:34 -04:00
Brian Visel
24438d4715 Minimal changes for conformity, bugfix / py3.4 compat 2016-06-09 01:53:10 -04:00
Jeremy Donahue
e7db11c586 Fix PEP-8 styling 2016-06-08 22:45:59 -07:00
Anthony Scopatz
51518756da merge and fix conflict 2016-06-09 01:44:34 -04:00
Hugo Wang
af55ed4049 fix crash caused by prompt exceptions 2016-06-09 11:44:50 +08:00
adam j hartz
7be4156e7b Merge branch 'master' of https://github.com/eode/xonsh into eode-iter 2016-06-08 23:08:32 -04:00
Hugo Wang
6dc835a9fd fix crase caused by malformed prompt or title 2016-06-09 10:51:50 +08: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
Jeremy Donahue
3a758887a5 Error handling for invalid deque access 2016-06-08 19:26:11 -07:00
Brian Visel
d7b0cbfb0f Added _CCTuple.executed_cmd for use with iter(!(command)) 2016-06-08 22:23:08 -04:00
Jeremy Donahue
a775b287db Update docker script reference to reflect its new name
docker.py was renamed to xonsh-in-docker.py, update the docs to reflect it.
2016-06-08 18:46:48 -07:00
Jeremy Donahue
cf2addad88 Include '+' and '-' position indicators in jobs list
Again, for BASHwards compatability.
2016-06-08 18:45:40 -07:00
Jeremy Donahue
4400a6f98a Implement '+' and '-' for fg
Implement '+' and '-' for fg for BASHwards compatability.
2016-06-08 18:43:39 -07:00
Brian Visel
91bf3a260b remove newlines from !(command) iteration, minor bugfix 2016-06-08 21:29:29 -04:00
adam j hartz
08828db7cf update changelog 2016-06-08 20:59:58 -04:00
adam j hartz
ef70c53bb9 Merge branch 'master' into fuzzy_completions 2016-06-08 20:57:52 -04:00
adam j hartz
511d6f8ecd add fuzzy completion, update docs 2016-06-08 20:57:41 -04:00
adam j hartz
d8cb5ee4a1 fuzzy -> subsequence everywhere 2016-06-08 20:41:55 -04: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
Brian Visel
7f3283f0cc Iterating over !(command) iterates over output lines 2016-06-08 19:06:12 -04: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
58518c2bf6 respect CASE_SENSITIVE_COMPLETIONS 2016-06-08 17:33:48 -04:00
adam j hartz
229acc0354 actually fix names 2016-06-08 16:53:04 -04:00
adam j hartz
5130782777 version bump to 0.3.4 2016-06-08 14:25:52 -04:00