Skip to content

Commit 0db27fc

Browse files
norbertedernorberteder
committed
Support IdentityServer3 > 2.0.0
1 parent 0d51805 commit 0db27fc

11 files changed

Lines changed: 41 additions & 9452 deletions

‎source/IdentityServer3.Contrib.Localization.UI.Tests/IdentityServer3.Contrib.Localization.UI.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
</Target>
9191
-->
9292
<Choose>
93-
<When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v3.5' Or $(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
93+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v3.5' Or $(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')">
9494
<ItemGroup>
9595
<Reference Include="SecondLanguage">
9696
<HintPath>..\packages\SecondLanguage\lib\net35\SecondLanguage.dll</HintPath>

‎source/IdentityServer3.Contrib.Localization.UI.Tests/bin/Release/Thinktecture.IdentityServer3.xml‎

Lines changed: 0 additions & 9409 deletions
This file was deleted.

‎source/IdentityServer3.Contrib.Localization.UI.Tests/obj/Release/IdentityServer3.Contrib.Localization.UI.Tests.csproj.FileListAbsolute.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@ C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.
22
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\assets\checksession.html
33
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\assets\_consent.html
44
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\assets\_error.html
5+
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\assets\_FormPostResponse.html
6+
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\assets\_layout.html
57
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\assets\_loggedOut.html
68
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\assets\_login.html
79
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\assets\_logout.html
810
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\assets\_permissions.html
11+
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\assets\_welcome.html
912
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\Resources\de.po
1013
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\Resources\en.po
1114
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\IdentityServer3.Contrib.Localization.UI.Tests.dll
1215
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\IdentityServer3.Contrib.Localization.UI.Tests.pdb
1316
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\IdentityServer3.Contrib.Localization.UI.dll
1417
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\SecondLanguage.dll
15-
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\Thinktecture.IdentityServer3.dll
18+
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\IdentityServer3.dll
1619
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\Owin.dll
1720
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\IdentityServer3.Contrib.Localization.UI.pdb
1821
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\SecondLanguage.pdb
1922
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\SecondLanguage.xml
20-
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\Thinktecture.IdentityServer3.pdb
21-
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\Thinktecture.IdentityServer3.xml
23+
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\IdentityServer3.pdb
24+
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\IdentityServer3.xml
2225
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\obj\Release\IdentityServer3.Contrib.Localization.UI.Tests.dll
2326
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\obj\Release\IdentityServer3.Contrib.Localization.UI.Tests.pdb
24-
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\assets\_FormPostResponse.html
25-
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\assets\_layout.html
26-
C:\_Work\IdentityServer3.Contrib.Localization.UI\source\IdentityServer3.Contrib.Localization.UI.Tests\bin\Release\assets\_welcome.html

