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 
						 
				 
			
				
					
						
							
							
								Benjamin Staneck 
							
						 
					 
					
						
						
							
						
						85aaa09d97 
					 
					
						
						
							
							Merge pull request  #705  from wenzowski/patch-1  
						
						... 
						
						
						
						add bundled vim to path 
						
						
					 
					
						2015-11-12 13:52:53 +01:00 
						 
				 
			
				
					
						
							
							
								Benjamin Staneck 
							
						 
					 
					
						
						
							
						
						3a2d986c36 
					 
					
						
						
							
							⬆️  Git@v2.6.3.windows.1  
						
						... 
						
						
						
						Changelog: https://github.com/git-for-windows/git/releases/tag/v2.6.3.windows.1  
						
						
					 
					
						2015-11-12 13:28:34 +01:00 
						 
				 
			
				
					
						
							
							
								Benjamin Staneck 
							
						 
					 
					
						
						
							
						
						37626e7687 
					 
					
						
						
							
							⬆️  ConEmu@151109  
						
						... 
						
						
						
						Changelog: http://conemu.github.io/blog/2015/11/09/Build-151109.html 
We skipped http://conemu.github.io/blog/2015/11/01/Build-151101.html  for no reason btw. 
						
						
					 
					
						2015-11-12 13:25:49 +01:00 
						 
				 
			
				
					
						
							
							
								Alec Wenzowski 
							
						 
					 
					
						
						
							
						
						b018f2cc50 
					 
					
						
						
							
							add bundled vim to path  
						
						
						
						
					 
					
						2015-11-11 23:28:04 -05:00 
						 
				 
			
				
					
						
							
							
								Benjamin Staneck 
							
						 
					 
					
						
						
							
						
						ffd61db30e 
					 
					
						
						
							
							Merge pull request  #697  from vladimir-kotikov/patch-2  
						
						... 
						
						
						
						Speed up git prompt filtering 
						
						
					 
					
						2015-11-07 01:06:36 +01:00 
						 
				 
			
				
					
						
							
							
								Vladimir Kotikov 
							
						 
					 
					
						
						
							
						
						53e03076da 
					 
					
						
						
							
							Speed up git prompt filtering  
						
						... 
						
						
						
						This increases performance of git prompt filter by fetching branch name directly from `.git/HEAD` file instead of spawning `git` process. Apart from increasing performance this may also solve potential problems with `git` output, as reported in https://github.com/cmderdev/cmder/issues/692  
						
						
					 
					
						2015-11-07 02:44:43 +03:00 
						 
				 
			
				
					
						
							
							
								Kody Brown 
							
						 
					 
					
						
						
							
						
						6e3b83460c 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/development' into development  
						
						
						
						
					 
					
						2015-10-31 16:29:10 -06:00 
						 
				 
			
				
					
						
							
							
								Benjamin Staneck 
							
						 
					 
					
						
						
							
						
						3657795b35 
					 
					
						
						
							
							Don't package the appveyor file  
						
						
						
						
					 
					
						2015-10-27 07:24:19 +01:00 
						 
				 
			
				
					
						
							
							
								Benjamin Staneck 
							
						 
					 
					
						
						
							
						
						df37981707 
					 
					
						
						
							
							⬆️  ConEmu@v15.10.25  
						
						... 
						
						
						
						Changelog: http://conemu.github.io/blog/2015/10/25/Build-151025.html  
						
						
					 
					
						2015-10-27 07:12:21 +01:00 
						 
				 
			
				
					
						
							
							
								Benjamin Staneck 
							
						 
					 
					
						
						
							
						
						669bc8bfa6 
					 
					
						
						
							
							Update Readme  
						
						
						
						
					 
					
						2015-10-25 03:00:37 +01:00 
						 
				 
			
				
					
						
							
							
								Martin Kemp 
							
						 
					 
					
						
						
							
						
						c2823af661 
					 
					
						
						
							
							Merge pull request  #676  from vladimir-kotikov/patch-1  
						
						... 
						
						
						
						Upgrade clink-completions to 0.2.1 
						
						
					 
					
						2015-10-22 16:28:12 +01:00 
						 
				 
			
				
					
						
							
							
								Vladimir Kotikov 
							
						 
					 
					
						
						
							
						
						66a75ce0dc 
					 
					
						
						
							
							⬆️  Bump clink-completions to 0.2.1  
						
						
						
						
					 
					
						2015-10-21 23:19:19 +03:00 
						 
				 
			
				
					
						
							
							
								Benjamin Staneck 
							
						 
					 
					
						
						
							
						
						15013369cb 
					 
					
						
						
							
							⬆️  ConEmu@151015  
						
						... 
						
						
						
						Changelogs:
