4818 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Anthony Scopatz	4eb39e033d	error token	2016-08-31 00:47:23 -04:00
Anthony Scopatz	d392e9e9d6	fixed minor conflict	2016-08-31 00:21:27 -04:00
Anthony Scopatz	b2663358f5	nested subporcess macros	2016-08-30 21:04:03 -04:00
Anthony Scopatz	c9b6667aec	some typos	2016-08-29 19:35:09 -04:00
Anthony Scopatz	e700027466	Merge branch 'master' into msub	2016-08-29 19:33:49 -04:00
Anthony Scopatz	2f11ac657b	Merge pull request #1648 from astronouth7303/vox-events ... Add events to Vox	2016-08-29 13:09:24 -04:00
Anthony Scopatz	705d326fe4	Merge branch 'msub' into mcont	2016-08-29 12:17:43 -04:00
Anthony Scopatz	3f5882d63d	Merge branch 'master' into msub	2016-08-29 12:17:18 -04:00
Anthony Scopatz	1f5a8e9912	Merge pull request #1651 from laerus/linuxguide ... linux guide update	2016-08-29 12:12:23 -04:00
laerus	70b802da33	linux guide update	2016-08-29 15:56:43 +03:00
Anthony Scopatz	5f5aa2f45b	trouble with xml block	2016-08-29 01:10:57 -04:00
Jamie Bliss	2e24b9a698	Deal with leading backslash, too	2016-08-28 23:34:11 -04:00
Anthony Scopatz	e87021a585	enter_macro() call	2016-08-28 23:16:56 -04:00
Anthony Scopatz	2014f13f9a	many suite tests	2016-08-28 16:17:51 -04:00
Anthony Scopatz	4589a4408d	have simple version too	2016-08-28 16:06:01 -04:00
Anthony Scopatz	c2b9fd34b0	more tests and fixes	2016-08-28 15:30:44 -04:00
Anthony Scopatz	c9a652a526	initially working with!	2016-08-28 15:13:03 -04:00
Anthony Scopatz	61879bab5f	prelime enter_macro()	2016-08-28 14:13:56 -04:00
Anthony Scopatz	80c72a8348	Merge branch 'msub' into mcont	2016-08-28 13:47:43 -04:00
Anthony Scopatz	6a85244487	Merge branch 'master' into msub	2016-08-28 13:47:21 -04:00
Anthony Scopatz	2a3254f387	some minor API changes	2016-08-28 13:46:05 -04:00
Jamie Bliss	d8bc83cd51	Add some documentations	2016-08-28 13:43:08 -04:00
Gil Forsyth	5726735604	Merge pull request #1598 from xonsh/m ... Function Macros	2016-08-28 13:43:03 -04:00
Jamie Bliss	0d791d1bea	Add events to vox.	2016-08-28 13:37:23 -04:00
Anthony Scopatz	e19a0aa1e5	some copy edits from @gforsyth, I shouldn't write docs while jet lagged	2016-08-28 13:11:36 -04:00
Anthony Scopatz	db4b83d23b	some macro updates	2016-08-28 13:08:45 -04:00
Anthony Scopatz	9b73b4343d	Merge pull request #1646 from xonsh/emfixes ... Hot fix for pytest events	2016-08-28 11:03:56 -04:00
Anthony Scopatz	cdea36baa9	Merge branch 'm' into msub	2016-08-28 10:34:46 -04:00
Anthony Scopatz	bff2ccb6d1	Merge branch 'emfixes' into m	2016-08-28 10:33:56 -04:00
Anthony Scopatz	5985c3d33b	hot fix for pytest events	2016-08-28 10:32:10 -04:00
Anthony Scopatz	78a87d0304	some emergency fixup	2016-08-28 09:57:31 -04: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	27c0d3f1e7	Merge pull request #1642 from astronouth7303/events-chdir ... Add `on_chdir` Event	2016-08-28 09:29:44 -04:00
Anthony Scopatz	dc528d3b6e	Merge pull request #1645 from astronouth7303/events-typotest ... Add test to detect event typos	2016-08-28 09:28:51 -04:00
Anthony Scopatz	68476835b8	Merge pull request #1641 from astronouth7303/events-docs ... [WIP] Events Documentation	2016-08-28 09:26:42 -04:00
Jamie Bliss	0fcf737e08	Actually finish that paragraph.	2016-08-27 23:29:23 -04:00
Jamie Bliss	74c423f215	Expand on events under the hood some.	2016-08-27 23:27:52 -04:00
Jamie Bliss	e446c63e60	Got something usable.	2016-08-27 23:20:44 -04:00
Jamie Bliss	8e537aaa05	Typo	2016-08-27 23:16:11 -04:00
Jamie Bliss	e01b6a0919	Attempted advanced events	2016-08-27 23:10:24 -04:00
Jamie Bliss	d14a4bf938	Add module API docs	2016-08-27 23:00:50 -04:00
Jamie Bliss	0313026036	Update module docstring	2016-08-27 23:00:38 -04:00
Jamie Bliss	c9ad375f8d	Some interlinking	2016-08-27 22:38:12 -04:00
Jamie Bliss	ce61c59d4b	Do some fixed-width formatting	2016-08-27 22:29:11 -04:00
Jamie Bliss	3721204304	Add an autogenerated events listing	2016-08-27 22:25:29 -04:00
Jamie Bliss	0ad9a2e2ab	Add test to detect event typos	2016-08-27 21:44:26 -04:00
Jamie Bliss	ab13740e13	PEP8	2016-08-27 21:24:27 -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