images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2024-11-10 17:59:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
650 Commits 9 Branches 38 Tags 6.6 MiB
d7f0407300
Commit Graph

650 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Staneck
5f83cb3c64 Merge pull request #1014 from JoshuaKGoldberg/development 
Added rainbow icons
 2016-06-30 23:54:10 +02:00
Josh Goldberg
9a3eab9bf8 Added rainbow icons 2016-06-30 09:04:29 -07:00
Benjamin Staneck
1dddbcff05 Revert "Fix missing "\" when building dirpath to psmodules" 
This reverts commit 6978bb7417.
 2016-06-30 11:41:17 +02:00
Benjamin Staneck
924ab12aeb we don't need a second function for that. 2016-06-30 02:53:00 +02:00
Benjamin Staneck
6a474dd624 make launcher run ConEmu64 on 64-bit Windows 
It will now run ConEmu64.exe on 64-bit Windows and ConEmu.exe on 32-bit Windows.

fixes #191
 2016-06-30 01:55:13 +02:00
Benjamin Staneck
14a6e5953c Merge pull request #1011 from MoFo88/git_branch_colouring 
Fix git branch colouring
 2016-06-28 18:37:34 +02:00
Łukasz Papierz
9c0ad9fd81 Fix git branch name colouring 
Colouring fixed when there are some changes in a branch
 2016-06-28 14:13:35 +02:00
Benjamin Staneck
84d44b18f2 Merge pull request #961 from janschulz/prompt-in-clink 
cmd: change the prompt in lua
 2016-06-21 23:10:59 +02:00
Jan Schulz
a542f4e20c cmd: change the prompt in lua 
This keeps the PROMPT variable as is and changes the prompt to the cmder style
in the clink code.

This has two advantages:

* opening a cmd in a cmder session will now show the old prompt code instead of
  a ugly raw prompt without the replacements. This led to ugly output when a
  batch file echoed their content (e.g `conda build recipe/`).

* when a command rewrites the prompt (e.g. an activate in a virtualenv), these
  command sometimes simply overwrites the PROMPT so that the cmder enhancements
  were not anymore in place. Now we simply don't care and overwrite it with our
  stuff in the clink part. This might mean that a user has to install a lua
  script so that e.g. conda environments are visible on the prompt.
 2016-06-21 13:33:49 +02:00
Benjamin Staneck
e5611af7be Update README.md 
change badge style
 2016-06-15 22:58:45 +02:00
Benjamin Staneck
999b5af29a ⬆️ Update ConEmu to 160612 (stable) 
Changelog: https://conemu.github.io/blog/2016/06/12/Build-160612.html
 2016-06-14 18:21:40 +02:00
Benjamin Staneck
87210ae7ca ⬆️ Git to 2.9.0 
Changelog: https://github.com/git-for-windows/git/tree/v2.9.0.windows.1
 2016-06-14 17:34:19 +02:00
Benjamin Staneck
75deb4f945 Merge pull request #992 from vladimir-kotikov/patch-5 
Bump clink-completions to 0.3.1
 2016-06-11 00:15:18 +02:00
Vladimir Kotikov
6a080a1284 Bump clink-completions to 0.3.1 2016-06-11 01:07:47 +03:00
Benjamin Staneck
d014d785b0 ⬆️ Update to Git to 2.8.4 2016-06-09 00:18:56 +02:00
Benjamin Staneck
346680b52e Merge pull request #974 from janschulz/fix_gitbranch 
Fix git branch name never shown as dirty
 2016-06-02 20:14:15 +02:00
Jan Schulz
c19412045c Fix git branch name never shown as dirty 
The problem was that io.popen() returns a file and not the return code of the
called program.

The new code was inspired by
http://stackoverflow.com/a/14031974/1380673
 2016-06-02 12:45:07 +02:00
Benjamin Staneck
2b047e8683 Update README.md 
link to the appyevor project
 2016-06-01 17:45:17 +02:00
Jackbennett
91c0d310f2 Disable history switching behavior of ctrl+tab. Sequential switching. 2016-05-25 11:27:17 +01:00
Jackbennett
43af717d44 Support spaces in package names to extract 2016-05-25 10:13:47 +01:00
Jack
7a37d37a4e Merge pull request #962 from Jackbennett/PS-register 
Register cmder in the context menu from powershell
 2016-05-24 16:00:04 +01:00
Jackbennett
a07062d10d Remove the Registry hive after making the changes 2016-05-24 15:50:43 +01:00
Jackbennett
2d812f1d02 Quiet the function output of useless information 2016-05-24 15:49:30 +01:00
Jackbennett
49cc35bccf Add unregister function, Add 'Background' Registry keys 
Adding the registry keys that match the c++ code in the cmder.exe call
/REGISTER ALL and /UNREGISTER ALL. USER is untested.
 2016-05-24 15:44:54 +01:00
