Commit graph

284 commits

Author SHA1 Message Date
laerus
2bec3decd4 more info on failure 2016-09-05 22:36:12 +03:00
laerus
1249aed7a2 fail on single graves 2016-09-05 21:27:06 +03:00
Morten Enemark Lund
a6efcf2dad Merge pull request #1671 from xonsh/consist
Macro Consistency
2016-09-03 07:08:07 +02:00
Anthony Scopatz
37f86d0a84 consist news 2016-09-02 19:32:48 -04:00
BlahGeek
53856ca493 add changelog 2016-09-02 23:58:39 +08:00
Konstantinos Tsakiltzidis
e0185dd2be Merge pull request #1654 from xonsh/mcont
Context Manager Macros
2016-09-02 17:03:39 +03:00
laerus
c2b7e50d45 history tutorial and a bug fix 2016-09-02 13:33:45 +03:00
Anthony Scopatz
4f1cc49e37 resolved news conflict 2016-09-01 20:10:29 -04:00
Anthony Scopatz
e10c38decc version bump to 0.4.6 2016-09-01 19:48:09 -04:00
Anthony Scopatz
991104dd30 Merge pull request #1658 from bobhy/misc_fix
Misc fix - support subprocess running from different drive letter than PWD (on windows)
2016-09-01 19:44:01 -04:00
Anthony Scopatz
48ff3d3754 fixed conflict 2016-09-01 19:33:01 -04:00
Morten Enemark Lund
b162552d6d Add news entry 2016-09-01 11:57:18 +02:00
Morten Enemark Lund
05064a222d Merge pull request #1410 from bobhy/winuncpushd
Winuncpushd
2016-09-01 08:51:22 +02:00
Morten Enemark Lund
e671c72f1f Merge pull request #1608 from bobhy/track_wd
Track working directory changes in invoked commands
2016-09-01 08:47:09 +02:00
Anthony Scopatz
6774bcfca2 Merge branch 'pr-params' of https://github.com/rbignon/xonsh into rbignon-pr-params 2016-08-31 23:28:47 -04:00
Bob Hyman
d9bb2088c0 cleanup for PR 2016-08-31 21:24:38 -04:00
Bob Hyman
33c68e3757 Merge branch 'master' into track_wd 2016-08-31 21:21:25 -04:00
Bob Hyman
416dfa9ad4 Merge branch 'master' into misc_fix 2016-08-31 21:16:08 -04:00
Bob Hyman
6ec861ce35 more cleanup 2016-08-31 20:40:23 -04:00
Bob Hyman
51fdd28dc4 revert unintended changes 2016-08-31 20:32:33 -04:00
Bob Hyman
13912e90b9 manual merge 2016-08-31 20:09:14 -04:00
Anthony Scopatz
a0e2d9a2d4 fixed conflicts 2016-08-31 01:37:14 -04:00
Anthony Scopatz
bdca28c91d docs for with! 2016-08-31 01:31:45 -04:00
Konstantinos Tsakiltzidis
9754098e42 Merge pull request #1644 from xonsh/msub
Subprocess Macros
2016-08-31 04:00:07 +03:00
Anthony Scopatz
914d6038ec Merge pull request #1643 from xonsh/better_ptk_completion_display
Better ptk completion display
2016-08-29 23:10:31 -04:00
Konstantinos Tsakiltzidis
0b27499490 Merge pull request #1386 from xonsh/test_xsh
Collecting `test*.xsh` files when testing
2016-08-30 03:01:36 +03:00
Anthony Scopatz
c147feb884 Merge pull request #1640 from laerus/hist
History indexing API
2016-08-29 19:38:11 -04:00
Anthony Scopatz
3f5882d63d Merge branch 'master' into msub 2016-08-29 12:17:18 -04:00
laerus
1b948bdb76 Merge branch 'master' of https://github.com/xonsh/xonsh into hist 2016-08-29 16:52:36 +03:00
laerus
40dcc4d7d5 news fix 2016-08-29 16:38:29 +03:00
laerus
70b802da33 linux guide update 2016-08-29 15:56:43 +03:00
laerus
500963ae8b get_portions 2016-08-29 13:42:40 +03:00
Morten Enemark Lund
06ea1dac73 Update changelog 2016-08-29 08:48:28 +02:00
Morten Enemark Lund
eb79dd119a Added a changelog entry 2016-08-29 08:47:56 +02:00
laerus
494e0dc81f Merge branch 'master' of https://github.com/xonsh/xonsh into hist 2016-08-28 18:22:12 +03:00
Romain Bignon
ddfa4e1e59 add changelog 2016-08-28 16:24:43 +02:00
Anthony Scopatz
a884eec931 Merge branch 'm' into msub 2016-08-28 09:30:32 -04:00
Anthony Scopatz
2be49eab81 Merge branch 'master' into m 2016-08-28 09:30:09 -04:00
Anthony Scopatz
68476835b8 Merge pull request #1641 from astronouth7303/events-docs
[WIP] Events Documentation
2016-08-28 09:26:42 -04:00
laerus
628f353e37 Merge branch 'master' into hist 2016-08-28 15:41:08 +03:00
Gil Forsyth
0223905752 fix news entry 2016-08-27 21:32:09 -04:00
Anthony Scopatz
4dda6d3fce fixed more test conflicts 2016-08-27 21:15:10 -04:00
Anthony Scopatz
0f70303624 fixed conflicts with tests 2016-08-27 21:13:57 -04:00
Anthony Scopatz
5e68e536e8 Merge pull request #1592 from xonsh/more_syntax_errors
Handle More Syntax Errors
2016-08-27 21:11:58 -04:00
Anthony Scopatz
d30bcf97ce a few more 2016-08-27 20:02:45 -04:00
Gil Forsyth
fdddaba884 add news entry 2016-08-27 17:24:21 -04:00
Jamie Bliss
866725dd2b Speculative url 2016-08-27 11:24:43 -04:00
Jamie Bliss
6990d29ba5 Basic events newsitem 2016-08-27 11:13:56 -04:00
laerus
e7540488f7 history magic 2016-08-27 17:30:53 +03:00
Anthony Scopatz
a78ada5c3f fixed merge conflicts 2016-08-27 10:19:42 -04:00