‎source/IdentityServer3.Contrib.Localization.UI/IdentityServer3.Contrib.Localization.UI.csproj‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,17 @@ if not exist "$(SolutionDir)..\packages" mkdir "$(SolutionDir)..\packages"
9999
"$(SolutionDir)..\tools\nuget.exe" pack "$(SolutionDir)IdentityServer3.Contrib.Localization.UI\IdentityServer3.Contrib.Localization.UI.nuspec" -OutputDirectory "$(SolutionDir)..\packages"
100100
)</PostBuildEvent>
101101
</PropertyGroup>
102+
<Choose>
103+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')">
104+
<ItemGroup>
105+
<Reference Include="IdentityServer3">
106+
<HintPath>..\packages\IdentityServer3\lib\net45\IdentityServer3.dll</HintPath>
107+
<Private>True</Private>
108+
<Paket>True</Paket>
109+
</Reference>
110+
</ItemGroup>
111+
</When>
112+
</Choose>
102113
<Choose>
103114
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v3.5'">
104115
<ItemGroup>
@@ -127,7 +138,7 @@ if not exist "$(SolutionDir)..\packages" mkdir "$(SolutionDir)..\packages"
127138
</Reference>
128139
</ItemGroup>
129140
</When>
130-
<When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
141+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')">
131142
<ItemGroup>
132143
<Reference Include="Newtonsoft.Json">
133144
<HintPath>..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -136,27 +147,27 @@ if not exist "$(SolutionDir)..\packages" mkdir "$(SolutionDir)..\packages"
136147
</Reference>
137148
</ItemGroup>
138149
</When>
139-
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile5') Or ($(TargetFrameworkProfile) == 'Profile6') Or ($(TargetFrameworkProfile) == 'Profile14') Or ($(TargetFrameworkProfile) == 'Profile19') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile37') Or ($(TargetFrameworkProfile) == 'Profile42') Or ($(TargetFrameworkProfile) == 'Profile47') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile92') Or ($(TargetFrameworkProfile) == 'Profile102') Or ($(TargetFrameworkProfile) == 'Profile136') Or ($(TargetFrameworkProfile) == 'Profile147') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile158') Or ($(TargetFrameworkProfile) == 'Profile225') Or ($(TargetFrameworkProfile) == 'Profile240') Or ($(TargetFrameworkProfile) == 'Profile255') Or ($(TargetFrameworkProfile) == 'Profile328') Or ($(TargetFrameworkProfile) == 'Profile336') Or ($(TargetFrameworkProfile) == 'Profile344')">
150+
<When Condition="($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch') Or ($(TargetFrameworkIdentifier) == 'Xamarin.iOS') Or ($(TargetFrameworkIdentifier) == 'Xamarin.Mac') Or ($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile259')">
140151
<ItemGroup>
141152
<Reference Include="Newtonsoft.Json">
142-
<HintPath>..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
153+
<HintPath>..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81+dnxcore50\Newtonsoft.Json.dll</HintPath>
143154
<Private>True</Private>
144155
<Paket>True</Paket>
145156
</Reference>
146157
</ItemGroup>
147158
</When>
148-
<When Condition="($(TargetFrameworkProfile) == 'Profile7') Or ($(TargetFrameworkProfile) == 'Profile44') Or ($(TargetFrameworkProfile) == 'Profile49') Or ($(TargetFrameworkProfile) == 'Profile78') Or ($(TargetFrameworkProfile) == 'Profile111') Or ($(TargetFrameworkProfile) == 'Profile151') Or ($(TargetFrameworkProfile) == 'Profile259')">
159+
<When Condition="($(TargetFrameworkIdentifier) == 'WindowsPhoneApp') Or ($(TargetFrameworkIdentifier) == '.NETCore') Or ($(TargetFrameworkIdentifier) == 'Silverlight' And $(TargetFrameworkVersion) == 'v5.0') Or ($(TargetFrameworkIdentifier) == 'WindowsPhone' And ($(TargetFrameworkVersion) == 'v8.0' Or $(TargetFrameworkVersion) == 'v8.1')) Or ($(TargetFrameworkProfile) == 'Profile5') Or ($(TargetFrameworkProfile) == 'Profile6') Or ($(TargetFrameworkProfile) == 'Profile14') Or ($(TargetFrameworkProfile) == 'Profile19') Or ($(TargetFrameworkProfile) == 'Profile24') Or ($(TargetFrameworkProfile) == 'Profile31') Or ($(TargetFrameworkProfile) == 'Profile32') Or ($(TargetFrameworkProfile) == 'Profile37') Or ($(TargetFrameworkProfile) == 'Profile42') Or ($(TargetFrameworkProfile) == 'Profile47') Or ($(TargetFrameworkProfile) == 'Profile84') Or ($(TargetFrameworkProfile) == 'Profile92') Or ($(TargetFrameworkProfile) == 'Profile102') Or ($(TargetFrameworkProfile) == 'Profile136') Or ($(TargetFrameworkProfile) == 'Profile147') Or ($(TargetFrameworkProfile) == 'Profile157') Or ($(TargetFrameworkProfile) == 'Profile158') Or ($(TargetFrameworkProfile) == 'Profile225') Or ($(TargetFrameworkProfile) == 'Profile240') Or ($(TargetFrameworkProfile) == 'Profile255') Or ($(TargetFrameworkProfile) == 'Profile328') Or ($(TargetFrameworkProfile) == 'Profile336') Or ($(TargetFrameworkProfile) == 'Profile344')">
149160
<ItemGroup>
150161
<Reference Include="Newtonsoft.Json">
151-
<HintPath>..\packages\Newtonsoft.Json\lib\portable-net45+wp80+win8+wpa81+dnxcore50\Newtonsoft.Json.dll</HintPath>
162+
<HintPath>..\packages\Newtonsoft.Json\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
152163
<Private>True</Private>
153164
<Paket>True</Paket>
154165
</Reference>
155166
</ItemGroup>
156167
</When>
157168
</Choose>
158169
<Choose>
159-
<When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
170+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')">
160171
<ItemGroup>
161172
<Reference Include="Owin">
162173
<HintPath>..\packages\Owin\lib\net40\Owin.dll</HintPath>
@@ -167,7 +178,7 @@ if not exist "$(SolutionDir)..\packages" mkdir "$(SolutionDir)..\packages"
167178
</When>
168179
</Choose>
169180
<Choose>
170-
<When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v3.5' Or $(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
181+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v3.5' Or $(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')">
171182
<ItemGroup>
172183
<Reference Include="SecondLanguage">
173184
<HintPath>..\packages\SecondLanguage\lib\net35\SecondLanguage.dll</HintPath>
@@ -177,15 +188,4 @@ if not exist "$(SolutionDir)..\packages" mkdir "$(SolutionDir)..\packages"
177188
</ItemGroup>
178189
</When>
179190
</Choose>
180-
<Choose>
181-
<When Condition="($(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6')) Or ($(TargetFrameworkIdentifier) == 'MonoAndroid') Or ($(TargetFrameworkIdentifier) == 'MonoTouch')">
182-
<ItemGroup>
183-
<Reference Include="Thinktecture.IdentityServer3">
184-
<HintPath>..\packages\Thinktecture.IdentityServer3\lib\net45\Thinktecture.IdentityServer3.dll</HintPath>
185-
<Private>True</Private>
186-
<Paket>True</Paket>
187-
</Reference>
188-
</ItemGroup>
189-
</When>
190-
</Choose>
191191
</Project>

