images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2024-09-20 21:04:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
860 Commits 9 Branches 38 Tags 6.6 MiB
75e6644d2a
Commit Graph

860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Staneck
d7f0407300 Merge pull request #1157 from winks/winks-patch-1 
Fix typo in init.bat
 2016-11-10 18:13:08 +01:00
Florian Anderiasch
ba99f5b66a Fix typo in init.bat 2016-11-10 18:04:37 +01:00
Vladimir Kotikov
a0e0adae8b Bump clink-completions to 0.3.2 2016-11-07 00:56:13 +01:00
Benjamin Staneck
46d5936806 ⬆️ Update Git to v2.10.2 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.10.2.windows.1
 2016-11-04 00:27:46 +01:00
Dax T Games
104033e58b Merge pull request #1109 from daxgames/user_conemu_cfg 
User conemu cfg
 2016-11-02 10:25:54 -05:00
Dax Games
4c522aa0c4 trigger push 2016-10-30 18:22:29 -05:00
Dax Games
d64f0e681e Merge branch 'master' of github.com:cmderdev/cmder into user_conemu_cfg 2016-10-30 18:20:07 -05:00
Martin Kemp
2b292f98de Merge pull request #1143 from panzer-planet/patch-1 
Fixed 3 typos
 2016-10-30 20:49:05 +00:00
Werner Roets
0b43758a34 Fixed 3 typos 2016-10-30 02:57:24 +02:00
Benjamin Staneck
e6d4609bf4 ⬆️ Update ConEmu to 161022 (stable) 
Changelog: https://conemu.github.io/blog/2016/10/22/Build-161022.html
 2016-10-23 22:24:07 +02:00
Benjamin Staneck
0de26571aa ⬆️ Update Git to v2.10.1 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.10.1.windows.1
 2016-10-23 22:23:58 +02:00
Martin Kemp
5597aa6038 Merge pull request #952 from Jackbennett/custom-prompt 
Custom prompt hooks protected from later overwriting
 2016-10-19 14:08:09 +01:00
