Commit Graph

972 Commits

Author SHA1 Message Date
Dax T. Games bf75f70181 added config/profile.d 2016-03-01 20:35:24 -06:00
Martin Kemp 8fa151d1db Merge pull request #740 from daxgames/cmder_exinit
Cmder exinit
2016-02-29 08:11:34 +00:00
Martin Kemp 33d6f11e87 Merge pull request #855 from daxgames/profile.d_support
Added profile.d like support for all supported shells
2016-02-29 08:11:31 +00:00
Dax T. Games 434d6f2996 Fixed profile.d table 2016-02-28 10:41:10 -06:00
Dax T. Games 59e4a1684b Merge branch 'development' of https://github.com/cmderdev/cmder into profile.d_support 2016-02-27 12:52:00 -06:00
Dax T. Games 361a8eae66 Fixed profile.d support for bash 2016-02-27 12:19:03 -06:00
Dax T. Games 727d6a6abd Added bits about MinGW integration status 2016-02-27 12:05:01 -06:00
Dax T. Games f7a18d4b6e --amend 2016-02-27 12:00:40 -06:00
Dax T. Games 9e7f860e2d Fixed and added zsh shell capability 2016-02-27 08:43:39 -06:00
Dax T. Games 6cf62dcdc7 Added details on integrating external *nix like env 2016-02-27 07:42:22 -06:00
Dax T. Games 79f8560a24 added profile.d stuff 2016-02-27 07:40:47 -06:00
Dax T. Games 4245608e6d Merge branch 'development' of https://github.com/cmderdev/cmder into cmder_exinit 2016-02-27 06:41:11 -06:00
Benjamin Staneck aedd078050 ⬆️ Git@2.7.2.windows.1 2016-02-27 01:39:06 +01:00
Dax T. Games a959409c0f --amend 2016-02-25 18:22:43 -06:00
Dax T. Games 0a6b79b9ed Added profile.d like support for all supported shells 2016-02-25 08:01:16 -06:00
Martin Kemp 85ce629dde Merge pull request #852 from JanSchulz/patch-1
Typo in Readme.md
2016-02-23 16:25:23 +00:00
Jan Schulz 78ea063fb0 Typo in Readme.md 2016-02-23 16:45:07 +01:00
Dax T. Games a99d27a7e1 Merge branch 'development' into cmder_exinit 2016-02-19 10:10:12 -06:00
Martin Kemp 289126f870 Merge pull request #837 from JanSchulz/appveyor_badge
Add appveyor batch to README
2016-02-19 09:56:55 +00:00
Martin Kemp e1eed7a0f1 Merge pull request #831 from cmderdev/development
1.3 Pre-Release Merge
2016-02-19 09:56:47 +00:00
Benjamin Staneck c3042909e0 Merge pull request #841 from gpakosz/clink-git-prompt
Fixed get_git_dir() to take submodules into account. Fixes #833
2016-02-16 11:31:09 +01:00
Gregory Pakosz 64d981e470 Fixed get_git_dir() to take submodules into account. Fixes #833 2016-02-16 11:15:42 +01:00
Jan Schulz 3fab0c122c Add appveyor batch to README
This is mainly to point people to newer builds of cmder and is therefore to be
merged into the master branch.
2016-02-13 18:43:46 +01:00
Martin Kemp 9ace64f6dc Merge pull request #835 from gpakosz/git-prompt-submodules
Fixed checkGit() in case of submodules
2016-02-10 15:42:40 +00:00
Gregory Pakosz 95bbb8edbb Fixed checkGit() in case of submodules
Since Git 1.7.8, submodules don't contain a .git/ folder anymore.
Instead, the submodule directory is populated with a .git text file
which contains a git-dir: /path/to/superproject/git_dir/modules/name.

See,
https://github.com/git/git/blob/master/Documentation/RelNotes/1.7.8.txt#L109-L114
2016-02-10 16:33:01 +01:00
Martin Kemp 842394300f Better defaults for window size.
Should now just be a 120x30 at the 500x500px position and saves size
and position on close.
2016-02-09 13:58:41 +00:00
Martin Kemp 26e6d80364 Build on tags
For releases.
2016-02-09 13:57:31 +00:00
Martin Kemp 728e83a85b Set CMDER_START to homeprofile
This is to set CMDER_START to home when no directory is given.