‎source/IdentityServer3.Contrib.Localization.UI/IdentityServer3.Contrib.Localization.UI.csproj.paket.references‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Thinktecture.IdentityServer3
1+
IdentityServer3
22
SecondLanguage
33
Newtonsoft.Json

‎source/IdentityServer3.Contrib.Localization.UI/IdentityServer3.Contrib.Localization.UI.nuspec‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,19 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>IdentityServer3.Contrib.Localization.UI</id>
5-
<version>1.0.3</version>
5+
<version>1.1.0</version>
66
<title>Thinktecture IdentityServer3 - Localization.UI</title>
77
<authors>Norbert Eder (MARMIND)</authors>
88
<licenseUrl>https://github.com/marmind/IdentityServer3.Contrib.Localization.UI/blob/master/LICENSE</licenseUrl>
99
<projectUrl>https://github.com/marmind/IdentityServer3.Contrib.Localization.UI</projectUrl>
1010
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1111
<description>Contrib implementation of IViewLoader for IdentityServer3 views in multiple languages</description>
1212
<releaseNotes>
13-
* Fixed #4 Certain view localizations not applied
14-
* Updated dependencies
13+
* Support IdentityServer3
1514
</releaseNotes>
1615
<tags>identityserver, identityserver3, i18n, localize, localization, globalization, language, languages, ui</tags>
1716
<dependencies>
18-
<dependency id="Thinktecture.IdentityServer3" version="1.6.2" />
17+
<dependency id="IdentityServer3" version="2.0.1" />
1918
<dependency id="SecondLanguage" version="1.0.1" />
2019
<dependency id="Newtonsoft.Json" version="7.0.1" />
2120
</dependencies>

‎source/IdentityServer3.Contrib.Localization.UI/LocalizedViewLoader.cs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
using System;
22
using System.IO;
3-
using System.Linq;
4-
using System.Text.RegularExpressions;
5-
using Thinktecture.IdentityServer.Core.Services.Default;
3+
using IdentityServer3.Core.Services.Default;
64

75
namespace IdentityServer3.Contrib.Localization.UI
86
{
@@ -29,12 +27,13 @@ static string GetDefaultDirectory()
2927
return path;
3028
}
3129

32-
public string Load(string name)
33-
{
34-
var value = file.Load(name);
30+
public async System.Threading.Tasks.Task<string> LoadAsync(string name)
31+
{
32+
string value = null;
33+
value = await file.LoadAsync(name);
3534
if (value == null)
3635
{
37-
value = embedded.Load(name);
36+
value = await embedded.LoadAsync(name);
3837
}
3938
return TranslatorHelper.Instance.Translate(value);
4039
}

‎source/IdentityServer3.Contrib.Localization.UI/assets/_layout.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</div>
3030

3131
<script id='modelJson' type='application/json'>{model}</script>
32-
<script src="{applicationPath}/assets/scripts.js"></script>
32+
<script src="{applicationPath}/assets/scripts.2.0.0.js"></script>
3333
{scripts}
3434
</body>
3535
</html>

‎source/IdentityServer3.Contrib.Localization.UI/assets/_login.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ <h3 class="panel-title">[[login.local]]</h3>
4848
</div>
4949
</div>
5050

51-
<div class="col-md-6 col-sm-6 external-providers" ng-show="model.externalProviders">
51+
<div class="col-md-6 col-sm-6 external-providers" ng-show="model.externalProviders.length">
5252
<div class="panel panel-default">
5353
<div class="panel-heading">
5454
<h3 class="panel-title">[[login.external]]</h3>

‎source/paket.dependencies‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source http://nuget.org/api/v2
22

3-
nuget Thinktecture.IdentityServer3
3+
nuget IdentityServer3
44
nuget SecondLanguage
55
nuget Newtonsoft.Json

0 commit comments

Comments
 (0)