Jackbennett
67de97a492 Indent parameters for Path clarity 2016-05-24 15:43:25 +01:00
Benjamin Staneck
7ca9d8e9d6 Update ConEmu to 160515 2016-05-17 23:20:16 +02:00
Benjamin Staneck
61e795c02d Merge pull request #945 from daxgames/fix_aliases_update 
Added :verbose-output subroutine, made aliases update more functional
 2016-05-08 15:56:58 +02:00
Benjamin Staneck
f652d301e7 Merge pull request #946 from vladimir-kotikov/patch-4 
Update clink-completions to 0.3.0
 2016-05-08 02:08:13 +02:00
Vladimir Kotikov
a286e52a44 Update completions to 0.3.0 2016-05-08 02:42:48 +03:00
Dax T. Games
c49c27fb88 allow setting verbose-output variable outside init.bat 2016-05-07 18:10:44 -05:00
Dax T. Games
e212ee36a2 Added :verbose-output subroutine, made aliases update more functional 2016-05-07 14:32:33 -05:00
Benjamin Staneck
fc7f1ca3dc Merge pull request #943 from daxgames/fix_git 
fixed git not working in cmder cmd session and added some comments
 2016-05-07 18:41:22 +02:00
Dax T. Games
537c658eb4 fixed git not working in cmder cmd session and added some comments 2016-05-07 10:56:08 -05:00
Benjamin Staneck
4e9882eea4 Update Git to 2.8.2 
Release notes: https://github.com/git-for-windows/git/releases/tag/v2.8.2.windows.1
 2016-05-06 18:10:00 +02:00
Benjamin Staneck
d4339ae526 Merge pull request #941 from janschulz/init.bat 
More variable quoting in init.bat
 2016-05-06 15:25:10 +02:00
Jan Schulz
055a974257 More variable quoting in init.bat 
There were problems when a path contained a parenthesis like `C:\temp\test (test)\`

As a precaution, quote all variables when they are used in echo or set.
 2016-05-06 15:12:07 +02:00
Benjamin Staneck
05fb4368cc Merge pull request #940 from janschulz/init.bat 
Add quotes around all variables
 2016-05-06 00:35:02 +02:00
Jan Schulz
1bf5503bea Add quotes around all variables 
This should prevent errors like
https://github.com/cmderdev/cmder/issues/935
https://github.com/cmderdev/cmder/issues/937

I've no idea why this happens, but it shouldn't hurt anyway...
 2016-05-05 22:40:33 +02:00
Benjamin Staneck
b47d04f75c Merge pull request #916 from liftir/patch-1 
Fix missing "\" when building dirpath to psmodules
 2016-04-10 06:28:22 +02:00
liftir
6978bb7417 Fix missing "\" when building dirpath to psmodules 
Join-Path won't add "\"'s without the use of a delimeter.  In this case there is no delimiter and as a result the script will fail when it tries to look up $CmderModulePath.
 2016-04-08 21:21:38 -04:00
Benjamin Staneck
7eb7255741 Merge pull request #865 from janschulz/where_is_git 
better git path handling
 2016-04-08 18:59:58 +02:00
Jan Schulz
6c6268e968 Remove @ in new code, echo off is enough 2016-04-08 16:55:49 +02:00
Jan Schulz
1e7f15100f PS: also add cmd and bin version of git to the path 
This ensures that the "normal" path entry (cmd) is first and bash is still reachable via the bin path.
 2016-04-08 16:53:38 +02:00
Jan Schulz
fbccc6b790 init.bat: remove GIT\bin from path 
The only reason was bash but bash.exe is also in <GIT>\usr\bin.
 2016-04-08 16:53:38 +02:00
Jan Schulz
2ccc06e639 init.bat: integrate the unix commands at the end of PATH 
Some unix commands shadow windows commands and therefor the unix commands should
be at the end of the PATH
 2016-04-08 16:53:38 +02:00
Jan Schulz
182629d59a init.bat: check for git in path 
The idea is:
* if the users points as to a specific git, use that
* test if a git is in path and if yes, use that
* last, use our vendored git

We don't make any attempt to guess a different location, if a user wants their
own git install, they have to choose "add git to path".

Also check that we have a recent enough version of git (e.g. test for
<GIT>\cmd\git.exe)
 2016-04-08 16:51:53 +02:00
Benjamin Staneck
fc963b1342 Merge pull request #911 from daxgames/git_2.8.1 
upgraded git to 2.8.1
 2016-04-05 22:35:32 +02:00
Dax T. Games
24b1bb93c0 upgraded git to 2.8.1 2016-04-05 14:27:12 -05:00
Benjamin Staneck
528d0ce734 Merge pull request #909 from daxgames/http_proxy 
Added proxy support
 2016-04-05 16:48:05 +02:00
Dax T. Games
5068188059 Added proxy support 2016-04-05 09:27:53 -05:00