Commit graph

754 commits

Author SHA1 Message Date
Aaron Griffin
d2be629b48 Merge branch 'master' of github.com:aig787/xonsh 2015-04-07 08:04:21 -07:00
Aaron Griffin
e5848d713c
Fixed missing options for custom theme 2015-04-06 12:50:57 -07:00
Aaron Griffin
ebd49f61e3
Merge branch 'master' of github.com:scopatz/xonsh 2015-04-06 12:46:08 -07:00
Aaron Griffin
a15abf632b
Restored custom theme options with conditional for rtd 2015-04-06 12:42:39 -07:00
Aaron Griffin
9a747cb4c7
Added ply dependency to requirements 2015-04-06 12:22:17 -07:00
Aaron Griffin
678061948b
Added virtualenv requirements.txt 2015-04-06 12:19:56 -07:00
Aaron Griffin
ab0d562f1a
Commented out remaining theme options 2015-04-06 11:47:27 -07:00
Aaron Griffin
9b6758b4da
Commented out theme options 2015-04-06 11:42:26 -07:00
Anthony Scopatz
c77568bfaa I see a string and I want to paint in black 2015-04-05 22:59:00 -05:00
Anthony Scopatz
49b2faeac1 Merge branch 'wrywerytwreywery-error' 2015-04-05 20:21:47 -05:00
adam j hartz
e3efc7e476 modify error reporting 2015-04-05 21:15:09 -04:00
adam j hartz
b9d57e172b actually raise error is run_subproc 2015-04-05 21:06:34 -04:00
adam j hartz
47439d5a50 fix small typos 2015-04-05 20:28:01 -04:00
Anthony Scopatz
a72b766d1a attr complete 2015-04-05 16:31:50 -05:00
Anthony Scopatz
3aa94f43fb some completion tools 2015-04-05 15:42:24 -05:00
Anthony Scopatz
44cd415dc5 Merge branch 'wrywerytwreywery-st' 2015-04-05 13:43:35 -05:00
Anthony Scopatz
fa1b752976 Merge branch 'st' of https://github.com/wrywerytwreywery/xonsh into wrywerytwreywery-st 2015-04-05 13:40:41 -05:00
adam j hartz
93bf3af225 small refactor 2015-04-05 09:34:14 -04:00
adam j hartz
281f948de4 suggested refactor 2015-04-05 09:27:13 -04:00
Adam Hartz
6723722c2f Merge pull request #191 from scopatz/x
prevents detyping mappings as string to env.
2015-04-05 09:10:00 -04:00
Anthony Scopatz
0ed727e273 prevents detyping mappings as string to env. 2015-04-05 00:26:32 -05:00
adam j hartz
6a3cff1f58 improved check for semicolon 2015-04-05 00:26:55 -04:00
adam j hartz
f7ee3f1e2a attempt to fix #188 2015-04-05 00:18:52 -04:00
Adam Hartz
6b208eca80 Merge pull request #187 from scopatz/l
license updates.
2015-04-04 15:17:16 -04:00
Anthony Scopatz
5fae83fab3 license 2015-04-04 13:50:53 -05:00
Anthony Scopatz
9eb3484b19 Merge branch 'wrywerytwreywery-suggest' 2015-04-04 13:30:03 -05:00
Anthony Scopatz
0f443dc140 Merge branch 'suggest' of https://github.com/wrywerytwreywery/xonsh into wrywerytwreywery-suggest 2015-04-04 13:29:04 -05:00
Anthony Scopatz
14737561c7 Merge pull request #185 from wrywerytwreywery/docs
Documentation Updates
2015-04-04 13:27:45 -05:00
Anthony Scopatz
675f1a2340 Merge branch 'wrywerytwreywery-prompt' 2015-04-04 13:21:47 -05:00
Anthony Scopatz
a0943fac14 Merge branch 'prompt' of https://github.com/wrywerytwreywery/xonsh into wrywerytwreywery-prompt 2015-04-04 13:20:07 -05:00
Anthony Scopatz
99de4beb3b Merge branch 'completer' of https://github.com/wrywerytwreywery/xonsh 2015-04-04 13:12:09 -05:00
adam j hartz
a3546255fb improved suggestions 2015-04-04 10:48:19 -04:00
adam j hartz
b2a957ecd3 tutorial: change scripts example 2015-04-03 22:15:13 -04:00
adam j hartz
ceeafd13c7 devguide typos 2015-04-03 22:14:59 -04:00
adam j hartz
49df73733f docs for prompt 2015-04-03 21:49:31 -04:00
adam j hartz
1116d5fef9 rename FORMATTER_DICT 2015-04-03 21:06:05 -04:00
adam j hartz
7aa3086cdf pep8, copy FORMAT_DICT, remove fqdn 2015-04-03 21:06:05 -04:00
adam j hartz
6295389a1d remove unnecessary callable check 2015-04-03 21:06:05 -04:00
adam j hartz
a7f8f5eac9 small refactor 2015-04-03 21:06:05 -04:00
adam j hartz
f69a99b4b3 small refactor 2015-04-03 21:06:05 -04:00
adam j hartz
69d65c6ae5 updated prompt formatter 2015-04-03 21:06:05 -04:00
adam j hartz
94f898c409 prompt formatter refactor 2015-04-03 21:06:05 -04:00
adam j hartz
7f8d3a5e76 don't add env twice 2015-04-03 20:40:55 -04:00
adam j hartz
6dd55b736c fix conditional 2015-04-03 20:37:29 -04:00
Anthony Scopatz
7c266e4e82 review fixes 2015-04-03 18:05:45 -05:00
adam j hartz
0ec02095ac completer: handle spaces, .., and . 2015-04-03 18:27:14 -04:00
Anthony Scopatz
bd25f6638e a couple of more fixes 2015-04-02 21:08:17 -05:00
Anthony Scopatz
18ec209556 fixed conflicts 2015-04-02 21:03:31 -05:00
Anthony Scopatz
b085ccd9ca Merge branch 'wrywerytwreywery-pep8' 2015-04-02 20:56:58 -05:00
Anthony Scopatz
5a7f020c49 here is to hoping 2015-04-02 20:44:11 -05:00