Benjamin Staneck
425dc854ac Merge pull request #1131 from lamarqua/master 
Fix for slow startup under certain conditions (#1122)
 2016-10-17 16:01:05 +02:00
Adrien Lamarque
a78186f502 Fix for slow startup under certain conditions (#1122) 
Fixes #1122 by simply calling CreateProcess before the SendMessageTimeout
calls that are used to propagate environment variable changes.
 2016-10-14 23:36:22 +02:00
Benjamin Staneck
60aa0cee13 Merge pull request #1127 from cmderdev/development 
Development
 2016-10-11 10:08:42 +02:00
Benjamin Staneck
7750216d1a Merge pull request #1126 from gucong3000/patch-1 
fix error when path has a space
 2016-10-11 10:08:11 +02:00
刘祺
eb73f6f772 fix error when path has a space 2016-10-11 14:41:47 +08:00
Jackbennett
db909451c9 Version Check the Posh-Git module to allow module autoloading 
Posh-Git before this release does not export `Write-VcsStatus` thus
powershell's autoloading cannot find the reqired module for the function.

note that `get-module -listAvailable` can return an array of multiple
versions.
 2016-10-10 12:01:55 +01:00
Jackbennett
b349b19869 Describe why PS functions are called by namespace 
As the prompt function is called all the time, specifically namespace the
cmldets it uses to avoid them being hijacked in the user session.
 2016-10-10 10:30:01 +01:00
Martin Kemp
e0841eacc1 Merge pull request #963 from Jackbennett/default-tab-history 
Disable history switching behavior of ctrl+tab. Sequential switching.
 2016-10-10 00:44:05 +01:00
Benjamin Staneck
44e0a040bd ⬆️ Update Git to v2.10.1 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.10.1.windows.1
 2016-10-05 02:16:22 +02:00
Dax Games
5feccb3c7c added backup of ConEmu.xml to ./config/user-ConEmu.xml at cmder launch if it exists 2016-10-02 23:00:00 -05:00
Dax Games
abd7db99b6 added backup of ConEmu.xml to ./config folder at cmder launch if it exists 2016-10-02 22:16:22 -05:00
Dax Games
66c6d5bbb3 added ability to have a user-ConEmu.xml file in addition to the computer specific and default ConEmu.xml files 2016-10-02 21:50:56 -05:00
Dax T. Games
af586d5410 add use-ConEmu.xml 2016-10-02 18:34:40 -05:00
Alexandr
c8adf424e2 Added closing process in get_git_status (#1) 
After execution command: git add * git continues to operate without closing. The process does not stop.
 2016-09-27 22:59:09 +02:00
Martin Kemp
e36db3eb3d Merge pull request #1101 from alexandr-san4ez/development 
Added closing process in get_git_status
 2016-09-27 16:59:21 +01:00
Alexandr
27c571636d Added closing process in get_git_status (#1) 
After execution command: git add * git continues to operate without closing. The process does not stop.
 2016-09-27 18:48:23 +03:00
Benjamin Staneck
d144cd0fc2 ⬆️ Update ConEmu to 160914 (stable) 
Changelog: https://conemu.github.io/blog/2016/09/14/Build-160914.html
 2016-09-17 22:49:23 +02:00
Benjamin Staneck
bb312ad74b try --no-lock-index for Git 2016-09-17 22:48:02 +02:00
Benjamin Staneck
df7beff2ef ⬆️ Update ConEmu to 160828 (stable) 
Changelog: https://conemu.github.io/blog/2016/08/28/Build-160828.html
 2016-09-03 10:52:17 +02:00
Benjamin Staneck
b7bfe72303 ⬆️ Update Git to v2.10.0 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.10.0.windows.1
 2016-09-03 10:50:34 +02:00
Benjamin Staneck
490fae770c ⬆️ Update Git to v2.9.3 (2) 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.9.3.windows.2
 2016-08-25 21:51:17 +02:00
Benjamin Staneck
a6817faae6 Merge pull request #1082 from nverno/patch-1 
Update Readme.md
 2016-08-25 21:11:36 +02:00
nverno
a8450eb1d3 Update Readme.md 
just minor typos
 2016-08-25 03:00:31 -04:00
Benjamin Staneck
355df7a48a Merge pull request #1078 from orionlee/fix_bash_login_when_cmder_root_has_spaces 
Fix bash login when $CMDER_ROOT has spaces
 2016-08-21 20:23:20 +02:00
orionlee
5354b5f80f Further fix bash login when ${CMDER_ROOT} has spaces. 
Inspecting the script uncovers similar problems elsewhere
not encountered in my initial testing. They are fixed accordingly.
 2016-08-20 16:01:46 -07:00
orionlee
d095d6afd6 Fix bash login when ${CMDER_ROOT} has spaces. 
E.g., if ${CMDER_ROOT} is /c/Users/Foo Bar/cmder,
the following errors will occur:
  bash: pushd: /c/Users/Foo: No such file or directory
  bash: [: /c/Users/Foo: binary operator expected
  bash: /c/Users/Foo: No such file or directory
 2016-08-20 15:56:49 -07:00
Benjamin Staneck
832c1991e4 Merge pull request #1070 from janschulz/unicode_path_prompt 
Parse the original prompt for cwd and env names
 2016-08-15 16:40:35 +02:00
Benjamin Staneck
19672aafff ⬆️ Update Git to v2.9.2 
Release notes: https://github.com/git-for-windows/git/tree/v2.9.3.windows.1
 2016-08-14 04:59:27 +02:00
Jan Schulz
6b10771312 Parse the original prompt for cwd and env names 
clink.get_cwd() is returning a string which is differently encoded than what
clink.prompt.value expects. This results in garbled path names if the path
condains non-ASCII chars. The (arguable hacky) solution is to parse the old
prompt for the current directory (which breaks if the user sets a PROMPT env var
which is incompatible to the regex used here...).

Also parse out a environment name set by systems like virtualenv or conda: this
could be done more specifically by targeting each such system and using the
usually set environment variable but this would mean that we would have to do
that for each and every such system out there and that is probably not a sane
idea...
 2016-08-09 13:45:36 +02:00
Benjamin Staneck
13fd41eb82 change how we ask hg for the status 
closes #1035
Thanks @raleighr3
 2016-07-30 00:36:32 +02:00
Benjamin Staneck
07fb26c4a5 Merge pull request #1042 from daxgames/kill_ssh_agent 
Added kill ssh-agent to build.ps1
 2016-07-18 01:47:45 +02:00
Dax T. Games
13c474b768 added kill ssh-agent to build.ps1 2016-07-17 18:28:38 -05:00
Benjamin Staneck
f2641e4cd2 ⬆️ Update Git to v2.9.2 2016-07-17 01:09:06 +02:00
Benjamin Staneck
6a0ea28d22 add .github_changelog_generator to .gitignore 2016-07-14 10:51:01 +02:00
Benjamin Staneck
04c7bb7da8 update changelog 2016-07-14 09:52:27 +02:00
Benjamin Staneck
317834316a add hashes.txt to artifacts 2016-07-14 09:28:13 +02:00
Benjamin Staneck
4e90303511 ⬆️ Update ConEmu to 160710 (stable) 
Changelog: https://conemu.github.io/blog/2016/07/10/Build-160710.html
 2016-07-14 09:19:01 +02:00
Benjamin Staneck
0379dc1d0d Merge pull request #1037 from cmderdev/development 
Development into Master
 2016-07-14 07:54:42 +02:00