Commit graph

6748 commits

Author SHA1 Message Date
Gil Forsyth
192c725fe5 add prompt_toolkit to docs reqs 2017-02-28 15:18:22 -05:00
Gil Forsyth
bc7d4117e9 don't require prompt toolkit for docs on user side
we'll make sure it's available on CI when the docs are generated for the
website, but it shouldn't fail to build in userspace just because of the
ptk events hack thing
2017-02-28 15:17:43 -05:00
Gil Forsyth
91653dafa8 import events via ptk shell to gather all events
Not the prettiest thing but if we don't import the events via the PTK
shell then ``on_ptk_create`` doesn't get picked up during doc generation
2017-02-28 15:13:47 -05:00
Gil Forsyth
8cf38e8e42 rename jsonutils so sphinx sees it 2017-02-28 15:13:30 -05:00
Gil Forsyth
a70bef6ae8 Merge pull request #2280 from xonsh/welcome
Use terminal width when centering text on welcome screen
2017-02-28 15:09:11 -05:00
Anthony Scopatz
0df9cce15d fixed conflict 2017-02-28 12:06:38 -05:00
Morten Enemark Lund
8055a6eef0 missing os import 2017-02-28 15:52:47 +01:00
Morten Enemark Lund
fbe39de926 Merge pull request #2273 from xonsh/badglob
Bad globs
2017-02-28 08:59:01 +01:00
Morten Enemark Lund
0c119f3fa1 Merge pull request #2256 from xonsh/partial
Partial proxy partial friendly
2017-02-28 08:55:33 +01:00
Morten Enemark Lund
93e7dfc606 Use terminal width when centering text on welcome screen 2017-02-28 08:52:51 +01:00
Anthony Scopatz
48a39a761c Merge branch 'welcome' 2017-02-28 00:19:17 -05:00
Anthony Scopatz
d7626affe5 typo fix 2017-02-28 00:18:51 -05:00
Anthony Scopatz
11253ee4f1 more test fixes 2017-02-27 21:48:34 -05:00
Anthony Scopatz
13d507e4f8 fixed conflicts 2017-02-27 21:14:41 -05:00
Morten Enemark Lund
76fe9e9e3f Flake 2017-02-27 23:42:16 +01:00
Anthony Scopatz
91fd3065ad Merge pull request #2278 from xonsh/conftest
conftest xonsh_builtins teardown
2017-02-27 17:38:37 -05:00
Morten Enemark Lund
41d3fdd683 Change note 2017-02-27 23:31:21 +01:00
Morten Enemark Lund
f12a48ea22 Remove lower line 2017-02-27 23:23:21 +01:00
Morten Enemark Lund
65d6fc140b Remove taglines with unicode characters. 2017-02-27 23:22:19 +01:00
Morten Enemark Lund
21eaf68027 Add news entry 2017-02-27 23:20:08 +01:00
Morten Enemark Lund
52cd1c406e Add welcome screen and xonfig option to launch tutorial 2017-02-27 23:16:05 +01:00
Anthony Scopatz
0973539c5c Merge pull request #2277 from xonsh/fix_history_replay
only remove attribute if it exists
2017-02-27 15:29:46 -05:00
laerus
4a2ff3aa58 conftest xonsh_builtins teardown 2017-02-27 21:44:58 +02:00
Anthony Scopatz
be9ca2a385 yet another fix 2017-02-27 14:11:39 -05:00
Anthony Scopatz
ae620c2e98 newline test fix 2017-02-27 11:40:02 -05:00
Gil Forsyth
f71e191cd8 only remove attribute if it exists
Attempt to fix #2264 which only rears its head during history replay (on
linux).
2017-02-27 10:55:14 -05:00
Morten Enemark Lund
b5f48cdcee Merge pull request #2270 from xonsh/jsonutils
New JSON utils module
2017-02-27 09:53:27 +01:00
Morten Enemark Lund
750ce78b67 Merge pull request #2275 from xonsh/ptkcomp
Fixed up ptk completer a bit
2017-02-27 09:51:55 +01:00
Morten Enemark Lund
2eb927a0ff Merge pull request #2274 from xonsh/ao
Require whitespace for and/or tokens in subproc mode
2017-02-27 09:43:32 +01:00
Morten Enemark Lund
a165563520 Merge pull request #2276 from xonsh/ntenv
Use nt.environ on windows
2017-02-27 09:40:14 +01:00
Anthony Scopatz
44e6e3c233 minor xp fix 2017-02-27 01:45:50 -05:00
Anthony Scopatz
b3e6a80191 Use nt.environ on windows 2017-02-27 01:35:09 -05:00
Anthony Scopatz
b46020f1d4 fixed up ptk completer a bit 2017-02-27 01:07:24 -05:00
Anthony Scopatz
cefd8d395d Require whitespace for and/or tokens in subproc mode 2017-02-26 22:42:29 -05:00
Anthony Scopatz
131389a4c4 flake 2017-02-26 22:01:38 -05:00
Anthony Scopatz
b0dce1af1e fixes and tests for bad globs 2017-02-26 21:54:39 -05:00
Anthony Scopatz
e656a5eb21 Merge branch 'master' into badglob 2017-02-26 20:56:57 -05:00
Hugo Wang
8920cc3d4e Merge pull request #2260 from xonsh/subshell
Subshells
2017-02-27 09:22:55 +08:00
Anthony Scopatz
dc551e413a more fixes 2017-02-26 19:33:08 -05:00
Gil Forsyth
04c991b393 Merge pull request #2266 from xonsh/delcwd
No longer crash when PWD is removed
2017-02-26 18:45:24 -05:00
Gil Forsyth
a7e5a32e05 Merge pull request #2272 from xonsh/gtt
Error 25 in give terminal to
2017-02-26 18:32:14 -05:00
Anthony Scopatz
f70a2b67a0 try to replace a god 2017-02-26 18:21:39 -05:00
Anthony Scopatz
f598ffd9ab Merge branch 'master' into badglob 2017-02-26 18:16:27 -05:00
Anthony Scopatz
43534f9de7 more highlighting fixes 2017-02-26 18:11:17 -05:00
Anthony Scopatz
9b135d1820 Error 25 in give terminal to 2017-02-26 17:50:45 -05:00
Anthony Scopatz
9f9a5cfe79 more subshell fixes 2017-02-26 17:44:06 -05:00
Gil Forsyth
83efd76e4e Merge pull request #2267 from xonsh/nullsub
Escape null bytes before Popen
2017-02-26 17:18:21 -05:00
Morten Enemark Lund
ffe08aaaab Merge pull request #2261 from xonsh/nsredir
Redirection no longer require a space
2017-02-26 22:49:55 +01:00
Anthony Scopatz
78adcf6882 minor fixes 2017-02-26 16:31:44 -05:00
Anthony Scopatz
02faca09ba Merge branch 'master' into subshell 2017-02-26 16:20:00 -05:00