This is to ensure it is set even though it will default to the home
directory anyway.

It’ll allow users to use CMDER_START even if started without a path.
2016-02-09 13:40:32 +00:00
Martin Kemp 95f6096a45 Latest 3rd party updates. 2016-02-08 22:14:04 +00:00
Martin Kemp fab895bd9b Undo. 2016-02-08 22:09:35 +00:00
Martin Kemp b17db6930a Merge pull request #771 from cmderdev/development
Merge latest development
2016-02-08 19:58:54 +00:00
Martin Kemp d97bc4ca69 Merge branch 'development' into release-1.3 2016-02-08 19:56:47 +00:00
Martin Kemp 914ddb8207 Merge pull request #804 from cmderdev/buildscriptchange
Fix build script not exiting on msbuild failure.
2016-02-08 18:41:27 +00:00
Martin Kemp 7962edac56 Merge pull request #803 from cmderdev/MartiUK-patch-1
Set tasks to always use CMDER_START
2016-02-08 18:41:09 +00:00
Martin Kemp 97cae2bdc7 Bring variable into line 2016-02-08 18:26:57 +00:00
Martin Kemp 6bb07d9b19 Revert "Set tasks to always user CMDER_START"
This reverts commit 4dc1249881.
2016-02-08 18:19:58 +00:00
Benjamin Staneck fccba9269d ⬆️ ConEmu@160202
Changelog: https://conemu.github.io/en/Whats_New.html
2016-02-03 03:15:56 +01:00
Benjamin Staneck 07b426355e ⬆️ Git@2.7.0.windows.2
Changelog: https://github.com/git-for-windows/git/releases/tag/v2.7.0.windows.2
2016-02-03 03:13:43 +01:00
Martin Kemp 261b8bfce3 Merge pull request #794 from JanSchulz/793-clink-settings
Reorganize how clink settings are loaded
2016-02-01 08:45:29 +00:00
Martin Kemp c055ce1c13 Get USER_PROFILE differently
USER_PROFILE is a known folder, so use that functionality to get it.
2016-01-31 21:35:57 +00:00
Jan Schulz fe45b186e0 clink.lua: add header
Introduce a header like in the rest of the scripts that this file
is overwritten on updates and should not be modified.
2016-01-15 18:06:35 +01:00
Jan Schulz 788b5262b4 Reorganize how clink settings are loaded
4bfdf04d59 moved all clink config files
to vendor/ and therefore the files in config/ were not used and .history
was also moved to vendor/.

The new arrangement uses `--script` to load our own clink.lua file which in
turn as the first thing loads the original clink.lua file. The user defined
files are again in config/. As clink regenerates these files, if they are not
present, this also means that we don't need to include the settings file
in the git repo and therefore don't overwrite it on updates.
2016-01-15 18:02:10 +01:00
Martin Kemp 73e1eb2a8b Ensure Environment Variables are propagated. 2016-01-15 13:13:16 +00:00
Martin Kemp fabcd468a7 Use the correct type and initialise it. 2016-01-15 13:01:55 +00:00
Martin Kemp df7a662965 Get the environment variable correctly. 2016-01-15 12:44:10 +00:00
Martin Kemp e7243efce2 Fix build script not exiting on msbuild failure. 2016-01-15 12:28:24 +00:00
Martin Kemp 9c7a037948 Set CMDER_START to USER_PROFILE if no path given. 2016-01-15 12:10:24 +00:00
Martin Kemp 4dc1249881 Set tasks to always user CMDER_START
CMDER_START should always be set as a result of either:
1. The user passes a directory to cmder.exe using `/START $DIR`
- or -
2. Sets CMDER_START as a default environment variable.
Fixes #772
2016-01-15 11:47:54 +00:00
Martin Kemp 5b7c008202 Merge pull request #798 from JanSchulz/cmder_here
Make "cmder here" work again
2016-01-15 11:44:39 +00:00
Benjamin Staneck 724b9a25da ⬆️ Bump clink to 0.4.7 2016-01-15 00:16:18 +01:00