huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,178 Commits 1 Branch 0 Tags 251 MiB
Commit Graph

1178 Commits

Author SHA1 Message Date
ASP.NET CI 543e05df37 Update dependencies.props 
[auto-updated: dependencies]
 2018-08-26 19:15:27 +00:00
Javier Calvarro Nelson e03129e3ba Merge branch 'release/2.2' 2018-08-24 17:20:58 -07:00
Javier Calvarro Nelson b3a6bda45a Sync Identity UI default layout with the templates layout 2018-08-23 15:15:54 -07:00
Javier Calvarro Nelson f2e4a63747 Fix msbuild 2018-08-23 10:46:36 -07:00
Javier Calvarro Nelson ac744d8adb Support Bootstrap 3 and Bootstrap 4 on idenity UI 2018-08-21 17:46:13 -07:00
ASP.NET CI 51dac741db Update package branding for 2.2.0-preview2 2018-08-21 13:33:50 -07:00
ASP.NET CI a255edc9f3 Update dependencies.props 
[auto-updated: dependencies]
 2018-08-19 19:15:58 +00:00
Hao Kung cfa1bb3803
Merge pull request #1928 from aspnet/haok/mg22 
Merge release/2.2 -> master
 2018-08-17 16:13:31 -07:00
Hao Kung 309911abb7 Merge branch 'release/2.2' 2018-08-17 16:11:45 -07:00
Hao Kung 1b8b581aae Revert "[automated] Change default branch to master" 
This reverts commit 32a08fea5d.
 2018-08-17 16:09:36 -07:00
Hao Kung ee0a25e618 Revert "Bumping version from 2.2.0 to 3.0.0" 
This reverts commit b005ef7831.
 2018-08-17 16:09:31 -07:00
Hao Kung 0682c1309f
Merge pull request #1927 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-08-17 15:41:59 -07:00
Hao Kung 4acb2f3317
Merge pull request #1925 from aspnet/haok/qr 
Allow QR AuthenticatorIssuer to be configurable
 2018-08-17 13:45:24 -07:00
Hao Kung d040dabc03 Allow QR AuthenticatorIssuer to be configurable 2018-08-17 12:56:49 -07:00
Hao Kung 1d7a410832
Merge pull request #1869 from tincann/patch-1 
Fix misleading exception message when adding a TokenProvider
 2018-08-17 12:35:45 -07:00
Hao Kung d7b4f113c1
Merge pull request #1921 from aspnet/haok/mg-rel22 
Merge release 2.2 -> master
 2018-08-16 16:08:23 -07:00
Hao Kung 39611d3b57 Fix sln file 2018-08-16 14:20:12 -07:00
Hao Kung 797ea9d8f5 Fix sln file 2018-08-16 14:18:44 -07:00
Hao Kung 39298e8aeb Merge branch 'release/2.2' into master 2018-08-16 13:59:50 -07:00
Thomas Levesque 5e84c11cf9 Add functional tests for external provider display name 2018-08-16 13:40:10 -07:00
Thomas Levesque 373a9c5eb2 Update default UI and samples to use provider display name 2018-08-16 13:40:10 -07:00
Thomas Levesque fec946759c Fix SignInManager to return correct external provider display name 2018-08-16 13:38:23 -07:00
Eilon Lipton eeeef16ec0 Update CONTRIBUTING.md 2018-08-16 13:38:23 -07:00
Wilson 87cfd540ce Fixed documentation typo (#1862) 
Corrected a typo on the XML documentation of the UserId property that made it read "... sets the of the ..."
 2018-08-16 13:38:09 -07:00
Nate McMaster (automated) 32a08fea5d [automated] Change default branch to master 2018-08-16 13:37:39 -07:00
Nate McMaster b005ef7831 Bumping version from 2.2.0 to 3.0.0 2018-08-16 13:22:50 -07:00
Hao Kung 6b257f0abb
Merge pull request #1908 from Gordon-Beeming/fixes/issue1907 
fixing typo #1907
 2018-08-16 13:03:44 -07:00
ASP.NET CI 4f71b90d67 Update dependencies.props 
[auto-updated: dependencies]
 2018-08-12 20:01:28 +00:00
ASP.NET CI 3ae6a1d503 Update dependencies.props 
[auto-updated: dependencies]
 2018-08-12 19:15:02 +00:00
ASP.NET CI b3f356c541 Update dependencies.props 
[auto-updated: dependencies]
 2018-08-06 20:38:12 +00:00
ASP.NET CI 8197412632 Update dependencies.props 
[auto-updated: dependencies]
 2018-08-05 19:54:23 +00:00
Gordon Beeming 3624da47ae fixing typo #1907 2018-08-05 21:46:43 +02:00
ASP.NET CI 520d072cc6 Update dependencies.props 
[auto-updated: dependencies]
 2018-08-05 19:15:51 +00:00
Javier Calvarro Nelson 16a933a0a4 Update static content 2018-08-03 17:18:32 -07:00
Javier Calvarro Nelson 4b2dc59979 [Fixes #1835] Move the default Identity UI to use Bootstrap 4 2018-08-03 13:48:30 -07:00
ASP.NET CI 07774234a6 Update dependencies.props 
[auto-updated: dependencies]
 2018-07-29 19:57:45 +00:00
ASP.NET CI cfe58b695a Update dependencies.props 
[auto-updated: dependencies]
 2018-07-29 12:14:16 -07:00
Nate McMaster bed2c99802
Merge branch 'release/2.2' 2018-07-27 16:00:51 -07:00
Nate McMaster 2b74aed838
Upgrade build tools 2018-07-27 15:28:04 -07:00
Nate McMaster a046f02f8f
Upgrade deps 2018-07-27 14:33:33 -07:00
Nate McMaster ff0e925742
Merge branch 'release/2.2' 2018-07-24 12:16:32 -07:00
Eilon Lipton e7d4c7661d
Update CONTRIBUTING.md 2018-07-24 10:51:25 -07:00
Nate McMaster 31eaaac4a8
Merge branch 'release/2.1' into release/2.2 2018-07-24 10:34:53 -07:00
ASP.NET CI 927d4a9b3c Update dependencies.props 
[auto-updated: dependencies]
 2018-07-22 13:00:03 -07:00
ASP.NET CI 025bfd4bf5 Update dependencies.props 
[auto-updated: dependencies]
 2018-07-22 12:14:46 -07:00
ASP.NET CI a71b79a1c1 Update dependencies.props 
[auto-updated: dependencies]
 2018-07-15 19:59:04 +00:00
ASP.NET CI 5ad23e2086 Update dependencies.props 
[auto-updated: dependencies]
 2018-07-15 12:15:11 -07:00
Nate McMaster 2634637fd5
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 11:54:12 -07:00
Nate McMaster d6cb9c2127
Updating dependencies to 2.1.2 and adding a section for pinned variable versions 2018-07-11 18:48:58 -07:00
Hao Kung 8ef14785a4
Merge pull request #1873 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-07-11 13:27:19 -07:00