Commit graph

355 commits

Author SHA1 Message Date
Anthony Scopatz
cc0f7f3033 Merge pull request #1185 from mitnk/fix-prompt-and-title
Fix crash caused by malformed prompt or title
2016-06-09 02:45:42 -04:00
Anthony Scopatz
51518756da merge and fix conflict 2016-06-09 01:44:34 -04:00
Hugo Wang
6dc835a9fd fix crase caused by malformed prompt or title 2016-06-09 10:51:50 +08:00
adam j hartz
08828db7cf update changelog 2016-06-08 20:59:58 -04:00
adam j hartz
ef70c53bb9 Merge branch 'master' into fuzzy_completions 2016-06-08 20:57:52 -04:00
adam j hartz
d36eb8066d Merge branch 'cryzed-feature-1169' 2016-06-08 20:25:08 -04:00
adam j hartz
be54245ad3 merge from cryzed:fix-1173 into master 2016-06-08 20:09:08 -04:00
cryzed
2fcc19e89c Move changelog line to current developments 2016-06-09 01:57:08 +02:00
cryzed
cbffccf57a Move changelog line to current developments 2016-06-09 01:56:37 +02:00
cryzed
d0fa91daf9 Implement suggestions made on IRC and GitHub 2016-06-09 01:55:53 +02:00
cryzed
d9408c4335 Added line to changelog 2016-06-09 01:35:07 +02:00
cryzed
218e94cecb Added line to changelog 2016-06-09 01:31:27 +02:00
cryzed
f2b0a35023 Added line to changelog 2016-06-09 01:29:45 +02:00
adam j hartz
5130782777 version bump to 0.3.4 2016-06-08 14:25:52 -04:00
adam j hartz
d027432e3b remove typo completion, add subsequence completion 2016-06-08 01:29:15 -04:00
Anthony Scopatz
20db4bbe6e Merge branch 'master' into vc 2016-06-08 01:15:54 -04:00
Anthony Scopatz
3f9aaffd29 added cl entries 2016-06-08 00:58:37 -04:00
adam j hartz
97792410a4 add tab completion for the completer alias 2016-06-07 23:43:48 -04:00
adam j hartz
ca939243d3 associated changelog entry 2016-06-07 23:42:07 -04:00
adam j hartz
61a9b47252 Merge branch 'defaults_on_win' of https://github.com/scopatz/xonsh into melund-defaults_on_win 2016-06-07 22:47:45 -04:00
adam j hartz
e383043803 changelog 2016-06-07 20:50:13 -04:00
adam j hartz
27e8409760 merge from master 2016-06-07 17:28:50 -04:00
adam j hartz
ec7874e537 merge from master 2016-06-07 16:56:42 -04:00
Ollie Terrance
2dd2abcf36 Add Cygwin pthread_sigmask note to changelog 2016-06-07 19:22:20 +01:00
Morten Enemark Lund
aebaa1209f Add entries to CHANGELOG.rst 2016-06-07 08:24:42 +02:00
adam j hartz
e72ee3c11e changelog 2016-06-07 00:00:56 -04:00
adam j hartz
2076aac5de add changelog entry 2016-06-06 21:57:48 -04:00
Anthony Scopatz
46894f201a updated cl 2016-06-06 13:59:57 -04:00
Anthony Scopatz
73b79c91be Merge branch 'master' into dist 2016-06-06 13:57:58 -04:00
adam j hartz
1bea4cae2c changelog entry 2016-06-06 13:55:24 -04:00
adam j hartz
1c323df5de version bump to 0.3.3 2016-06-06 12:00:49 -04:00
Hugo Wang
626a0b7a88 typo fix 2016-06-06 20:19:58 +08:00
Anthony Scopatz
96b798df54 Merge branch 'fix-killpg-crash-on-osx' of https://github.com/mitnk/xonsh into mitnk-fix-killpg-crash-on-osx 2016-06-06 00:43:05 -04:00
adam j hartz
7dc3fb35df merge from master, replace pygments lexer 2016-06-06 00:31:31 -04:00
Hugo Wang
291441e1b2 typo fix 2016-06-06 12:28:19 +08:00
Hugo Wang
7598eb11a3 Merge branch 'master' of https://github.com/scopatz/xonsh into fix-killpg-crash-on-osx
Conflicts:
	CHANGELOG.rst
2016-06-06 12:26:48 +08:00
Hugo Wang
ae1d1293eb updated changelog 2016-06-06 12:25:01 +08:00
Anthony Scopatz
b72308e8d4 changelog 2016-06-05 22:51:06 -04:00
adam j hartz
1272880ad9 CHANGELOG 2016-06-05 19:05:31 -04:00
adam j hartz
5d5a1d2cee CHANGELOG entry 2016-06-05 19:03:26 -04:00
adam j hartz
d22ca695e4 add changelog entry 2016-06-04 23:07:22 -04:00
Anthony Scopatz
84f9d49e2e Merge branch 'faster_bash_completers' of https://github.com/adqm/xonsh into adqm-faster_bash_completers 2016-06-04 19:32:48 -04:00
Gil Forsyth
4ac3dd2b7c update changelog 2016-06-04 15:46:02 -04:00
adam j hartz
9c4b476b7a merge from master 2016-06-04 13:38:09 -04:00
Morten Enemark Lund
78647ff77a Added entry to CHANGELOG.rst 2016-06-03 20:15:52 +02:00
adam j hartz
3f17eda3e8 add CHANGELOG entry 2016-06-03 11:38:43 -04:00
adam j hartz
278e16af82 merge from master 2016-06-02 17:22:44 -04:00
Anthony Scopatz
fe69d18e5e added question mark test 2016-06-02 17:12:46 -04:00
adam j hartz
45b93f17eb another CHANGELOG update 2016-06-02 12:08:56 -04:00
adam j hartz
0bf6aee51f add changelog entry for other change (lazily loading ptk) 2016-06-02 08:43:34 -04:00