mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-06 17:30:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
7567 commits 40 branches 136 tags 39 MiB
Commit graph

7567 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony Scopatz
0b58eed37f doc fixes 2018-09-13 17:26:37 -04:00
Anthony Scopatz
0f00519d16 some more docfix bugs 2018-09-13 17:16:37 -04:00
Anthony Scopatz
2264f72b45 fixed some more bugs 2018-09-13 17:08:01 -04:00
Anthony Scopatz
89a42458d9 tests pass! 2018-09-13 16:49:09 -04:00
Anthony Scopatz
8c3c357c40 all tests run, but don't pass 2018-09-13 15:19:56 -04:00
Anthony Scopatz
4c91df2abc many test fixes 2018-09-13 14:03:35 -04:00
Anthony Scopatz
6aa7aba36b resolved conflicts with master 2018-09-13 10:38:17 -04:00
Anthony Scopatz
9e45b69d87 resolved conflicts 2018-09-13 10:33:44 -04:00
Gil Forsyth
fd448e515a
Merge pull request #2812 from xonsh/dotglob 
dotfile matching
 2018-09-12 20:22:57 -04:00
Gil Forsyth
f1bfc9f987
Merge pull request #2813 from xonsh/rlcomp 
readline completer fixes
 2018-09-12 20:10:26 -04:00
Anthony Scopatz
9e01b3d6be Merge branch 'master' into xonsh_session 
Conflicts remaining:

Auto-merging xonsh/jobs.py
CONFLICT (content): Merge conflict in xonsh/jobs.py
Auto-merging xonsh/imphooks.py
CONFLICT (content): Merge conflict in xonsh/imphooks.py
Auto-merging xonsh/history/sqlite.py
CONFLICT (content): Merge conflict in xonsh/history/sqlite.py
Auto-merging xonsh/history/main.py
CONFLICT (content): Merge conflict in xonsh/history/main.py
Auto-merging xonsh/history/json.py
CONFLICT (content): Merge conflict in xonsh/history/json.py
Auto-merging xonsh/foreign_shells.py
CONFLICT (content): Merge conflict in xonsh/foreign_shells.py
Auto-merging xonsh/execer.py
Auto-merging xonsh/events.py
CONFLICT (content): Merge conflict in xonsh/events.py
Auto-merging xonsh/environ.py
CONFLICT (content): Merge conflict in xonsh/environ.py
Auto-merging xonsh/dirstack.py
CONFLICT (content): Merge conflict in xonsh/dirstack.py
Auto-merging xonsh/contexts.py
Auto-merging xonsh/completers/tools.py
CONFLICT (content): Merge conflict in xonsh/completers/tools.py
Auto-merging xonsh/completers/python.py
CONFLICT (content): Merge conflict in xonsh/completers/python.py
Auto-merging xonsh/completers/path.py
CONFLICT (content): Merge conflict in xonsh/completers/path.py
Auto-merging xonsh/completers/man.py
CONFLICT (content): Merge conflict in xonsh/completers/man.py
Auto-merging xonsh/completers/completer.py
CONFLICT (content): Merge conflict in xonsh/completers/completer.py
Auto-merging xonsh/completers/commands.py
CONFLICT (content): Merge conflict in xonsh/completers/commands.py
Auto-merging xonsh/completers/bash.py
CONFLICT (content): Merge conflict in xonsh/completers/bash.py
Auto-merging xonsh/completers/_aliases.py
CONFLICT (content): Merge conflict in xonsh/completers/_aliases.py
Auto-merging xonsh/completer.py
Auto-merging xonsh/commands_cache.py
CONFLICT (content): Merge conflict in xonsh/commands_cache.py
Auto-merging xonsh/codecache.py
CONFLICT (content): Merge conflict in xonsh/codecache.py
Auto-merging xonsh/built_ins.py
CONFLICT (content): Merge conflict in xonsh/built_ins.py
Auto-merging xonsh/base_shell.py
CONFLICT (content): Merge conflict in xonsh/base_shell.py
Auto-merging xonsh/ast.py
CONFLICT (content): Merge conflict in xonsh/ast.py
Auto-merging xonsh/ansi_colors.py
CONFLICT (content): Merge conflict in xonsh/ansi_colors.py
Auto-merging xonsh/aliases.py
CONFLICT (content): Merge conflict in xonsh/aliases.py
Removing news/pr-2706-restore-augassign_ops.rst
Automatic merge failed; fix conflicts and then commit the result.
 2018-09-12 20:02:11 -04:00
Gil Forsyth
219034f167
Merge pull request #2811 from xonsh/fssup 
skip foreign
 2018-09-12 19:30:15 -04:00
