development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-19 16:12:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
30023 commits 303 branches 696 tags 363 MiB
Commit graph

30023 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergio Padrino b6ff09166e
Merge pull request #12480 from desktop/fix-empty-commits 
Render empty commits properly
 2021-06-21 09:26:52 -07:00
Sergio Padrino b3942b300e Clean up empty-commit rendering code 2021-06-21 18:00:49 +02:00
Sergio Padrino 761285eea0
Merge pull request #12268 from kaatt/patch-1 
use app.hide() instead of Menu.sendActionToFirstResponder()
 2021-06-21 08:51:13 -07:00
Sergio Padrino 2e32a0c288
Merge pull request #12479 from meJevin/development 2021-06-21 02:05:20 -07:00
Michael 46606b19fc change: toolbar active border color in dark theme matches the variable in light theme 2021-06-19 10:35:44 +03:00
Michael 93437d861f change: revert previous 2 commits after discussion in PR #12479 2021-06-19 10:34:47 +03:00
tidy-dev 2e0a42c726
Merge pull request #12473 from patrykmichalik/development 
Hyphenate ‘right-clicking’
 2021-06-18 10:44:30 -04:00
Sergio Padrino 123dfd1b4a Render empty commits properly 2021-06-18 13:09:47 +02:00
Michael 20d7bbc11a change: branches tab bar now has right border 2021-06-18 13:09:54 +03:00
Michael 1222b9c992 change: filter-list now has right border 2021-06-18 13:09:31 +03:00
Patryk Michalik 5a0047af17
Hyphenate ‘right-clicking’ 2021-06-17 18:56:47 +02:00
Sergio Padrino 9630999f5e
Merge pull request #12414 from desktop/dependabot/npm_and_yarn/normalize-url-4.5.1 
Bump normalize-url from 4.5.0 to 4.5.1
 2021-06-17 10:55:54 +02:00
Sergio Padrino d64715a0d5
Merge pull request #12457 from desktop/dependabot/npm_and_yarn/postcss-7.0.36 
Bump postcss from 7.0.14 to 7.0.36
 2021-06-17 10:38:33 +02:00
Sergio Padrino b74e8b8a6a
Merge pull request #12427 from desktop/dependabot/npm_and_yarn/extend-3.0.2 
Bump extend from 3.0.1 to 3.0.2
 2021-06-17 10:36:18 +02:00
