Commit Graph

1146 Commits

Author SHA1 Message Date
Joao Moreno
8a2819be58 fixes #66620 2019-08-07 12:18:44 +02:00
João Moreno
b8a8085ad1 Merge branch 'master' into rievans/gitpushbranchwithsymbolfail 2019-08-07 11:51:55 +02:00
Joao Moreno
3f4b96732c fixes #78541 2019-08-07 11:41:21 +02:00
Joao Moreno
21a4e91688 cleanup 2019-08-06 18:28:33 +02:00
Joao Moreno
a6177d979a cleanup for pr #66095 2019-08-06 17:49:42 +02:00
Joao Moreno
c769d8a08a Merge commit 'refs/pull/66095/head' of github.com:microsoft/vscode into pr/66095 2019-08-06 16:57:22 +02:00
Joao Moreno
797bd786ac Merge commit 'refs/pull/65906/head' of github.com:microsoft/vscode into pr/65906 2019-08-06 16:44:25 +02:00
Joao Moreno
a39b7f23aa Merge commit 'refs/pull/65247/head' of github.com:microsoft/vscode into pr/65247 2019-08-06 16:41:02 +02:00
Joao Moreno
54c6639bf8 add git.supportCancellation setting 2019-08-06 14:15:47 +02:00
Joao Moreno
3bbbad38c1 💄 2019-08-06 13:53:34 +02:00
Joao Moreno
c30ae90a9c Merge commit 'refs/pull/78504/head' of github.com:microsoft/vscode into pr/78504 2019-08-06 13:52:15 +02:00
João Moreno
a3984f7371 Merge pull request #63743 from mIkhail-zaretsky/disable-smart-commit
'suggestSmartCommit' configuration setting was introduced
2019-08-05 17:29:53 +02:00
João Moreno
721385ff4d Merge branch 'master' into gitcloneissue 2019-08-05 17:08:13 +02:00
Howard Hung
0d5596bbc3 Feat. #77878 - trim git clone 2019-08-05 22:07:19 +08:00
Joao Moreno
a154f8f451 fixes #77345 2019-07-26 15:33:35 +02:00
Joao Moreno
8213baf076 extract first repository.status call
related to https://github.com/microsoft/vscode/issues/77787#issuecomment-515207062
2019-07-26 14:37:33 +02:00
Joao Moreno
23d8322547 introduce git APIState
fixes #77787
2019-07-25 15:38:10 +02:00
Joao Moreno
752e204839 more disclaimers
related to #76993
2019-07-23 11:48:19 +02:00
Pine Wu
d44f9dae34 Use array of string for applicable builtin settings 2019-07-17 15:07:31 -07:00
Joao Moreno
18d7ce89b7 fixes #76556 2019-07-04 08:58:37 +02:00
sharkykh
b378c5cc8c Put current git branch name as value when renaming (#72957)
* Put current git branch name as value when renaming

* Simplify code
2019-07-03 09:15:07 +02:00
Xhulio Hasani
b462757eb6 HEAD label appears on tab (#76329) 2019-07-03 09:12:32 +02:00
Miguel Solorio
e543c32295 Merge master 2019-07-01 07:46:03 -07:00
Alex Ross
a570522203 Update grammars
Also added a test for an existing c++ syntax highlighting issue.
2019-07-01 16:39:15 +02:00
Miguel Solorio
05ee90f7fd Merge remote-tracking branch 'origin/master' into misolori/new-icons 2019-06-28 11:05:33 -07:00
Miguel Solorio
efaf262c84 Update icons 2019-06-28 09:31:57 -07:00
Prabhanjan S Koushik
997ee7cf79 Removed uppercase styling and explicity added in SCM (#76286) 2019-06-28 16:42:41 +02:00
Miguel Solorio
9f7dd28e6d Update icons 2019-06-26 15:46:15 -07:00
Joao Moreno
c7b6044d0f fix bad watch 2019-06-25 11:40:46 +02:00
Joao Moreno
7b1a326985 fixes #75753 2019-06-24 15:06:03 +02:00
Miguel Solorio
b25f96a60a Update all icons 2019-06-20 11:41:07 -07:00
Joao Moreno
997e91421e add diagnostic tool for git file event issues 2019-06-20 15:47:46 +02:00
ozyx
a9672ad746 remove trailing '/' from repo url for baseFolderName 2019-06-20 00:36:34 -07:00
Miguel Solorio
005a5e4fae Update SCM icons 2019-06-18 13:17:44 -07:00
Joao Moreno
5f70390f0d fixes microsoft/vscode-remote-release#671 2019-06-13 10:02:23 +02:00
Joao Moreno
718f19e8ab 💄 2019-06-12 12:40:16 +02:00
Joao Moreno
fee4ee0df8 Merge commit 'refs/pull/69763/head' of github.com:Microsoft/vscode into pr/69763 2019-06-12 12:35:24 +02:00
Joao Moreno
b485ffb756 fix git nls 2019-06-12 12:02:58 +02:00
Joao Moreno
4a3c056e9a use --follow-tags instead of --tags when pushing
fixes #70081
fixes #75240
2019-06-12 11:06:54 +02:00
Joao Moreno
13d0dad699 fix #41085 2019-06-12 10:38:35 +02:00
Aurélien Pupier
7a5bca9faf Add License field to package.jsons #68423 (#68771)
it should avoid to have "warning XXX: No license field" during yarn
build

Signed-off-by: Aurélien Pupier <apupier@redhat.com>
2019-06-06 11:44:50 +02:00
Joao Moreno
a83c9a4756 fixes #74844 2019-06-05 10:22:48 +02:00
Joao Moreno
afa4faa587 fix git extension tests 2019-06-05 10:22:48 +02:00
Benjamin Pasero
d78a75973c update @types/node (#74881) 2019-06-05 10:20:01 +02:00
Darrien Singleton
69158eb58b Git clone fix to use character set in regex 2019-05-29 06:39:12 -04:00
Darrien Singleton
0bf7825bc2 Revert "Git clone fix to use character set in regex"
This reverts commit fdb1c37b06.
2019-05-29 06:36:34 -04:00
Darrien Singleton
fdb1c37b06 Git clone fix to use character set in regex 2019-05-29 06:35:02 -04:00
Darrien Singleton
a3081451e9 Merge branch 'master' into gitcloneissue 2019-05-27 11:27:58 -04:00
Joao Moreno
f454c2c402 💄 2019-05-27 15:40:23 +02:00
Joao Moreno
5540e01820 Merge commit 'refs/pull/61149/head' of github.com:Microsoft/vscode into pr/61149 2019-05-27 15:20:08 +02:00