Martin Kemp
6c5034164c
Fix cleanup script.
2015-05-17 22:42:00 +01:00
Martin Kemp
4651201b6c
Merge branch 'master' of https://github.com/bliker/cmder
2015-05-17 22:26:31 +01:00
Martin Kemp
3966ed9433
Merge branch 'development'
2015-05-17 22:25:08 +01:00
Martin Kemp
2383777418
Merge conflict
2015-05-17 22:24:38 +01:00
Martin Kemp
a18320c938
Improve warning text when posh-git is missing.
2015-05-17 22:13:23 +01:00
Martin Kemp
83a853bd52
Fix build script.
2015-05-17 22:13:04 +01:00
Martin Kemp
53efab127e
Update to VS2015.
2015-05-17 22:12:49 +01:00
Martin Kemp
4de72b68dd
Update ConEmu.xml for latest update.
2015-05-17 22:11:10 +01:00
Martin Kemp
f196375f53
Update to latest ConEmu.
2015-05-17 22:08:35 +01:00
Martin Kemp
696a0d7622
Merge branch 'development' of https://github.com/MartiUK/cmder into development
2015-04-30 11:49:25 +01:00
Martin Kemp
7217d5c536
Merge pull request #451 from MartiUK/development
...
Update sources.json
2015-04-02 13:03:22 +01:00
Martin Kemp
e549f88b00
Removed extra quotation mark
2015-04-02 12:02:34 +01:00
Martin Kemp
687fb72397
Update sources for 1.2
...
Updated sources.
2015-04-02 12:00:44 +01:00
Martin Kemp
a5968d3d49
Merge pull request #2 from bliker/development
...
Run PowerShell as default
2015-03-26 10:21:54 +00:00
Martin Kemp
aaf70a4d9f
Run PowerShell as default
2015-03-25 15:11:35 +00:00
Martin Kemp
717b9f990e
Write vendor version to .cmderver file
...
For a future feature.
2015-03-25 15:09:23 +00:00
Martin Kemp
4f0e51c6a8
Merge pull request #441 from Jackbennett/ps-register-cmder
...
Helper function using powershell to register the cmder context menu
2015-03-25 15:08:14 +00:00
Martin Kemp
520e7cfc0d
Merge pull request #440 from Jackbennett/proper-git-check
...
git and Posh-git check
2015-03-25 15:07:51 +00:00
Jack Bennett
84dc9c5f0c
Helper function using powershell to register the cmder context menu
...
Function must be run as an administrator since we're touching the
registry.
A neat by product is that users can now re-run this command and set custom
icons.
I'm not sure what the `%V` command does but it's not opening in the targeted
folder as yet.
The output is a little ugly at rpesent.
2015-03-25 14:34:25 +00:00
Jack Bennett
c466698d6b
Only write VCS Status if we're in a git repo
...
In an effort to speed up the prompt we will only call write-vcsstatus if
there is a .git folder in the current or any parent path recursively.
As this function is called every new prompt line it needs to be as fast as
possible.
2015-03-25 12:29:10 +00:00
Jack Bennett
18fc5e37c7
Check that git can really be used as well as posh-git
...
Explicitly call `import posh-git` because it doesn't have a module
manifest thus powershell can't autoload it when using a cmdlet.
At present the cmder repo doesn't try to download posh-git so it might be
missing from the users session.
2015-03-25 12:22:07 +00:00
Martin Kemp
2292348f95
Merge pull request #438 from vladimir-kotikov/development
...
Improves performance of prompt filtering
2015-03-22 02:46:52 +00:00
Vladimir Kotikov
2855a699a1
Removes error messages when getting repo status
...
When `get_git_status` fails the inner `os.execute` call print error
message to console. This removes all error messages fro such cases.
2015-03-22 00:42:40 +03:00
Vladimir Kotikov
d8c9d32cb2
Improve performance of git and mercurial prompt
...
This implements custom logic to detect if we're inside of working tree
and skips os calls if not. This will improve performance of prompt
handling, especially for mercurial prompt.
2015-03-22 00:42:40 +03:00
Martin Kemp
522a75835f
Merge pull request #434 from vladimir-kotikov/development
...
Preview PR for including external completions into Cmder
2015-03-20 21:38:06 +00:00
Vladimir Kotikov
b75b3239e7
Adds clink-completions as an external dependency
...
* Adds package to sources.json
* Merges all cmder's lua modules into one -> cmder.lua to exclude future conflicts
* Adds external modules loading logic
2015-03-20 22:29:34 +03:00
Martin Kemp
69eb956d65
Merge pull request #432 from Jackbennett/ps-revert-newline
...
Revert new line from commit dc834cc28f
2015-03-18 21:14:39 +00:00
Martin Kemp
6c074693a4
Merge pull request #431 from Jackbennett/ps-profile-modulePath
...
Leverage the Module Autoload path and save doing it ourselves.
2015-03-18 21:14:20 +00:00
Jack Bennett
dfa58acccc
Revert new line from commit dc834cc28f
...
This matches how cmd looks in conemu for cmder and PS seems to add some
padding around command output so I really don't see what the extra new
line is doing.
Saving dat precious vertical space.
2015-03-18 15:47:01 +00:00
Jack Bennett
e811c60ab2
Leverage the Module Autoload path and save doing it ourselves.
...
This should be faster too as we won't automatically import all functions
to the session. Powershell now knows where to look before declaring they
don't exist.
2015-03-18 15:33:55 +00:00
Martin Kemp
004761b32f
Delete all except git.exe, reducing final size
...
Using git-$COMMAND is no longer supported anyway.
2015-03-18 14:55:50 +00:00
Martin Kemp
8b8f98c078
Merge pull request #429 from Jackbennett/mend-build
...
Fix build script removing a trailing comma. Download into a temp folder.
2015-03-18 14:54:55 +00:00
Martin Kemp
58a89e779b
Merge pull request #430 from Jackbennett/native-ps
...
Adds support for PS 4.0 native hash command to remove a dependency
2015-03-18 14:54:31 +00:00
Jack Bennett
aad729eb87
Adds support for PS 4.0 native hash command to remove a dependency
...
PS 4.0 requires installing WMF 4.0 on windows 7, 8, Server 2012
Native on 8.1, Server 2012r2
2015-03-18 13:50:00 +00:00
Jack Bennett
2c184f8721
Fix build script removing a traling comma. Download into a temp folder.
...
I made a bad patch with the parameters syntax. I'm making the temp files
go into a subfolder as if the build script stop theres a .tmp that could
be accidentially tracked by source control.
2015-03-18 13:21:43 +00:00
Martin Kemp
3c289b455b
Initial git cleanup PS
...
It's not functional, yet.
2015-03-18 12:28:34 +00:00
Martin Kemp
66d5170514
Remove unnecessary binaries.
...
Just remember to add them in to the package.
2015-03-18 11:12:30 +00:00
Martin Kemp
b25e46d7a7
Merge pull request #364 from narnaud/pr-local-git
...
Prefer user installed git over cmder one.
2015-03-18 11:00:44 +00:00
Martin Kemp
60d3c67194
Merge pull request #324 from cgrail/patch-2
...
Border less window mode
2015-03-18 10:57:55 +00:00
Martin Kemp
34947c4f0f
Fix the /d flag
...
Was deleted in last commit.
2015-03-18 10:56:25 +00:00
Martin Kemp
3b637e9866
Merge branch 'glucas-alias-show' into development
2015-03-18 10:54:44 +00:00
Martin Kemp
efe244b5fa
Resolved conflict in alias.bat merge
2015-03-18 10:54:22 +00:00
Martin Kemp
aa9cb38672
Change clink matching style to default. Fixes #218
...
Users should change this to their preference, this is reverting it to
how it should be "out of the box".
2015-03-18 10:37:08 +00:00
Martin Kemp
7169f49fff
Merge pull request #311 from sescandell/fix-adminlaunch
...
FIX CMDER_ROOT for admin launch
2015-03-18 10:35:15 +00:00
Martin Kemp
021263d81c
Merge pull request #273 from LeoColomb/master
...
Fixes small Powershell' loader issues
2015-03-18 10:33:58 +00:00
Martin Kemp
5dbb84d78b
Build XP Compatible Binaries
...
Because people still use an operating system from 2001.
2015-03-18 10:16:40 +00:00
Kody Brown
1cea2c3278
Merge remote-tracking branch 'upstream/development' into development
2015-03-17 14:42:03 -06:00
Kody Brown
187156487e
Added code to check for the existence of a customized ini file named ConEmu-%COMPUTERNAME%.ini
, before checking for the standard ini file ConEmu.ini
.
2015-03-17 14:39:27 -06:00
Martin Kemp
c0dcce4880
Merge pull request #422 from ragekit/development
...
Added git shell task.
2015-03-16 12:14:23 +00:00
RageKit
4b2590bfd3
Added git shell task.
2015-03-15 14:00:46 +01:00