https://conemu.github.io/blog/2015/10/06/Build-151006.html 
https://conemu.github.io/blog/2015/10/15/Build-151015.html  
						
						
					 
					
						2015-10-21 21:24:42 +02:00 
						 
				 
			
				
					
						
							
							
								Benjamin Staneck 
							
						 
					 
					
						
						
							
						
						50c5742794 
					 
					
						
						
							
							⬆️  Git@2.6.2.windows.1  
						
						
						
						
					 
					
						2015-10-21 21:21:54 +02:00 
						 
				 
			
				
					
						
							
							
								Manuel Tanzer 
							
						 
					 
					
						
						
							
						
						a57c11e171 
					 
					
						
						
							
							Enable the '/single' switch by using the registry as statemachine for the current location ('CMDER_START')  
						
						... 
						
						
						
						Fixed issue #577  
						
						
					 
					
						2015-10-20 16:49:08 +02:00 
						 
				 
			
				
					
						
							
							
								Jackbennett 
							
						 
					 
					
						
						
							
						
						417051f496 
					 
					
						
						
							
							Fix alt text on gitter link too  
						
						
						
						
					 
					
						2015-10-16 13:35:34 +01:00 
						 
				 
			
				
					
						
							
							
								Benjamin Staneck 
							
						 
					 
					
						
						
							
						
						0f6441a7ee 
					 
					
						
						
							
							Update README.md  
						
						... 
						
						
						
						Update Gitter badge 
						
						
					 
					
						2015-10-16 13:34:36 +01:00 
						 
				 
			
				
					
						
							
							
								Jackbennett 
							
						 
					 
					
						
						
							
						
						5e07567a72 
					 
					
						
						
							
							Pre-set tasks for the 9  number keys  
						
						... 
						
						
						
						Task macros ready for users who want to configure their own extra tasks 
						
						
					 
					
						2015-10-16 13:09:58 +01:00 
						 
				 
			
				
					
						
							
							
								Martin Kemp 
							
						 
					 
					
						
						
							
						
						0f68e48a7b 
					 
					
						
						
							
							Merge pull request  #665  from cmderdev/martiuk-dev  
						
						... 
						
						
						
						Build from behind proxy & appveyor 
						
						
					 
					
						2015-10-16 11:02:33 +01:00 
						 
				 
			
				
					
						
							
							
								Martin Kemp 
							
						 
					 
					
						
						
							
						
						46fed27096 
					 
					
						
						
							
							Build behind proxy and appveyor.  
						
						... 
						
						
						
						Fixes  #79 . Uses Download-File function from d654a53ec43038c42344f9cdbe0abc5b8ff9b387
Create appveyor.yml
Should send build notifications to gitter as well.
Adds appveyor build status badge.
Always compile launcher for AppVeyor
This is to catch any errors that may be caused by changes to the launcher or any outside scripts. 
					
						2015-10-16 10:54:43 +01:00 
						 
				 
			
				
					
						
							
							
								Benjamin Staneck 
							
						 
					 
					
						
						
							
						
						80bafd165f 
					 
					
						
						
							
							Merge pull request  #667  from Pireax/posh-user-script-fix  
						
						... 
						
						
						
						Fixed problem with Invoke-Expression 
						
						
					 
					
						2015-10-15 20:46:03 +02:00 
						 
				 
			
				
					
						
							
							
								Pireax 
							
						 
					 
					
						
						
							
						
						1d47a98329 
					 
					
						
						
							
							lambda was encoded with UTF-8 without BOM, didn't show properly  
						
						
						
						
					 
					
						2015-10-15 19:57:05 +02:00 
						 
				 
			
				
					
						
							
							
								Pireax 
							
						 
					 
					
						
						
							
						
						07180effac 
					 
					
						
						
							
							Fixed problem with Invoke-Expression  
						
						
						
						
					 
					
						2015-10-15 19:56:38 +02:00 
						 
				 
			
				
					
						
							
							
								Benjamin Staneck 
							
						 
					 
					
						
						
							
						
						1e61b858c3 
					 
					
						
						
							
							wipe the build dir clean before packing so leftovers don't end up in the release zips  
						
						
						
						
					 
					
						2015-10-15 07:52:05 +02:00 
						 
				 
			
				
					
						
							
							
								Jack Bennett 
							
						 
					 
					
						
						
							
						
						7ebfffc9da 
					 
					
						
						
							
							Remove incorrect charater at start of line.  
						
						
						
						
					 
					
						2015-10-14 19:24:54 +01:00