Граф коммитов

730 Коммитов

Автор SHA1 Сообщение Дата
Naveed Aziz fecee258b7 Reformatted schema files 2017-06-01 19:04:04 -07:00
Naveed Aziz e3b28e1f61 Add name property pattern validation and child resource support for site config 2017-05-26 14:42:45 -07:00
Naveed Aziz 2e5110f03f Merge remote-tracking branch 'upstream/master' 2017-05-24 21:45:12 -07:00
Naveed Aziz 73d5e0d911 Added appsettings and connection strings as child resources to sites and slots 2017-05-24 21:44:42 -07:00
Tian Ouyang 5f68df0c2a Merge pull request #317 from TianoMS/tiano-d2
Fix a typo in Microsoft.Solutions.json.
2017-05-10 16:14:24 -07:00
Tian Ouyang 4f819e52da Fix a typo in Microsoft.Solutions.json. 2017-05-10 16:13:32 -07:00
Tian Ouyang fc419d011a Merge pull request #316 from TianoMS/tiano-d2
Add schema for 2016-09-01-preview/Microsoft.Solutions.
2017-05-10 16:08:18 -07:00
Tian Ouyang 2615232725 Make 'kind' an optional property. 2017-05-10 16:06:36 -07:00
Tian Ouyang 3101e35234 Add more template functions. 2017-05-10 12:34:13 -07:00
Tian Ouyang 9d97e2ff42 Add schema for 2016-09-01-preview/Microsoft.Solutions. 2017-05-09 15:37:06 -07:00
Tian Ouyang fac811a31a Merge pull request #314 from TianoMS/tiano-d2
Update deploymentTemplate and add new Microsoft.Resources schema
2017-05-09 14:11:09 -07:00
Tian Ouyang 777a4aa33e Fix resource copy count and batchSize. 2017-05-09 13:04:35 -07:00
Tian Ouyang 4d7ef81f68 Fix condition definition. 2017-05-08 18:45:11 -07:00
Tian Ouyang d3f8f12497 Fix template function string. 2017-05-08 17:11:03 -07:00
Tian Ouyang 93754c3b98 Update deploymentTemplate.json to include the new api-version. 2017-05-08 16:50:20 -07:00
Tian Ouyang 50f3eb6009 Update 2017-05-10 Microsoft.Resources/deployments.
Update for serial copy, condition in template and template functions.
2017-05-08 16:34:21 -07:00
Tian Ouyang 69d814a205 copy from 2016-09-01. 2017-05-08 14:18:10 -07:00
Tian Ouyang c206542b29 Merge pull request #310 from dkamstra/master
Added 2017-04-01 version of Microsoft.Insights activityLogAlerts and …
2017-05-03 20:48:31 -07:00
Duke Kamstra ab1aab5b00 Added 2017-04-01 version of Microsoft.Insights activityLogAlerts and actionGroups 2017-04-25 12:11:39 -07:00
Tian Ouyang 497d610227 Merge pull request #308 from dkamstra/master
Merged two files into one
2017-04-14 16:05:02 -07:00
Duke Kamstra ae76be4244 Added missing ',' and fixed tab spacing 2017-04-14 15:14:47 -07:00
Duke Kamstra b637e608f7 Remove tags 2017-04-14 12:30:00 -07:00
Duke Kamstra 5af089a083 Merge 2017-04-14 12:23:28 -07:00
Duke Kamstra ae0b0446e2 Fix filename reference 2017-04-14 08:46:17 -07:00
Duke Kamstra 657ee42a6c Merge ActionGroup and ActivityLogAlert files into one 2017-04-14 08:43:03 -07:00
Tian Ouyang 9fd4f706a2 Merge pull request #293 from EvgenyAgafonchikov/master
Updating network schemes; Adding related tests
2017-04-12 21:38:49 -07:00
Tian Ouyang 6fd3741d97 Merge pull request #296 from QuasarSE/patch-9-UNTB-regex
Combined recommendedSizes and regex fixes
2017-04-07 11:00:56 -07:00
Tian Ouyang 30143733f4 Merge pull request #295 from rcabr/master
Microsoft.Sql: Azure AD administrator
2017-04-04 10:52:46 -07:00
Evgeny Agafonchikov 1602ee1f91 Updating network schemes; Adding related tests 2017-04-04 20:25:33 +03:00
rcabr a343966e0c Moved from 'resourceDefinitions' to 'definitions' 2017-04-03 16:20:23 -04:00
Tian Ouyang b72b247f0d Merge pull request #304 from dkamstra/master
ActivityLog Alerts and ActionGroups
2017-03-31 18:17:16 -07:00
dkamstra edec037a66 fixed indenting 2017-03-31 11:30:01 -07:00
Duke Kamstra 8aee3b1cd1 Made fixes so the tests will pass 2017-03-30 15:39:55 -07:00
Duke Kamstra 829669d5c7 Fixed ID, and camelCasing 2017-03-30 15:21:31 -07:00
Duke Kamstra deca2a2bc3 Update title property 2017-03-30 14:02:44 -07:00
Duke Kamstra 8317117bd5 Fixed type 2017-03-30 11:34:49 -07:00
Duke Kamstra 29d0d6e7df Fix camel casing on resource type names 2017-03-30 08:07:22 -07:00
Duke Kamstra f7e75b66f1 ActivityLog Alerts and ActionGroups 2017-03-29 14:02:08 -07:00
rcabr 5c68302e77 Updated deploymentTemplate.json files to reference new Microsoft.Sql/administrators 2017-03-28 15:54:03 -04:00
Tian Ouyang 3268155ab3 Merge pull request #286 from vladca/master_geo
[Please merge] Traffic Manager schema 2017-03-01
2017-03-26 20:58:36 -07:00
Tian Ouyang 6e054a3cc4 Merge pull request #292 from TianoMS/tiano-d2
Move "extensionsChild" definition to "definitions".
2017-03-26 20:53:14 -07:00
Shawn Elliott fff0e836fe Added regex and validationMessage to UserNameTextBox 2017-03-24 16:02:30 -04:00
Shawn Elliott 9fa73992f2 Added regex and validationMessage to UserNameTextBox 2017-03-24 15:59:45 -04:00
Shawn Elliott 2378852c62 Added regex and validationMessage to UserNameTextBox 2017-03-24 15:56:16 -04:00
Shawn Elliott 7f9f1b58a3 spacing. 2017-03-24 15:50:19 -04:00
Shawn Elliott ed5c9d0077 Update CreateUIDefinition.CommonControl.json 2017-03-24 15:48:17 -04:00
rcabr c96ab508fd Added to Microsoft.Sql the schema for specifiying an Azure AD administrator for the Sql Azure server 2017-03-24 11:02:39 -04:00
Shawn Elliott ba7ab322b0 SizeSelector - min# recommendedSizes 3->1
Adjusted spacing to make change clearer.
2017-03-23 15:54:04 -04:00
Shawn Elliott 338376c509 SizeSelector - min# recommendedSizes 3->1
Fixed typos (mine).
2017-03-23 15:51:58 -04:00
Shawn Elliott 33bc35f3c1 SizeSelector - min# recommendedSizes 3->1
Decrease the minimum recommendedSizes list size from 3 to 1 on the SizeSelector control.
2017-03-23 15:48:27 -04:00