Sergio Padrino 347e9f71b6
Merge pull request #12426 from desktop/dependabot/npm_and_yarn/atob-2.1.2 2021-06-17 10:34:49 +02:00
dependabot[bot] a5b65129da
Bump normalize-url from 4.5.0 to 4.5.1 
Bumps [normalize-url](https://github.com/sindresorhus/normalize-url) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/sindresorhus/normalize-url/releases)
- [Commits](https://github.com/sindresorhus/normalize-url/commits)

---
updated-dependencies:
- dependency-name: normalize-url
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-17 08:34:15 +00:00
Sergio Padrino 04a8a6d9a4
Merge pull request #12413 from desktop/dependabot/npm_and_yarn/app/normalize-url-4.5.1 
Bump normalize-url from 4.5.0 to 4.5.1 in /app
 2021-06-17 10:33:10 +02:00
Sergio Padrino 4aab752065
Merge pull request #12168 from desktop/dependabot/npm_and_yarn/ua-parser-js-0.7.28 
Bump ua-parser-js from 0.7.21 to 0.7.28
 2021-06-17 10:32:26 +02:00
Sergio Padrino 533cbc9ff7
Merge pull request #12450 from desktop/releases/2.9.0 2021-06-16 12:36:18 +02:00
Sergio Padrino dd0a7154ca
Merge pull request #12438 from desktop/fix-error-on-merge-conflicts 2021-06-16 12:36:07 +02:00
Sergio Padrino 4806a6dcc7 Apply suggestions from code review 
Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>
 2021-06-15 19:09:53 +02:00
Sergio Padrino 08d672a4cf Bump version to v2.9.0 and update changelog 2021-06-15 19:09:53 +02:00
dependabot[bot] 215bd8c81b
Bump postcss from 7.0.14 to 7.0.36 
Bumps [postcss](https://github.com/postcss/postcss) from 7.0.14 to 7.0.36.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/7.0.14...7.0.36)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-15 16:19:49 +00:00
Sergio Padrino 5ae24f0dab
Merge pull request #12454 from desktop/releases/2.8.4-beta5 2021-06-15 18:19:06 +02:00
Sergio Padrino 7f57ce4327 Bump version to 2.8.4-beta5 and update changelog 2021-06-15 17:33:12 +02:00
Sergio Padrino ca3a3b91e5
Merge pull request #12445 from desktop/enable-feature-flags-2.9.0 2021-06-15 17:29:56 +02:00
Sergio Padrino 6b21748a66 Enable feature flags for 2.9.0 features 2021-06-14 17:38:52 +02:00
Sergio Padrino 53e88ce14c Switch order of if statements to avoid unnecessary find 2021-06-14 12:42:29 +02:00
Sergio Padrino 870af3ed15 Initialize the operation before setting the step 2021-06-14 12:40:39 +02:00
Sergio Padrino f6c6a1b401 Don't try to update step when no multi-operation is set 2021-06-14 12:08:22 +02:00
Sergio Padrino d3ce51dbfa
Merge pull request #12432 from desktop/scroll-on-branch-created-from-commit 2021-06-11 16:24:22 +02:00
Sergio Padrino adbb55b973 Scroll History to top when a branch was created from a commit 2021-06-11 14:11:02 +02:00
Billy Griffin ad641e4299
Merge pull request #12430 from desktop/releases/2.8.4-beta4 
Release 2.8.4-beta4
 2021-06-10 10:57:20 -06:00
Sergio Padrino dd40522368 Bump version to 2.8.4-beta4 and update changelog 2021-06-10 18:07:14 +02:00
Sergio Padrino 1ed729c04b
Merge pull request #12429 from desktop/end-merge-operation 2021-06-10 18:02:46 +02:00
Sergio Padrino e3adc21b77 End merge operations so rebases can start 2021-06-10 17:24:29 +02:00
Sergio Padrino 106bfeba4e
Merge pull request #12422 from desktop/skip-unnecessary-reorders 2021-06-10 17:21:06 +02:00
dependabot[bot] 38074531a9
Bump extend from 3.0.1 to 3.0.2 
Bumps [extend](https://github.com/justmoon/node-extend) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/justmoon/node-extend/releases)
- [Changelog](https://github.com/justmoon/node-extend/blob/main/CHANGELOG.md)
- [Commits](https://github.com/justmoon/node-extend/compare/v3.0.1...v3.0.2)

---
updated-dependencies:
- dependency-name: extend
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-10 13:46:04 +00:00
dependabot[bot] 69046a37c5
Bump atob from 2.0.3 to 2.1.2 
Bumps [atob](https://github.com/coolaj86/node-browser-compat) from 2.0.3 to 2.1.2.
- [Release notes](https://github.com/coolaj86/node-browser-compat/releases)
- [Commits](https://github.com/coolaj86/node-browser-compat/commits)

---
updated-dependencies:
- dependency-name: atob
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-10 13:45:58 +00:00
Sergio Padrino 032975e967
Merge pull request #12420 from desktop/releases/2.8.4-beta3 2021-06-10 15:45:13 +02:00
Sergio Padrino 80d7aa8638
Merge pull request #12423 from desktop/sublime-text-4-win 2021-06-10 15:42:33 +02:00
Sergio Padrino b415b40527 Add uninstall key for Sublime Text 4 on Windows 2021-06-10 12:31:58 +02:00
Sergio Padrino b634d2a29a Check when the drag&drop for reordering can be ignored 2021-06-10 11:26:03 +02:00
tidy-dev d6d9e446c8 last minute intro tweak 2021-06-09 14:43:36 -04:00
tidy-dev edf8b5a41c Release 2.8.4-beta3 2021-06-09 14:36:40 -04:00
tidy-dev 885bbd30e5 Reset to commit back to development 2021-06-09 14:29:16 -04:00
tidy-dev 868c48589e
Merge pull request #12419 from desktop/drag-and-drop-intros 
Create intros for the new drag&drop features 🎉
 2021-06-09 14:22:54 -04:00
tidy-dev 66f1f5426d Update Intro Titles with "Drag and drop to" 2021-06-09 14:00:34 -04:00
Sergio Padrino bb278691e2 Improve check to remove "New" badge from History tab 2021-06-09 18:30:28 +02:00
tidy-dev 1de0b3bf8f
Merge pull request #12416 from desktop/comparison_select_button 
Make squash-merge and rebase options available in comparison view
 2021-06-09 12:26:55 -04:00