adam j hartz
|
40eafb7ec9
|
attempted fix for #127
|
2015-03-22 13:17:23 -04:00 |
|
Anthony Scopatz
|
9e149482ed
|
Merge branch 'SmartViking-master'
|
2015-03-22 11:10:33 -05:00 |
|
Mattias Ugelvik
|
45005cddf2
|
Merge branch 'master' of https://github.com/scopatz/xonsh
Conflicts:
xonsh/built_ins.py
|
2015-03-22 16:51:31 +01:00 |
|
Anthony Scopatz
|
934f3ab974
|
Merge pull request #123 from juanpabloaj/readme-travis
travis badge to README
|
2015-03-22 10:44:03 -05:00 |
|
Anthony Scopatz
|
037180c693
|
Merge branch 'wrywerytwreywery-shebang'
|
2015-03-22 10:41:33 -05:00 |
|
Anthony Scopatz
|
7e3d353963
|
Merge branch 'shebang' of https://github.com/wrywerytwreywery/xonsh into wrywerytwreywery-shebang
|
2015-03-22 10:39:36 -05:00 |
|
Anthony Scopatz
|
ce327ccd7b
|
Merge branch 'wrywerytwreywery-dirstack'
|
2015-03-22 10:36:12 -05:00 |
|
Anthony Scopatz
|
8e4fb9d53a
|
Merge branch 'dirstack' of https://github.com/wrywerytwreywery/xonsh into wrywerytwreywery-dirstack
|
2015-03-22 10:34:53 -05:00 |
|
Anthony Scopatz
|
0b4d77a212
|
Merge branch 'nl'
|
2015-03-22 10:28:19 -05:00 |
|
Anthony Scopatz
|
524583683e
|
Merge branch 'wrywerytwreywery-syntax'
|
2015-03-22 10:27:04 -05:00 |
|
Anthony Scopatz
|
2691af884b
|
Merge branch 'syntax' of https://github.com/wrywerytwreywery/xonsh into wrywerytwreywery-syntax
|
2015-03-22 10:24:56 -05:00 |
|
JuanPablo
|
582e1024ff
|
travis badge to README
|
2015-03-21 23:41:06 -03:00 |
|
Mattias Ugelvik
|
a99c747bb2
|
Updated tutorial to reflect changes
|
2015-03-22 03:34:02 +01:00 |
|
Mattias Ugelvik
|
1483159dd2
|
Recursive alias evaluation
|
2015-03-22 02:46:33 +01:00 |
|
adam j hartz
|
6d1bc7b525
|
update tests for new syntax
|
2015-03-21 21:37:00 -04:00 |
|
adam j hartz
|
1f7024e284
|
dirstack: small refactoring
|
2015-03-21 21:13:11 -04:00 |
|
adam j hartz
|
1cf4f44b14
|
Merge branch 'syntax' of https://github.com/wrywerytwreywery/xonsh into syntax
|
2015-03-21 21:04:37 -04:00 |
|
Anthony Scopatz
|
cf286e0b7a
|
Merge branch 'wrywerytwreywery-imag'
|
2015-03-21 19:59:05 -05:00 |
|
Anthony Scopatz
|
c2bed0ffbb
|
Merge branch 'imag' of https://github.com/wrywerytwreywery/xonsh into wrywerytwreywery-imag
|
2015-03-21 19:57:45 -05:00 |
|
adam j hartz
|
8e3af41a53
|
dirstack: PEP8 fixes
|
2015-03-21 20:50:06 -04:00 |
|
adam j hartz
|
4e9fe71394
|
pushd bugfix
|
2015-03-21 20:48:50 -04:00 |
|
adam j hartz
|
fca90ec0dd
|
maximum dirstack size
|
2015-03-21 20:29:28 -04:00 |
|
adam j hartz
|
81d3616c46
|
add quiet mode to pushd and popd
|
2015-03-21 20:27:54 -04:00 |
|
adam j hartz
|
4c91c84559
|
documentation for dirstack module
|
2015-03-21 20:15:26 -04:00 |
|
Anthony Scopatz
|
b635ac23e9
|
fix for further nesting
|
2015-03-21 19:04:30 -05:00 |
|
adam j hartz
|
6bd814c8b9
|
documentation for dirstack module
|
2015-03-21 20:01:10 -04:00 |
|
adam j hartz
|
c2496fc596
|
use bash dirstack convention by default, and support PUSHD_MINUS
|
2015-03-21 19:54:46 -04:00 |
|
adam j hartz
|
84323fd3df
|
cleanup
|
2015-03-21 19:54:13 -04:00 |
|
Anthony Scopatz
|
ca6e217291
|
nested sets and dicts
|
2015-03-21 18:49:53 -05:00 |
|
Anthony Scopatz
|
8db48f7083
|
new dict nesting
|
2015-03-21 18:49:53 -05:00 |
|
Anthony Scopatz
|
b2215badd1
|
some nesting. some to work out
|
2015-03-21 18:49:53 -05:00 |
|
Anthony Scopatz
|
afaed78cdf
|
Merge branch 'wrywerytwreywery-git_branch'
|
2015-03-21 18:38:30 -05:00 |
|
Anthony Scopatz
|
e7dd4eb592
|
minor cond update
|
2015-03-21 18:38:03 -05:00 |
|
adam j hartz
|
7214087420
|
Merge branch 'dirstack' of https://github.com/wrywerytwreywery/xonsh into dirstack
|
2015-03-21 19:36:50 -04:00 |
|
Anthony Scopatz
|
df86c6740b
|
Merge branch 'git_branch' of https://github.com/wrywerytwreywery/xonsh into wrywerytwreywery-git_branch
|
2015-03-21 18:36:20 -05:00 |
|
adam j hartz
|
d17545153d
|
some reformatting
|
2015-03-21 19:28:45 -04:00 |
|
adam j hartz
|
a88921b866
|
complex number tests
|
2015-03-21 19:10:57 -04:00 |
|
Anthony Scopatz
|
c48b255d02
|
fix up rc to not have to end in a newline
|
2015-03-21 18:09:58 -05:00 |
|
adam j hartz
|
3cb3aeeb0e
|
only catch CalledProcessError when determining git branch
|
2015-03-21 18:58:17 -04:00 |
|
Anthony Scopatz
|
eab6485f6a
|
Merge branch 'wrywerytwreywery-string_parse'
|
2015-03-21 17:45:45 -05:00 |
|
adam j hartz
|
09df2b4c90
|
simpler check for executable bit
|
2015-03-21 16:38:55 -04:00 |
|
adam j hartz
|
32fc94a2ba
|
allow running scripts with shebang lines
|
2015-03-21 16:31:14 -04:00 |
|
adam j hartz
|
632abb9d04
|
fix string regex
|
2015-03-21 14:29:14 -04:00 |
|
adam j hartz
|
389c14679a
|
add support for imaginary numbers
|
2015-03-21 11:51:03 -04:00 |
|
adam j hartz
|
5d465e343b
|
remove superfluous environment variable
|
2015-03-20 22:43:40 -04:00 |
|
adam j hartz
|
b35b91b7cf
|
PEP8 fixes
|
2015-03-20 22:41:45 -04:00 |
|
adam j hartz
|
d4a1cdb3e1
|
implemented popd
|
2015-03-20 22:26:43 -04:00 |
|
adam j hartz
|
217d47dd0e
|
make the default aliases available to dirstack.py
|
2015-03-20 22:12:45 -04:00 |
|
adam j hartz
|
5b12120bbc
|
implement pushd
|
2015-03-20 22:12:25 -04:00 |
|
Mattias Ugelvik
|
d70a554468
|
Tabulated command suggestions, and tried to improve readability here and there
|
2015-03-20 23:58:47 +01:00 |
|