3430 Commits

Author	SHA1	Message	Date
Joao Moreno	3f31510686	git: multirepo revert	2017-08-15 16:20:58 +02:00
Joao Moreno	b95a585df9	git: multi repo stage	2017-08-15 16:19:44 +02:00
Joao Moreno	76cfa5d796	git: remove splats	2017-08-15 16:14:41 +02:00
Joao Moreno	8c747ed66e	git model remove run	2017-08-15 15:56:11 +02:00
Joao Moreno	303dd11747	git multirepo stage	2017-08-15 15:55:00 +02:00
Martin Aeschlimann	b1e8b37c04	colorizer test fix	2017-08-15 15:29:56 +02:00
Martin Aeschlimann	44aa7c2f08	[php] update grammar	2017-08-15 15:29:56 +02:00
Martin Aeschlimann	79166edd9a	[docker] update grammar	2017-08-15 15:29:56 +02:00
Martin Aeschlimann	95a14bbc22	[css] update grammar	2017-08-15 15:29:56 +02:00
Martin Aeschlimann	7cc88ea658	[java] update grammar	2017-08-15 15:29:56 +02:00
Martin Aeschlimann	bd329ffbed	[rust] update grammar	2017-08-15 15:29:56 +02:00
Martin Aeschlimann	af0a655e3d	[scss] update grammar	2017-08-15 15:29:56 +02:00
Martin Aeschlimann	3d092ae516	[ruby] update grammar	2017-08-15 15:29:56 +02:00
Joao Moreno	16e8189650	model -> repository	2017-08-15 15:17:15 +02:00
Joao Moreno	91435475ee	Merge branch 'master' into scm-multiroot	2017-08-15 12:03:01 +02:00
Joao Moreno	acb83d00c0	remove Resource from git model method interfaces	2017-08-15 11:53:35 +02:00
Joao Moreno	bbe70bc9b9	fixes #32459	2017-08-15 11:31:45 +02:00
Joao Moreno	5553acb377	cleanup git stash functionality	2017-08-15 10:03:42 +02:00
Joao Moreno	31c21ce7e6	Merge branch 'stashing' of https://github.com/Krzysztof-Cieslak/vscode into Krzysztof-Cieslak-stashing	2017-08-15 09:37:29 +02:00
Joao Moreno	b9eb8baea5	wip: add across multiple repositories	2017-08-15 09:35:24 +02:00
Ramya Achutha Rao	9ec087df26	Upstream fix for #32263	2017-08-14 14:18:53 -07:00
Krzysztof Cieślak	8dcb181fbc	Load stashes only when needed	2017-08-14 22:44:42 +02:00
Ramya Achutha Rao	6822a81494	Escape $ when not a tabstop or #32420	2017-08-14 13:42:08 -07:00
Krzysztof Cieślak	b5bf3535ef	Fix stash pop	2017-08-14 22:30:52 +02:00
Krzysztof Cieślak	13484ae98d	Add commands	2017-08-14 22:30:50 +02:00
Krzysztof Cieślak	4cd45c49bd	Repository and Model changes	2017-08-14 22:30:36 +02:00
Ramya Achutha Rao	1531c8d2f4	lookahead not needed when running emmet expand #32478	2017-08-14 09:58:07 -07:00
Joao Moreno	b8b36a0f18	remove unused property	2017-08-14 16:44:58 +02:00
Joao Moreno	405ed72142	different command syntax	2017-08-14 15:30:23 +02:00
Joao Moreno	3268900f78	Merge branch 'master' into scm-multiroot	2017-08-14 15:10:07 +02:00
Ramya Achutha Rao	9c86eb33f9	Fixes to getCurrentWord in emmet helper Fixes #32254	2017-08-13 12:41:55 -07:00
Ramya Achutha Rao	fa413ff008	Move the checks on abbreviations to helper module	2017-08-12 20:25:17 -07:00
Rob Lourens	77e2e9a4e8	Update PHP grammar	2017-08-12 17:34:43 -07:00
Martin Aeschlimann	c185e7d44e	[json] hover over color box doesn't show color picker. Fixes #32298	2017-08-12 16:40:09 +02:00
Martin Aeschlimann	5fce6df8a2	[json] Protect from incompete colors (for exception in #32298)	2017-08-12 16:20:38 +02:00
Ramya Achutha Rao	77d373e39b	Remove fallback to html as this will enable emmet everywhere	2017-08-11 23:45:25 -07:00
Ramya Achutha Rao	e190b10074	When file cannot be parsed, dont try validations #32354	2017-08-11 15:02:05 -07:00
Ramya Achutha Rao	78809b70fb	Fallback to tab for non empty selections	2017-08-11 11:25:54 -07:00
Ramya Achutha Rao	e3238c4583	Avoid error when tabbing on selection that is not abbreviation	2017-08-11 11:10:30 -07:00
Ramya Achutha Rao	bb9bbeb3dc	More checks on css abbr	2017-08-11 09:49:49 -07:00
Ramya Achutha Rao	eded868aa2	Fix for #1623 in new emmet when tab is back	2017-08-11 08:41:05 -07:00
Ramya Rao	02bbc149cf	Option to trigger emmet expansion on tab (#32334)	2017-08-11 08:21:37 -07:00
Martin Aeschlimann	149cb6fade	Change name of scss mode to SCSS	2017-08-11 16:33:50 +02:00
Joao Moreno	c87e0d7629	fix css color formats	2017-08-11 13:00:08 +02:00
Martin Aeschlimann	3e27c42d7a	Merge pull request #31405 from DustinCampbell/update-csharp-grammer ... Update C# TextMate grammar with support for #r and #load directives	2017-08-11 12:02:31 +02:00
Joao Moreno	7669ad147e	luminance !== luminosity	2017-08-11 11:50:10 +02:00
Joao Moreno	13a6a7a9c3	color api: remove ColorRange.format	2017-08-11 11:50:10 +02:00
Joao Moreno	0f5272afe9	color api: docs	2017-08-11 11:50:10 +02:00
Martin Aeschlimann	f4db436c9d	Merge pull request #32253 from DustinCampbell/cake-support ... Add .cake file extension for C# language	2017-08-11 11:49:30 +02:00
João Moreno	2f57095b91	Merge pull request #29264 from Krzysztof-Cieslak/commit_amend ... Add Git commit amend commands	2017-08-11 09:02:12 +01:00