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

594 Коммитов

Автор SHA1 Сообщение Дата
clecompt 1a8b11b59f Clean up spacing. 2015-12-03 17:04:10 -08:00
clecompt 790adefbfb Merge branch 'December-Integration' into clecompt-sim 2015-12-03 15:27:38 -08:00
clecompt 73624cfa1c Code review. 2015-12-03 15:26:59 -08:00
Alexander Zaslonov e2fa3b9d60 Merge pull request #83 from Azure/clecompt-asastart
Port ASA start-time changes to RM
2015-12-03 11:13:13 -08:00
clecompt 6f79999482 Handle the legacy name. 2015-12-02 16:41:13 -08:00
clecompt f0fc6782b0 Port ASA start-time changes to RM. 2015-12-02 13:10:21 -08:00
Jamie Wilbraham 02807ff6d7 removed unused nav items 2015-11-20 08:10:32 +13:00
Jamie Wilbraham 530d5860d3 minor tweaks 2015-11-19 15:45:29 +13:00
Jamie Wilbraham d629bea5f0 removal 2015-11-19 14:30:45 +13:00
Jamie Wilbraham 813b2d367a test squash 2015-11-19 14:05:03 +13:00
James Webster c54cceaecc Merge pull request #78 from Azure/master
Update DeploymentLib.ps1
2015-11-18 11:07:48 -08:00
Eugene Mirotin 7b455237af make REST DB util generic 2015-11-18 18:34:27 +03:00
James Webster 3afa3e11be Update DeploymentLib.ps1
bump version to match release
2015-11-13 17:36:17 -08:00
James Webster e702eb4a15 Merge pull request #72 from Azure/october-integration
October Integration Release
2015-11-09 12:53:02 -08:00
Alexander Zaslonov 2572655017 Merge pull request #71 from Azure/jamesweb-dev
Respect Sku workitem for existing deployments
2015-11-06 22:06:57 -08:00
jamesweb-ms fe05e66851 Respect Sku ps changes
Check for commands that might be available in older PS versions
2015-11-06 14:23:11 -08:00
jamesweb-ms 15fe405b19 Merge branch 'october-integration' into jamesweb-dev 2015-11-05 14:21:51 -08:00
jamesweb-ms dde3e0b422 Parameterize skus 2015-11-05 14:21:03 -08:00
Inspiravetion f52c161142 Merge pull request #70 from Azure/az_bundling_fixes
Fixed bundling for Release build.
2015-11-04 15:00:38 -08:00
alzaslon 13dec9929c minor cleanup 2015-11-04 14:42:07 -08:00
alzaslon 3ef4feae66 Fixed bundling for Release build. 2015-11-04 14:24:14 -08:00
James Webster b62945372d Merge pull request #68 from Azure/jamesweb-dev
Jamesweb dev
2015-11-02 17:32:50 -08:00
jamesweb-ms 3d442fc971 Fix merge tab issue 2015-11-02 17:31:21 -08:00
jamesweb-ms b6392ef160 Merge from master 2015-11-02 17:27:44 -08:00
Ariel Aguilar a89f84fd71 Update RemoteMonitoring.json
Fix storage account SKU to standard GRS.
2015-11-02 16:13:01 -08:00
Alexander Zaslonov 016415d465 Merge pull request #63 from Azure/jamesweb-dev
Remove explict vs versions
2015-11-02 12:39:51 -08:00
jamesweb-ms 02d31e3014 undo merge error with json file 2015-11-02 12:33:17 -08:00
Alexander Zaslonov b12132f991 Merge pull request #64 from Azure/krangel-implement-bem-in-less
Krangel implement bem in less
2015-11-02 12:27:25 -08:00
jamesweb-ms 16aa7c0444 Merge master, keeping October-Integration 2015-11-02 12:24:33 -08:00
jamesweb-ms 37c0e02b2b Merge branch 'october-integration' into jamesweb-dev 2015-11-02 12:15:15 -08:00
Brett Miller 2b395d7ee7 Fix 405 "Method not allowed" error when Simulator Initializes DocumentDb 2015-11-02 12:02:10 -08:00
Keith Craig 850a51936e Add MIME type for .less to fix 404 issues 2015-10-30 19:36:12 -07:00
Keith Craig 733b904caf Merge branch 'october-integration' into krangel-implement-bem-in-less
Conflicts:
	DeviceAdministration/Web/Helpers/DeviceDisplayHelper.cs
	DeviceAdministration/Web/Views/DeviceCommand/Index.cshtml
2015-10-30 16:42:41 -07:00
jamesweb-ms 21d3a6b897 Merge branch 'october-integration' into jamesweb-dev 2015-10-30 16:30:43 -07:00
jamesweb-ms 8400bfc752 Remove explict VS version requirement so works with both VS2013 and VS2015 2015-10-30 16:30:04 -07:00
James Webster 82a7f4a072 Merge pull request #62 from Azure/vertigo-davidb-minor-command-fixes
Vertigo davidb minor command fixes
2015-10-30 16:29:00 -07:00
Kelsey Rangel e5761a871c Refactor TextCopy function 2015-10-30 16:03:07 -07:00
Kelsey Rangel fa2b5fefd0 Refactor minor style class 2015-10-30 16:02:37 -07:00
Kelsey Rangel 2075f0b899 Merge branch 'october-integration' into krangel-implement-bem-in-less
# Conflicts:
#	DeviceAdministration/Web/Views/DeviceCommand/Index.cshtml
2015-10-30 16:01:20 -07:00
Keith Craig 5ea6873e38 Merge branch 'october-integration' into vertigo-davidb-minor-command-fixes
# Conflicts:
#	DeviceAdministration/Web/Views/DeviceCommand/Index.cshtml
2015-10-30 15:12:23 -07:00
Alexander Zaslonov 90d85f28a1 Merge pull request #59 from jeffwilcox/patch-1
Updating README.MD
2015-10-30 13:44:53 -07:00
Alexander Zaslonov 85b263627c Merge pull request #57 from Azure/keithcraig-resend-command-fix
Keithcraig resend command fix
2015-10-30 13:44:26 -07:00
Alexander Zaslonov 84bb0ecd4f Merge pull request #61 from Azure/keithcraig-nav-icon-visuals-fix
Change styles to fix svg visual issues in nav
2015-10-30 13:43:41 -07:00
Kelsey Rangel 9fabaf868f Remove unused folder 2015-10-30 13:23:57 -07:00
Kelsey Rangel 8dbc239581 Refactor function name to be more descriptive 2015-10-30 12:01:38 -07:00
Dave Bautista 04ce1b8d44 Remove Resend Button for No Longer Supported Commands in History 2015-10-30 11:25:21 -07:00
Keith Craig 4a722ce522 Fixed misleading (but technically correct) code 2015-10-30 11:23:25 -07:00
Keith Craig e342430645 Remove unneeded exclusion
(The dotLess will not generate css, so we don't need this)
2015-10-30 11:16:31 -07:00
Keith Craig 2454e1b0d4 Merge branch 'keithcraig-nav-icon-visuals-fix' into krangel-implement-bem-in-less
# Conflicts:
#	DeviceAdministration/Web/Content/screen.css
#	DeviceAdministration/Web/Content/screen.css.map
#	DeviceAdministration/Web/Content/screen.less
#	DeviceAdministration/Web/Content/screen.min.css
2015-10-30 10:50:52 -07:00
Kelsey Rangel 9c92b7f253 Merge remote-tracking branch 'origin/krangel-implement-bem-in-less' into krangel-implement-bem-in-less 2015-10-30 10:33:39 -07:00