Solves Conflicts????

Browse Source

...

This commit is contained in:

Vazhin Tayeb 2021-01-18 20:07:05 +03:00

parent a0369615d2 e9be1f1ca5

commit 72cbb12243

202 changed files with 51 additions and 32 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/OidcSamples.AuthorizationServer.csproj → CSharp/AuthorizationServer/AuthorizationServer.csproj

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Config.cs → CSharp/AuthorizationServer/Config.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Program.cs → CSharp/AuthorizationServer/Program.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Properties/launchSettings.json → CSharp/AuthorizationServer/Properties/launchSettings.json

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Account/AccountController.cs → CSharp/AuthorizationServer/Quickstart/Account/AccountController.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Account/AccountOptions.cs → CSharp/AuthorizationServer/Quickstart/Account/AccountOptions.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Account/ExternalController.cs → CSharp/AuthorizationServer/Quickstart/Account/ExternalController.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Account/ExternalProvider.cs → CSharp/AuthorizationServer/Quickstart/Account/ExternalProvider.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Account/LoggedOutViewModel.cs → CSharp/AuthorizationServer/Quickstart/Account/LoggedOutViewModel.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Account/LoginInputModel.cs → CSharp/AuthorizationServer/Quickstart/Account/LoginInputModel.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Account/LoginViewModel.cs → CSharp/AuthorizationServer/Quickstart/Account/LoginViewModel.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Account/LogoutInputModel.cs → CSharp/AuthorizationServer/Quickstart/Account/LogoutInputModel.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Account/LogoutViewModel.cs → CSharp/AuthorizationServer/Quickstart/Account/LogoutViewModel.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Account/RedirectViewModel.cs → CSharp/AuthorizationServer/Quickstart/Account/RedirectViewModel.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Account/TotpViewModel.cs → CSharp/AuthorizationServer/Quickstart/Account/TotpViewModel.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Consent/ConsentController.cs → CSharp/AuthorizationServer/Quickstart/Consent/ConsentController.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Consent/ConsentInputModel.cs → CSharp/AuthorizationServer/Quickstart/Consent/ConsentInputModel.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Consent/ConsentOptions.cs → CSharp/AuthorizationServer/Quickstart/Consent/ConsentOptions.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Consent/ConsentViewModel.cs → CSharp/AuthorizationServer/Quickstart/Consent/ConsentViewModel.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Consent/ProcessConsentResult.cs → CSharp/AuthorizationServer/Quickstart/Consent/ProcessConsentResult.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Consent/ScopeViewModel.cs → CSharp/AuthorizationServer/Quickstart/Consent/ScopeViewModel.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Device/DeviceAuthorizationInputModel.cs → CSharp/AuthorizationServer/Quickstart/Device/DeviceAuthorizationInputModel.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Device/DeviceAuthorizationViewModel.cs → CSharp/AuthorizationServer/Quickstart/Device/DeviceAuthorizationViewModel.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Device/DeviceController.cs → CSharp/AuthorizationServer/Quickstart/Device/DeviceController.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Diagnostics/DiagnosticsController.cs → CSharp/AuthorizationServer/Quickstart/Diagnostics/DiagnosticsController.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Diagnostics/DiagnosticsViewModel.cs → CSharp/AuthorizationServer/Quickstart/Diagnostics/DiagnosticsViewModel.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Extensions.cs → CSharp/AuthorizationServer/Quickstart/Extensions.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Grants/GrantsController.cs → CSharp/AuthorizationServer/Quickstart/Grants/GrantsController.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Grants/GrantsViewModel.cs → CSharp/AuthorizationServer/Quickstart/Grants/GrantsViewModel.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Home/ErrorViewModel.cs → CSharp/AuthorizationServer/Quickstart/Home/ErrorViewModel.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/Home/HomeController.cs → CSharp/AuthorizationServer/Quickstart/Home/HomeController.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/SecurityHeadersAttribute.cs → CSharp/AuthorizationServer/Quickstart/SecurityHeadersAttribute.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Quickstart/TestUsers.cs → CSharp/AuthorizationServer/Quickstart/TestUsers.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Startup.cs → CSharp/AuthorizationServer/Startup.cs

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Views/Account/AccessDenied.cshtml → CSharp/AuthorizationServer/Views/Account/AccessDenied.cshtml

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Views/Account/LoggedOut.cshtml → CSharp/AuthorizationServer/Views/Account/LoggedOut.cshtml

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Views/Account/Login.cshtml → CSharp/AuthorizationServer/Views/Account/Login.cshtml

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Views/Account/Logout.cshtml → CSharp/AuthorizationServer/Views/Account/Logout.cshtml

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Views/Account/RegisterMobileDevice.cshtml → CSharp/AuthorizationServer/Views/Account/RegisterMobileDevice.cshtml

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Views/Consent/Index.cshtml → CSharp/AuthorizationServer/Views/Consent/Index.cshtml

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Views/Device/Success.cshtml → CSharp/AuthorizationServer/Views/Device/Success.cshtml

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Views/Device/UserCodeCapture.cshtml → CSharp/AuthorizationServer/Views/Device/UserCodeCapture.cshtml

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Views/Device/UserCodeConfirmation.cshtml → CSharp/AuthorizationServer/Views/Device/UserCodeConfirmation.cshtml

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Views/Diagnostics/Index.cshtml → CSharp/AuthorizationServer/Views/Diagnostics/Index.cshtml

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Views/Grants/Index.cshtml → CSharp/AuthorizationServer/Views/Grants/Index.cshtml

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Views/Home/Index.cshtml → CSharp/AuthorizationServer/Views/Home/Index.cshtml

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Views/Shared/Error.cshtml → CSharp/AuthorizationServer/Views/Shared/Error.cshtml

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Views/Shared/Redirect.cshtml → CSharp/AuthorizationServer/Views/Shared/Redirect.cshtml

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Views/Shared/_Layout.cshtml → CSharp/AuthorizationServer/Views/Shared/_Layout.cshtml

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Views/Shared/_Nav.cshtml → CSharp/AuthorizationServer/Views/Shared/_Nav.cshtml

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Views/Shared/_ScopeListItem.cshtml → CSharp/AuthorizationServer/Views/Shared/_ScopeListItem.cshtml

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Views/Shared/_ValidationSummary.cshtml → CSharp/AuthorizationServer/Views/Shared/_ValidationSummary.cshtml

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Views/_ViewImports.cshtml → CSharp/AuthorizationServer/Views/_ViewImports.cshtml

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/Views/_ViewStart.cshtml → CSharp/AuthorizationServer/Views/_ViewStart.cshtml

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/cert.pem → CSharp/AuthorizationServer/cert.pem

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/key.pem → CSharp/AuthorizationServer/key.pem

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/tempkey.jwk → CSharp/AuthorizationServer/tempkey.jwk

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/css/site.css → CSharp/AuthorizationServer/wwwroot/css/site.css

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/css/site.min.css → CSharp/AuthorizationServer/wwwroot/css/site.min.css vendored

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/css/site.scss → CSharp/AuthorizationServer/wwwroot/css/site.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/favicon.ico → CSharp/AuthorizationServer/wwwroot/favicon.ico

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 1.1 KiB

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/icon.jpg → CSharp/AuthorizationServer/wwwroot/icon.jpg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 19 KiB After Width:  |  Height:  |  Size: 19 KiB

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/icon.png → CSharp/AuthorizationServer/wwwroot/icon.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 20 KiB

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/js/signin-redirect.js → CSharp/AuthorizationServer/wwwroot/js/signin-redirect.js

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/js/signout-redirect.js → CSharp/AuthorizationServer/wwwroot/js/signout-redirect.js

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/README.md → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/README.md

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_alert.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_alert.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_badge.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_badge.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_breadcrumb.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_breadcrumb.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_button-group.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_button-group.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_buttons.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_buttons.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_card.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_card.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_carousel.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_carousel.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_close.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_close.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_code.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_code.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_custom-forms.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_custom-forms.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_dropdown.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_dropdown.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_forms.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_forms.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_functions.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_functions.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_grid.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_grid.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_images.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_images.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_input-group.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_input-group.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_jumbotron.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_jumbotron.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_list-group.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_list-group.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_media.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_media.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_mixins.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_mixins.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_modal.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_modal.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_nav.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_nav.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_navbar.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_navbar.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_pagination.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_pagination.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_popover.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_popover.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_print.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_print.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_progress.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_progress.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_reboot.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_reboot.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_root.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_root.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_spinners.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_spinners.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_tables.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_tables.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_toasts.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_toasts.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_tooltip.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_tooltip.scss

Unescape Escape View File

0

CSharp/OidcSamples/OidcSamples.AuthorizationServer/wwwroot/lib/bootstrap/scss/_transitions.scss → CSharp/AuthorizationServer/wwwroot/lib/bootstrap/scss/_transitions.scss

Unescape Escape View File

Some files were not shown because too many files have changed in this diff Show More