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
Martin Kemp
3595d3e7fc
Merge pull request #737 from JanSchulz/user-profile
...
Use consistent naming: user-profile.{sh|bat|ps1}
2015-11-25 10:01:18 +00:00
Martin Kemp
05c6f1c9cc
Merge pull request #738 from daxgames/packignore_updates
...
added config\user-* to packignore
2015-11-25 10:00:12 +00:00
Martin Kemp
182d0c15a3
Merge pull request #731 from daxgames/fix_icons
...
Fix icons
2015-11-25 09:59:59 +00:00
Dax T. Games
867910ac9e
added config\user-* to packignore
2015-11-24 19:08:58 -06:00
Dax T. Games
630ac0c571
reverted last change, removed config/user-* from packignore
2015-11-24 19:03:46 -06:00
Jan Schulz
105e381e66
Document the files in config
2015-11-25 00:31:17 +01:00
Jan Schulz
854cadb185
Use consistent naming: user-profile.{sh|bat|ps1}
2015-11-25 00:23:04 +01:00
Jan Schulz
4bfdf04d59
Do not overwrite cmder.lua on update
2015-11-25 00:14:35 +01:00
Martin Kemp
c9550490f5
Merge pull request #735 from JanSchulz/config_aliases
...
Do not overwrite aliases on update
2015-11-24 22:54:49 +00:00
Martin Kemp
85804d729e
Merge pull request #734 from chase-miller/development
...
Added check for git install path in init.bat.
2015-11-24 22:43:15 +00:00
Jan Schulz
4154cdf204
Do not overwrite aliases on update
2015-11-24 23:38:26 +01:00
Chase Miller
76e14cd268
Added check for %USERPROFILE%\AppData\Local\Programs\Git path in init.bat. Installing from https://git-scm.com/download/win seems to put git in this directory.
2015-11-24 17:26:41 -05:00
Dax T. Games
8601b0f940
added config/user-* to packignore
2015-11-24 16:06:39 -06:00
Dax T. Games
ce2a311c81
Merge branch 'development' of https://github.com/cmderdev/cmder into fix_icons
2015-11-24 14:54:40 -06:00
Dax T. Games
191316282a
Get 100% supported Cmder task icons from icons\Cmder.ico so tabs have an ico if launched from the cmder.bat file
2015-11-24 14:52:13 -06:00
Dax T. Games
fd9c8a74b1
Added Git for Windows icon to mintty tasks to differentiate them from 100% supported Cmder tasks
2015-11-24 14:45:52 -06:00
Benjamin Staneck
519b9cabbb
Merge pull request #729 from daxgames/fix_vim_alias
...
Fixed - Powershell vim/vim alias opening a new tab when editing a file
2015-11-24 18:21:03 +01:00
Dax T. Games
9b25544c05
Fixed - Powershell vim/vim alias opening a new tab when editin a file
2015-11-24 10:58:58 -06:00
Martin Kemp
a9b06459da
Merge pull request #726 from daxgames/default_aliases
...
Added vi/vim aliases and fixed powershell startup errors
2015-11-24 09:26:02 +00:00
Dax T. Games
5eff672a4b
Added lambda prompt for bash/mintty, matches cmder and powershell prompts
2015-11-23 22:13:33 -06:00
Dax T. Games
8566b6f6ca
Added vi/vim aliases and fixed powershell startup errors
2015-11-23 19:10:22 -05:00
Martin Kemp
1af65edaec
Merge pull request #702 from daxgames/msys_bash
...
Msys bash
2015-11-23 23:31:02 +00:00
Dax T. Games
e6d2394d48
Added some documentation to the README.md file
2015-11-23 18:20:15 -05:00
Martin Kemp
6d215f58c6
Merge pull request #673 from DoCode/development
...
Enable the '/single' switch (#577 )
2015-11-20 10:50:44 +00:00
Martin Kemp
7e4912514f
Merge pull request #722 from MartiUK/development
...
Update to conemu 151119
2015-11-20 10:50:02 +00:00
Martin Kemp
86edf3cbb0
Merge master into release-1.3
...
Resolved Conflicts:
.gitignore
README.md
2015-11-20 10:45:33 +00:00
Martin Kemp
a3e2d7546d
Update to ConEmu 151119
...
Changelog: https://conemu.github.io/blog/2015/11/19/Build-151119.html
2015-11-20 10:29:32 +00:00
Jackbennett
b9362b0a3d
For PSV2.0 compat don't use $PSScriptRoot
...
As the build script must be executed from the `<projectroot>/scripts`
directory anyway we can assume `util.ps1` is as the same path as
`build.ps1` and just reference the current folder.
2015-11-19 14:18:47 +00:00
Martin Kemp
1046198648
Merge pull request #720 from MartiUK/development
...
Disable appveyor test search
2015-11-19 14:04:46 +00:00
Martin Kemp
908773622d
Disable appveyor test search
...
We don't have tests.
2015-11-19 13:57:12 +00:00
Martin Kemp
deb23a21a1
Merge pull request #719 from MartiUK/development
...
Fix gitter webhook
2015-11-18 14:16:53 +00:00
Martin Kemp
1ec507c1d0
Fix gitter webhook
...
Should notify gitter of build success and failures.
2015-11-18 14:10:26 +00:00
Martin Kemp
1b159df7c2
Merge pull request #718 from MartiUK/development
...
Publish appveyor artefacts
2015-11-18 13:15:14 +00:00
Martin Kemp
2e582b9db9
Fix after_build script.
...
We are already in the scripts directory after build.
This prevents the ItemNotFoundException seen here:
https://ci.appveyor.com/project/MartiUK/cmder/build/1.0.79-development#64
2015-11-18 13:08:31 +00:00
Martin Kemp
f9b2c768b8
Package and upload artefacts on appveyor
...
Useful for PRs and releases.
2015-11-18 13:01:57 +00:00
Martin Kemp
4ce55d1019
Merge remote-tracking branch 'refs/remotes/cmderdev/development' into development
2015-11-18 12:06:10 +00:00
Dax T. Games
7f43014b68
pulled in upstream development branch
2015-11-14 12:15:42 -06:00
Dax T. Games
cf15dcffc7
Added/enhanced bash with cmder.sh/user-cmder.sh, organized tasks menu
...
added personal files to .gitignore so they never get uploaded to the repo and added support for msys2 bash in the new git for windows
added autocreate of config/user-cmder.sh if iot does not exist and added it to the .gitignore
Added tasks: cmd::Cmder, cmd::Cmder as Admin, bash::bash, bash::bash as Admin, bash::mintty, bash::mintty as admin, powershell::powershell, powershell::powershell as Admin. Set default task to cmd::Cmder. Cot rid of init.bat running before /bin/bash, fixes double exit requirement
Added running git for windows post-install.bat on first cmder launch
fixed file/path not found errors when launching powershell as admin
fixed file/path not found errors when launching bash/mintty as admin
fixed PATH in vendor/cmder.sh
Added sourcing ~/.bashrc if it exists.
changed .gitignore to ignore anything with path of config/user-*
removed my personal files from .gitignore, left in config/user-*
Make sure $CMDER_ROOT does not have a trailing '/'
%CMDER_ROOT% does not have trailing '\'. allow user to specify a conemu.xml on the command line
Removed '\' from %CMDER_ROOT%
2015-11-14 12:07:56 -06:00
Benjamin Staneck
10d0431242
Merge pull request #698 from daxgames/fix_batch_files
...
Fix batch files
2015-11-14 18:35:30 +01:00
Dax Games
eb5ab51573
Removed training '\' from %CMDER_ROOT% and added config/user-* to .gitignore
2015-11-14 11:14:14 -06:00
Benjamin Staneck
87bc4178e6
fix vim path in powershell profile
2015-11-12 15:18:21 +01:00