Commit Graph

1845 Commits

Author SHA1 Message Date
e3b22033d8 Merge remote-tracking branch 'origin/vagrant+packer' into vagrant+packer 2024-08-20 20:13:07 -04:00
51a0c0e70f Merge remote-tracking branch 'origin/fix_build' into vagrant+packer 2024-06-03 08:24:48 -04:00
9c036e3169 Merge remote-tracking branch 'origin/cmder4win' into vagrant+packer 2024-06-03 08:22:59 -04:00
ed92f64f40 Merge remote-tracking branch 'origin/fix_launcher_overwrite' into vagrant+packer 2024-06-03 08:22:30 -04:00
2e945fb02b Fix launcher overwritting/backing up emulator settings 2024-05-31 18:31:16 -04:00
aaafd37a4d Fix build.ps1 on some systems 2024-05-31 13:44:06 -04:00
d36e61a6fc Fix build.ps1 on some systems 2024-05-31 13:43:20 -04:00
e457afa8d1 Merge branch 'master' into development 2024-05-31 15:06:45 +00:00
4daff054eb Fix #2944 v1.3.25 2024-05-31 18:36:31 +03:30
f38e0b3e03 sync 2024-05-30 17:21:29 -04:00
167f57bc97 Merge branch 'upstream-development' into cmder4win 2024-05-30 17:13:15 -04:00
9120d92318 Merge pull request #2943 from daxgames/new_wt
Update to latest released Windows Terminal to allow launching shells as Administrator.
2024-05-30 17:08:58 -04:00
9463d4ebc4 update build workflow to upload cmder_win* 2024-05-30 17:03:37 -04:00
c5946422e7 update build workflow to upload cmder_win.zip 2024-05-30 16:42:48 -04:00
e850f8241d add vendor/start_git_mintty.cmd 2024-05-30 16:37:37 -04:00
db3889d5e5 remove vendor/start_git_mintty.cmd 2024-05-30 16:27:43 -04:00
881938ed18 Update Windows Terminal default settings and version 2024-05-30 16:23:51 -04:00
f2ae245b5b Update Windows terminal default settings 2024-05-30 12:15:21 -04:00
c83c410d39 Merge branch 'development-dax' into vagrant+packer 2024-05-30 10:17:24 -04:00
14ac14f97f 4096 2024-05-30 10:15:48 -04:00
2b05b3a7aa Update Windows Terminal default settings 2024-05-30 09:13:16 -04:00
45fd0c2666 ⬆️ Update dependencies (git-for-windows v2.45.1.windows.1, clink v1.6.14, clink-completions v0.5.2) 2024-05-29 13:40:37 +00:00
41ac7612bc Update Windows Terminal 2024-05-28 17:35:47 -04:00
546d921e58 Merge branch 'master' into development 2024-05-28 13:49:59 +00:00
5145a15139 display git improper version string as debug 2024-05-28 17:19:47 +03:30
92c662de2f Merge branch 'master' into development 2024-05-23 18:29:27 +00:00
92419a48fc log the executable path for improper git 2024-05-23 21:59:16 +03:30
9ce82383e2 Update Windows Terminal to 1.20.11271.0 2024-05-22 15:00:36 -04:00
5d8037176d Merge remote-tracking branch 'upstream/development' into development-dax
* upstream/development:
  enable `match.expand_envvars`
  fix: fix some typos in comments
  Bump softprops/action-gh-release from 1 to 2
  Bump microsoft/setup-msbuild from 1 to 2 (#2917)
  Bump peter-evans/create-pull-request from 5 to 6 (#2918)
  Bump actions/upload-artifact from 3 to 4 (#2905)
  Do CI on development PRs
  Bump github/codeql-action from 2 to 3 (#2906)
2024-05-22 14:57:04 -04:00
aac7cfc47a Fix GitHub action (merge master into development) 2024-05-21 11:58:26 +03:30
c9b77f618a enable match.expand_envvars
This is part of the "Enhanced default settings" by Clink and a very useful feature
2024-05-20 10:57:51 +03:30
a2e4884ea1 Merge pull request #2926 from cmderdev/dependabot/github_actions/softprops/action-gh-release-2
Bump softprops/action-gh-release from 1 to 2
2024-04-26 17:09:24 +03:30
d68c5b4487 Merge pull request #2909 from cmderdev/master
sync development with master
2024-04-26 15:56:46 +03:30
62a46140eb Merge pull request #2932 from loselarry/master
fix: fix some typos in comments
2024-04-10 08:01:16 -04:00
ae518cded8 fix: fix some typos in comments
Signed-off-by: loselarry <bikangning@yeah.net>
2024-04-10 16:39:46 +08:00
4ad76d8274 Bump softprops/action-gh-release from 1 to 2
Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 1 to 2.
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](https://github.com/softprops/action-gh-release/compare/v1...v2)

---
updated-dependencies:
- dependency-name: softprops/action-gh-release
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-11 15:59:16 +00:00
8a199bf47b Bump microsoft/setup-msbuild from 1 to 2 (#2917)
Bumps [microsoft/setup-msbuild](https://github.com/microsoft/setup-msbuild) from 1 to 2.
- [Release notes](https://github.com/microsoft/setup-msbuild/releases)
- [Changelog](https://github.com/microsoft/setup-msbuild/blob/main/building-release.md)
- [Commits](https://github.com/microsoft/setup-msbuild/compare/v1...v2)

---
updated-dependencies:
- dependency-name: microsoft/setup-msbuild
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-06 19:43:29 +00:00
457d99da0b Bump peter-evans/create-pull-request from 5 to 6 (#2918)
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 5 to 6.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v5...v6)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-06 19:43:13 +00:00
52762636dc Bump actions/upload-artifact from 3 to 4 (#2905) 2024-01-03 00:54:57 +00:00
ed6c9b2bc9 Merge pull request #2907 from daxgames/development_ci
Do CI on development PRs
2024-01-02 14:14:15 -05:00
7753622897 Do CI on development PRs 2024-01-02 12:04:31 -05:00
5814792bd6 Merge pull request #15 from daxgames/development-dax
development dax
2024-01-02 11:42:22 -05:00
1ed3a36812 Update windows_terminal_default_settings.json 2024-01-02 11:41:21 -05:00
c5579d2cab Add Monokai, Default to One Half Dark 2024-01-02 11:20:20 -05:00
131949bc77 Merge branch 'master' into development 2023-12-20 10:31:53 +00:00
18950135ef Bump github/codeql-action from 2 to 3 (#2906)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-12-20 10:31:41 +00:00
28e9018ce0 make mintty /a work 2023-11-27 10:00:28 -05:00
38a91ded02 cleanup 2023-11-26 22:28:16 -05:00
47292038ef add mintty 2023-11-26 21:35:30 -05:00
d8238b0230 cleanup 2023-11-24 18:18:16 -05:00