Commit Graph

493 Commits

Author SHA1 Message Date
Ryan Brandenburg 3570f1a2b1 Merge branch 'merge/release/2.2-to-master' 2018-08-23 10:32:20 -07:00
Javier Calvarro Nelson ed19e34256 Upgrade deps 2018-08-22 14:29:38 -07:00
Javier Calvarro Nelson de0932961b Default Identity UI to Bootstrap4 2018-08-22 13:40:38 -07:00
Javier Calvarro Nelson 110d835434 Fix layout and login partial issues 2018-08-22 13:33:01 -07:00
Javier Calvarro Nelson 3ed89516ba Update precedence for 2.2 templates 2018-08-22 13:31:59 -07:00
Ryan Brandenburg 11c6ebea2e Add comments regarding HSTS max age 2018-08-22 11:45:56 -07:00
Ryan Brandenburg d9e71527e8 Fix copyright year 2018-08-22 11:44:46 -07:00
ASP.NET CI 2476481464 Update package branding for 2.2.0-preview2 2018-08-21 13:33:52 -07:00
Ryan Brandenburg e28e851ed8 Make a VSTS builds use a template 2018-08-20 10:31:29 -07:00
Ryan Brandenburg 2d33543117 Skip test broken by lack of 30 SDK 2018-08-20 10:28:31 -07:00
ASP.NET CI 7a0967e5c6 Update dependencies.props
[auto-updated: dependencies]
2018-08-19 19:33:01 +00:00
Ryan Brandenburg 07b97e2f89 Merge branch 'merge/release/2.2-to-master' 2018-08-14 09:50:10 -07:00
Ryan Brandenburg a431f8efa1
Don't publish too much of ClientApp (#672)
* Don't publish too much of ClientApp

* Fix scripts and remove extra publish items
2018-08-13 16:21:50 -07:00
Ryan Brandenburg 9618a59485 Add .gitattributes file 2018-08-13 11:12:31 -07:00
ASP.NET CI d7b897ad75 Update dependencies.props
[auto-updated: dependencies]
2018-08-12 20:18:24 +00:00
ASP.NET CI 25661213f2 Update dependencies.props
[auto-updated: dependencies]
2018-08-12 19:33:25 +00:00
Ryan Brandenburg b029f79b4d
Import styles in correct order (#668)
In the `angular-cli.json` file, the styles.css file should be imported last in the styles section, so the developer can override styles from third party libraries (bootstrap, in this case).
2018-08-10 14:45:12 -07:00
Nate McMaster 7d91d659ff
Merge branch 'release/2.2' 2018-08-10 11:06:49 -07:00
Nate McMaster af616d9b99
Remove KoreBuild-isms from project templates (#667)
Removing MSBuild properties and items are for our build infrastructure, not for customers.
2018-08-10 11:01:56 -07:00
Ryan Brandenburg c33044c555 Merge branch 'merge/release/2.2-to-master' 2018-08-08 15:42:36 -07:00
Ryan Brandenburg f868277373 Experience review feedback 2018-08-08 10:57:45 -07:00
Nate McMaster 2b273f0f73
Merge branch 'release/2.1' into release/2.2 2018-08-07 12:53:44 -07:00
Nate McMaster 678449fca0
Bumping version from 2.1.3 to 2.1.4 2018-08-07 12:42:45 -07:00
Ryan Brandenburg 647f0f81c2 CompatibilityVersion -> 2.2 2018-08-06 16:22:05 -07:00
Ryan Brandenburg e47a08612b JQuery-validate-unobtrusive version 3.2.10 2018-08-06 15:21:46 -07:00
ASP.NET CI 6da2ae6dbf Update dependencies.props
[auto-updated: dependencies]
2018-08-06 20:54:17 +00:00
Ryan Brandenburg f82461b4b0 Merge branch 'merge/release/2.2-to-master' 2018-08-06 13:01:08 -07:00
Ryan Brandenburg c5a5134e46 Revert "Rename Web Application to Starter Web Application"
This reverts commit 01ce77da56.
2018-08-06 12:10:14 -07:00
Ryan Brandenburg 41d648fcc1 Fully-qualify model name 2018-08-06 12:03:22 -07:00
Artak 3ee57ff81a
Merge pull request #659 from aspnet/dev/mkArtakMSFT/issue579
Removed the `layout=null` assignment from the page
2018-08-06 10:35:26 -07:00
Ryan Brandenburg 71c15fb76a Use bootstrap4 for templates 2018-08-06 10:16:35 -07:00
Artak 14512a714f
Removed the `layout=null` assignment from the page 2018-08-06 08:55:51 -07:00
Ryan Brandenburg d95f971693 Fix broken tests 2018-08-06 07:22:55 -07:00
Scott Addie d5cad26462 Clarify help text for --no-https option 2018-08-02 10:02:50 -07:00
Nate McMaster ba02ab85c1
Merge branch 'release/2.2' 2018-07-24 13:00:07 -07:00
Nate McMaster 0435add47a
Merge branch 'release/2.1' into release/2.2 2018-07-24 11:59:30 -07:00
Eilon Lipton 45dff18520
Update CONTRIBUTING.md 2018-07-24 10:57:53 -07:00
ASP.NET CI 6b0f373ab9 Update dependencies.props
[auto-updated: dependencies]
2018-07-22 13:18:25 -07:00
ASP.NET CI 92dac61b55 Update dependencies.props
[auto-updated: dependencies]
2018-07-22 12:30:35 -07:00
Ryan Brandenburg 54d0b4857f
Merge pull request #627 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-07-19 11:22:30 -07:00
Ryan Brandenburg 01ce77da56 Rename Web Application to Starter Web Application 2018-07-18 16:18:49 -07:00
Nate McMaster 55b697ab05
Revert "Add package version to Microsoft.AspNetCore.App in project templates"
This reverts commit 727bd52b64.
2018-07-18 13:11:01 -07:00
Nate McMaster 81d6aa0d6b
Delete .travis.yml 2018-07-18 13:09:58 -07:00
Ryan Brandenburg 39c7bf8e7d
Merge pull request #611 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-07-18 12:29:50 -07:00
Ryan Brandenburg 4aa0c0cf61
Merge branch 'master' into merge/release/2.2-to-master 2018-07-16 11:44:08 -07:00
ASP.NET CI 1c9817a197 Update dependencies.props
[auto-updated: dependencies]
2018-07-15 20:16:06 +00:00
ASP.NET CI 26fd3dce25 Update dependencies.props
[auto-updated: dependencies]
2018-07-15 12:31:05 -07:00
Nate McMaster 201a35e095
Pin version variables to the ASP.NET Core 2.1.2 baseline
This reverts our previous policy of cascading versions on all servicing updates.
This moves variables into the 'pinned' section, and points them to the latest
stable release (versions that were used at the time of the 2.1.2 release).
2018-07-12 14:03:45 -07:00
Nate McMaster 62bf802971
Updating dependencies to 2.1.2 and adding a section for pinned variable versions 2018-07-12 14:03:45 -07:00
Ryan Brandenburg 2a454c5aa8 Update js packages 2018-07-11 14:59:55 -07:00