Anthony Scopatz
b23d6eccdb black 2018-09-12 19:19:36 -04:00
Anthony Scopatz
3fe03b80c7 readline completer fixes 2018-09-12 19:06:52 -04:00
Anthony Scopatz
d62a44d2c5 skip on v34 2018-09-12 18:17:58 -04:00
Anthony Scopatz
3efdae6b3b black fixes 2018-09-12 18:14:47 -04:00
Anthony Scopatz
a444093290 dotfile matching 2018-09-12 18:12:02 -04:00
Anthony Scopatz
948dd31065 skip foreign 2018-09-12 15:47:44 -04:00
Anthony Scopatz
7a6c3b8f28 bumped version to 0.7.8 2018-09-11 14:20:58 -04:00
Anthony Scopatz
630bfa77bb black version bump 2018-09-11 14:19:04 -04:00
Anthony Scopatz
63c2291870 Updated CHANGELOG for 0.7.8 2018-09-11 13:53:52 -04:00
Anthony Scopatz
311b91355d bumped version to 0.7.8 2018-09-11 13:53:52 -04:00
Anthony Scopatz
ecca7a7cad
Merge pull request #2809 from CJ-Wright/chain_db 
add chain db
 2018-09-11 13:48:32 -04:00
christopher
b7c619a738 add chain db 2018-09-11 13:23:57 -04:00
Gil Forsyth
f26b778d38
Merge pull request #2805 from worldmind/master 
Pass all params to voxapi.create
 2018-09-08 10:52:26 -04:00
Gil Forsyth
455d164dc7 Fix RST in news file 2018-09-08 09:07:45 -04:00
Alexey Shrub
2374567c93 Pass all params to voxapi.create 2018-09-08 13:15:08 +03:00
Anthony Scopatz
c34f6f8a65
Merge pull request #2804 from xonsh/clean_doctr_build 
Remove extra cleans and resets from doc builds
 2018-09-05 15:49:57 -04:00
Gil Forsyth
4c63765d68 Remove extra cleans and resets from doc builds 2018-09-05 14:50:22 -04:00
Anthony Scopatz
1a787683c0
Merge pull request #2802 from xonsh/blackamalgamate 
Fix amalgamation to not "unblack" `__init__` files
 2018-09-05 14:22:26 -04:00
Gil Forsyth
00f6d4a173 Fix amalgamation to not "unblack" __init__ files 2018-09-05 10:37:33 -04:00
Gil Forsyth
743a851389
Merge pull request #2798 from xonsh/black 
Black
 2018-09-05 10:06:01 -04:00
Anthony Scopatz
5980cc9abb reset again 2018-09-04 20:49:47 -04:00
Anthony Scopatz
0883cc5a30 set -x 2018-09-04 20:39:53 -04:00
Anthony Scopatz
fe35bce20e reset everything differently 2018-09-04 20:32:55 -04:00
Anthony Scopatz
dea8c99df0 reset everything 2018-09-04 20:26:49 -04:00
Anthony Scopatz
4c4f7031d8 try git clean 2018-09-04 16:43:33 -04:00
Anthony Scopatz
cb6a913cab docs build 2018-08-31 08:05:39 -05:00
Anthony Scopatz
40da5419a1
Merge pull request #2800 from xonsh/tab_deep 
Fix multi-item path completion
 2018-08-30 23:08:35 -05:00
Anthony Scopatz
b494de1541 E203 whitespace before ':' 2018-08-30 23:06:30 -05:00
Gil Forsyth
9b2edf1958 Fix multi-item path completion 2018-08-30 15:16:48 -04:00
Anthony Scopatz
94c09014ec version quotes 2018-08-30 09:25:36 -05:00
Anthony Scopatz
634a8ec9f2 black tests 2018-08-30 09:18:49 -05:00
Anthony Scopatz
0557eecee0 black: the only color you need 2018-08-30 09:17:34 -05:00
Anthony Scopatz
5f92e80b22 Updated CHANGELOG for 0.7.7 2018-08-30 07:37:47 -05:00
Anthony Scopatz
1de73469c1 bumped version to 0.7.7 2018-08-30 07:37:47 -05:00
Gil Forsyth
60970eb71a
Merge pull request #2797 from xonsh/swapexcept 
fixed environment swapping issue
 2018-08-29 16:52:24 -04:00
Anthony Scopatz
4f56a64879 ran black on tools 2018-08-27 18:13:44 -05:00
Anthony Scopatz
a2b82e1b0c fixed environment swapping issue 2018-08-27 18:00:31 -05:00
Anthony Scopatz
2a1d5545af
Merge pull request #2796 from xonsh/fix_ctrlr 
Fix ctrlr
 2018-08-27 16:36:10 -05:00