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
1,352 Commits 9 Branches 38 Tags 6.6 MiB
fe29497878
Commit Graph

1352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jan Schulz
2c0c6ed416 Make "cmder here" work again 
The new system works by setting "CMDER_START" if a cmder.exe gets a
startup path. The rest is then implemented in the profile.ps1 and init.bat.
The new system works as follows:

1.If a startup path is given, cmder.exe sets this as `CMDER_START` and the
  startup scripts change to that directory.
2.If the usere sets a `CMDER_START` environment variable and this is not
  overwritten by cmder.exe, this variable is taken as the startup
  directory by the startup scripts.
3.If not such path is give, the conemu startup dirs is the winner, as the
  startup scripts don't change anything.
 2016-01-11 22:19:10 +01:00
Benjamin Staneck
c77641cf03 ⬆️ Git@2.7.0.windows1 
Changelog: https://github.com/git-for-windows/git/releases/tag/v2.7.0.windows.1
 2016-01-07 01:50:52 +01:00
Benjamin Staneck
378014d5d4 Merge pull request #781 from vladimir-kotikov/patch-3 
Bump clink to 0.4.6
 2015-12-28 22:50:28 +01:00
Vladimir Kotikov
1389fe0c4d ⬆️ Bump clink to 0.4.6 2015-12-29 00:23:30 +03:00
Dax T. Games
9eb9620966 Fixed som misc stuff and prevented multi runs 2015-12-16 12:37:40 -05:00
Benjamin Staneck
add52c0ee6 ⬆️ Git for Windows@2.6.4 
Changelog: https://github.com/git-for-windows/git/releases/tag/v2.6.4.windows.1
 2015-12-16 06:13:53 +01:00
Martin Kemp
744522b97b Merge pull request #773 from glureau/development 
Fix vendor/init.bat when the PATH contains spaces.
 2015-12-15 19:09:58 +00:00
Gregory Lureau
6879a94c10 Fix vendor/init.bat when the PATH contains spaces. 2015-12-15 18:56:22 +01:00
Benjamin Staneck
41836e669b ⬆️ ConEmu@151210 
Changelog: https://conemu.github.io/blog/2015/12/10/Build-151210.html
Skipped:
* https://conemu.github.io/blog/2015/12/08/Build-151208.html
* https://conemu.github.io/blog/2015/12/07/Build-151207.html
* https://conemu.github.io/blog/2015/12/05/Build-151205.html
* https://conemu.github.io/blog/2015/12/02/Build-151202.html
* https://conemu.github.io/blog/2015/11/29/Build-151129.html
 2015-12-11 18:48:47 +01:00
Benjamin Staneck
4a4e48e04c Merge pull request #766 from vladimir-kotikov/patch-2 
Bump clink-completions to 0.2.2
 2015-12-10 20:56:41 +01:00
Vladimir Kotikov
5f68e4e987 ⬆️ Bump clink-completions to 0.2.2 2015-12-10 22:09:12 +03:00
Benjamin Staneck
bdd0f38d59 Merge pull request #746 from daxgames/readme_updates 
README.md Updates
 2015-12-10 17:54:10 +01:00
Benjamin Staneck
6280416aed Merge pull request #756 from JanSchulz/extra_line_fix 
Fix: don't garble the input line for long lines in git projects
 2015-12-04 20:35:04 +01:00
Jan Schulz
567889e69f Fix: don't garble the input line for long lines in git projects 
If having a long line of input in histroy, which went on into the
second row and using <up> to get back to it, you got the effect
that the input was split over three lines: "text, empty, text",
but using the arrows do move to the front of the first line was
moving the cursor in the second (empty) row. You could change
the text, but you needed to do it "in the dark".  No idea why
s/os.execute/is.popen/ fixes this, but it does.

Partly adresses https://github.com/cmderdev/cmder/issues/749
 2015-12-04 19:57:08 +01:00
Martin Kemp
9a1d49bfc3 Merge pull request #427 from kodybrown/development 
Added code to check for the existence of a customized ini file..
 2015-12-04 13:04:21 +00:00
Martin Kemp
30dbfa6144 Merge pull request #736 from JanSchulz/more_config 
More config
 2015-12-04 13:04:13 +00:00
Dax T. Games
73f5cbdc7b README.md Updates 2015-11-28 11:12:25 -06:00
Benjamin Staneck
d0909f27e1 ⬆️ ConEmu@151129 
Changelog: http://conemu.github.io/blog/2015/11/26/Build-151126.html
Skipped http://conemu.github.io/blog/2015/11/22/Build-151122.html
 2015-11-28 02:45:05 +01:00
Dax T. Games
b88ea50aef Added vendor/cmder_exinit. Allows integrating externally installed Msys/Msys2/Cygwin into Cmder 2015-11-26 09:32:10 -06:00
Dax T. Games
46bad57ef8 Added config/aliases to .gitignore to account for recent changes in dev branch 2015-11-26 09:27:32 -06:00