Commit Graph

1205 Commits

Author SHA1 Message Date
Daniel Imms dfee0337a5 Merge branch 'master' into fix-executable-bits 2019-10-09 15:16:07 -07:00
Joao Moreno d1be9d02cd 💄 2019-10-09 12:48:21 +02:00
Joao Moreno 4ce64ef558 Merge commit 'refs/pull/80335/head' of github.com:microsoft/vscode into pr/80335 2019-10-09 12:44:34 +02:00
Joao Moreno ecea71432f fixes #73613 2019-10-09 12:36:52 +02:00
Joao Moreno 9e5c2aca23 fixes #67814 2019-10-08 16:57:22 +02:00
Niklas Mollenhauer 1cc0b592c2 Remove executable bits from non-executable files 2019-10-08 15:18:42 +02:00
Matt Bierner 4c4edcefeb Fixing more TS 3.7 related compile errors
- Import aliasing symbol in file
- Missing function calls in conditional
- Missing return statement
2019-10-07 11:04:31 -07:00
Dipen Ved 6a0c40a0cc save all and commit fix 2019-09-29 19:55:17 +05:30
Matt Bierner f7274467ca Fix compile error in extension 2019-09-25 18:57:39 -07:00
Joao Moreno 14d47d35a9 fixes #79239 2019-09-23 12:00:36 +02:00
Alexander ce6319c76c Merge branch 'master' into git_branch_name 2019-09-22 13:17:47 +03:00
Joao Moreno ced9fdfa4f scm: folder context actions 2019-09-18 11:58:44 +02:00
Joao Moreno bcd7bcedff wip: scm folder menus 2019-09-18 09:49:35 +02:00
Joao Moreno 4aa94e20ed remove unused import 2019-09-17 10:30:12 +02:00
Joao Moreno 227cebfac7 fixes #80671 2019-09-17 09:58:43 +02:00
Alexander 3ff6b96ab7 Update enablement of status bar item in constructor (#80517) 2019-09-10 10:27:33 +02:00
al 6ec5f47c0b Just compare to undefined 2019-09-09 21:40:13 +03:00
al 4afe989cfa 💄 2019-09-08 22:40:11 +03:00
Joao Moreno fe44d14e71 fixes #80415 2019-09-06 09:40:08 +02:00
al 4b90d9ba82 Add branch name to commit input box 2019-09-05 00:03:16 +03:00
Johannes Rieken 6c0bb9ba4d make DecorationData a class and rename it to Decoration, #54938 2019-09-04 11:16:11 +02:00
Johannes Rieken 07d19b90a5 remove automatic merging/overwriting of decorations, simplify proposed API, #54938 2019-09-04 11:16:11 +02:00
João Moreno b3f85bc76d fix git branch sort order (#80096) 2019-08-30 10:27:20 +02:00
Joao Moreno 3b439a8c49 rephrase related to #66296 2019-08-29 09:07:59 +02:00
Greg Van Liew 7ee04f67c7 Update Git count badge description 2019-08-27 12:00:50 -07:00
Miguel Solorio 324da04f35 Update checkmark so they look more like a ✓ 2019-08-15 22:52:38 +02:00
Joao Moreno 22a3f3ec83 💄 2019-08-13 09:54:20 +02:00
Joao Moreno 2c878484c8 Merge commit 'refs/pull/78695/head' of github.com:microsoft/vscode into pr/78695 2019-08-13 09:46:54 +02:00
Joao Moreno 264d6ac829 💄 2019-08-12 14:06:53 +02:00
Joao Moreno 28bcf28232 Merge commit 'refs/pull/78562/head' of github.com:microsoft/vscode into pr/78562 2019-08-12 09:41:30 +02:00
Darrien Singleton 74a08650d6 Fixed incorrect git uri ref for untracked files 2019-08-09 08:08:42 -04:00
Joao Moreno 9f65705acf Merge commit 'refs/pull/75295/head' of github.com:microsoft/vscode into pr/75295 2019-08-08 16:56:51 +02:00
Joao Moreno 2c189f373f fix capture group 2019-08-08 16:38:39 +02:00
Joao Moreno daf581da39 fixes #71258 2019-08-08 16:30:47 +02:00
skprabhanjan 1556800102 Fix fix-64077 With a setting 2019-08-08 16:14:23 +05:30
Joao Moreno 0bb4cc3daf remove misdirection 2019-08-08 12:43:01 +02:00
Dan McCarthy 72e3d3b45d Updated branch tooltip to display full branch name instead of "checkout..." (#72275)
Previously the tooltip displayed when hovering over a branch name in the git workflow simply said "Checkout...".

However, this could be better used by displaying the full branch name since long branch names are concatenated and not shown in full. Therefore it has been updated to do so.
2019-08-08 12:28:03 +02:00
Joao Moreno 5481dcca5e Merge commit 'refs/pull/71710/head' of github.com:microsoft/vscode into pr/71710 2019-08-08 12:17:46 +02:00
Joao Moreno 6af97c8756 💄 2019-08-08 12:02:55 +02:00
Joao Moreno 273cca4ac8 Merge commit 'refs/pull/70536/head' of github.com:microsoft/vscode into pr/70536 2019-08-08 11:57:25 +02:00
Joao Moreno 181759fe6a add git.smartCommitChanges 2019-08-08 11:55:13 +02:00
Joao Moreno 3dc34be7ae Merge commit 'refs/pull/70539/head' of github.com:microsoft/vscode into pr/70539 2019-08-08 11:34:18 +02:00
Joao Moreno fa5c79386c git: promptToSaveFilesBeforeCommit should have more options
related to #66296
2019-08-08 11:30:25 +02:00
Joao Moreno f7fd6b34ba git: improve promptToSaveFilesBeforeCommit message 2019-08-08 11:22:52 +02:00
Joao Moreno d69616088c Merge commit 'refs/pull/67953/head' of github.com:microsoft/vscode into pr/67953 2019-08-08 11:22:28 +02:00
Joao Moreno bd30caa0d7 fix git count badge setting change update 2019-08-08 10:38:33 +02:00
Joao Moreno 59e3396c27 use add instead of stage 2019-08-07 17:37:44 +02:00
Joao Moreno 5a40f525bc Merge commit 'refs/pull/69506/head' of github.com:microsoft/vscode into pr/69506 2019-08-07 17:35:21 +02:00
João Moreno 555693ca34 Merge pull request #75213 from Olovan/master
Fix #72640
2019-08-07 17:30:15 +02:00
Joao Moreno 8a2819be58 fixes #66620 2019-08-07 12:18:44 +02:00