Skip to content

Commit c14d8fa

Browse files
ismcagdasismcagdas
committed
#94: Login page is aligned to bsb admin
1 parent 19a61ba commit c14d8fa

File tree

2,437 files changed

+533331
-2193
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,437 files changed

+533331
-2193
lines changed

‎src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,25 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.2.0.2\lib\net46\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=2.1.3.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.2.1.3\lib\net46\Abp.dll</HintPath>
40+
<Private>True</Private>
4041
</Reference>
41-
<Reference Include="Abp.AutoMapper, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.AutoMapper.2.0.2\lib\net46\Abp.AutoMapper.dll</HintPath>
42+
<Reference Include="Abp.AutoMapper, Version=2.1.3.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Abp.AutoMapper.2.1.3\lib\net46\Abp.AutoMapper.dll</HintPath>
44+
<Private>True</Private>
4345
</Reference>
44-
<Reference Include="Abp.Zero, Version=2.0.1.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.2.0.1\lib\net46\Abp.Zero.dll</HintPath>
46+
<Reference Include="Abp.Zero, Version=2.1.3.0, Culture=neutral, processorArchitecture=MSIL">
47+
<HintPath>..\packages\Abp.Zero.2.1.3\lib\net46\Abp.Zero.dll</HintPath>
48+
<Private>True</Private>
4649
</Reference>
47-
<Reference Include="Abp.Zero.Common, Version=2.0.1.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Abp.Zero.Common.2.0.1\lib\net46\Abp.Zero.Common.dll</HintPath>
50+
<Reference Include="Abp.Zero.Common, Version=2.1.3.0, Culture=neutral, processorArchitecture=MSIL">
51+
<HintPath>..\packages\Abp.Zero.Common.2.1.3\lib\net46\Abp.Zero.Common.dll</HintPath>
52+
<Private>True</Private>
4953
</Reference>
50-
<Reference Include="AutoMapper, Version=6.0.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
51-
<HintPath>..\packages\AutoMapper.6.0.2\lib\net45\AutoMapper.dll</HintPath>
54+
<Reference Include="AutoMapper, Version=6.1.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
55+
<HintPath>..\packages\AutoMapper.6.1.0\lib\net45\AutoMapper.dll</HintPath>
56+
<Private>True</Private>
5257
</Reference>
5358
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
5459
<SpecificVersion>False</SpecificVersion>
@@ -105,8 +110,9 @@
105110
<Reference Include="System.ComponentModel.DataAnnotations" />
106111
<Reference Include="System.Configuration" />
107112
<Reference Include="System.Core" />
108-
<Reference Include="System.Linq.Dynamic.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
109-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.6.13\lib\net45\System.Linq.Dynamic.Core.dll</HintPath>
113+
<Reference Include="System.Linq.Dynamic.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
114+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.3\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
115+
<Private>True</Private>
110116
</Reference>
111117
<Reference Include="System.Net" />
112118
<Reference Include="System.Runtime.Caching" />

‎src/AbpCompanyName.AbpProjectName.Application/packages.config‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="2.0.2" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="2.0.2" targetFramework="net461" />
5-
<package id="Abp.Zero" version="2.0.1" targetFramework="net461" />
6-
<package id="Abp.Zero.Common" version="2.0.1" targetFramework="net461" />
7-
<package id="AutoMapper" version="6.0.2" targetFramework="net461" />
3+
<package id="Abp" version="2.1.3" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="2.1.3" targetFramework="net461" />
5+
<package id="Abp.Zero" version="2.1.3" targetFramework="net461" />
6+
<package id="Abp.Zero.Common" version="2.1.3" targetFramework="net461" />
7+
<package id="AutoMapper" version="6.1.0" targetFramework="net461" />
88
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
99
<package id="Castle.LoggingFacility" version="3.4.0" targetFramework="net452" />
1010
<package id="Castle.Windsor" version="3.4.0" targetFramework="net452" />
@@ -16,5 +16,5 @@
1616
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net461" />
1717
<package id="Nito.AsyncEx" version="4.0.1" targetFramework="net452" />
1818
<package id="System.Collections.Immutable" version="1.3.1" targetFramework="net452" />
19-
<package id="System.Linq.Dynamic.Core" version="1.0.6.13" targetFramework="net461" />
19+
<package id="System.Linq.Dynamic.Core" version="1.0.7.3" targetFramework="net461" />
2020
</packages>

‎src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,17 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.2.0.2\lib\net46\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=2.1.3.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.2.1.3\lib\net46\Abp.dll</HintPath>
40+
<Private>True</Private>
4041
</Reference>
41-
<Reference Include="Abp.Zero, Version=2.0.1.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.Zero.2.0.1\lib\net46\Abp.Zero.dll</HintPath>
42+
<Reference Include="Abp.Zero, Version=2.1.3.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Abp.Zero.2.1.3\lib\net46\Abp.Zero.dll</HintPath>
44+
<Private>True</Private>
4345
</Reference>
44-
<Reference Include="Abp.Zero.Common, Version=2.0.1.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.Common.2.0.1\lib\net46\Abp.Zero.Common.dll</HintPath>
46+
<Reference Include="Abp.Zero.Common, Version=2.1.3.0, Culture=neutral, processorArchitecture=MSIL">
47+
<HintPath>..\packages\Abp.Zero.Common.2.1.3\lib\net46\Abp.Zero.Common.dll</HintPath>
48+
<Private>True</Private>
4649
</Reference>
4750
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4851
<SpecificVersion>False</SpecificVersion>
@@ -99,8 +102,9 @@
99102
<Reference Include="System.ComponentModel.DataAnnotations" />
100103
<Reference Include="System.Configuration" />
101104
<Reference Include="System.Core" />
102-
<Reference Include="System.Linq.Dynamic.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
103-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.6.13\lib\net45\System.Linq.Dynamic.Core.dll</HintPath>
105+
<Reference Include="System.Linq.Dynamic.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
106+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.3\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
107+
<Private>True</Private>
104108
</Reference>
105109
<Reference Include="System.Net" />
106110
<Reference Include="System.Runtime.Caching" />
@@ -114,6 +118,7 @@
114118
<ItemGroup>
115119
<Compile Include="AbpProjectNameConsts.cs" />
116120
<Compile Include="AbpProjectNameCoreModule.cs" />
121+
<Compile Include="AppVersionHelper.cs" />
117122
<Compile Include="Authorization\AbpProjectNameAuthorizationProvider.cs" />
118123
<Compile Include="Authorization\LoginManager.cs" />
119124
<Compile Include="Authorization\PermissionChecker.cs" />

‎src/AbpCompanyName.AbpProjectName.Core/AppVersionHelper.cs‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
using System;
2+
using System.IO;
3+
using Abp.Reflection.Extensions;
4+
5+
namespace AbpCompanyName.AbpProjectName
6+
{
7+
/// <summary>
8+
/// Central point for application version.
9+
/// </summary>
10+
public class AppVersionHelper
11+
{
12+
/// <summary>
13+
/// Gets current version of the application.
14+
/// It's also shown in the web page.
15+
/// </summary>
16+
public const string Version = "1.0.0.0";
17+
18+
/// <summary>
19+
/// Gets release (last build) date of the application.
20+
/// It's shown in the web page.
21+
/// </summary>
22+
public static DateTime ReleaseDate
23+
{
24+
get { return new FileInfo(typeof(AppVersionHelper).GetAssembly().Location).LastWriteTime; }
25+
}
26+
}
27+
}

‎src/AbpCompanyName.AbpProjectName.Core/Authorization/PermissionChecker.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
using Abp.Authorization;
22
using AbpCompanyName.AbpProjectName.Authorization.Roles;
3-
using AbpCompanyName.AbpProjectName.MultiTenancy;
43
using AbpCompanyName.AbpProjectName.Users;
54

65
namespace AbpCompanyName.AbpProjectName.Authorization
76
{
8-
public class PermissionChecker : PermissionChecker<Tenant, Role, User>
7+
public class PermissionChecker : PermissionChecker<Role, User>
98
{
109
public PermissionChecker(UserManager userManager)
1110
: base(userManager)

‎src/AbpCompanyName.AbpProjectName.Core/Localization/Source/AbpProjectName-tr.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,16 @@
5555
<text name="Yes" value="Evet" />
5656
<text name="No" value="Hayır" />
5757
<text name="Optional" value="Opsiyonel" />
58+
<text name="LeaveEmptyToSwitchToHost">Üst kullanıcıya geçiş için boş değer girin.</text>
59+
60+
<text name="CurrentTenant">Geçerli müşteri</text>
61+
<text name="NotSelected">Seçilmemiş</text>
62+
<text name="Change">Değiştir</text>
63+
<text name="ChangeTenant">Müşteri değiştir</text>
64+
65+
<text name="MultiLevelMenu">Çok Seviyeli Menü</text>
66+
<text name="Back">Geri</text>
67+
<text name="SuccessfullyRegistered">Başarıyla kayıt olundu</text>
68+
<text name="WaitingForEmailActivation">E-posta adresiniz etkinleştirilmeli.</text>
5869
</texts>
5970
</localizationDictionary>

‎src/AbpCompanyName.AbpProjectName.Core/Localization/Source/AbpProjectName.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,17 @@
5555
<text name="Yes" value="Yes" />
5656
<text name="No" value="No" />
5757
<text name="Optional" value="Optional" />
58+
<text name="LeaveEmptyToSwitchToHost">Leave empty to switch to the host</text>
59+
60+
<text name="CurrentTenant">Current tenant</text>
61+
<text name="NotSelected">Not selected</text>
62+
<text name="Change">Change</text>
63+
<text name="ChangeTenant">Change tenant</text>
64+
65+
<text name="MultiLevelMenu">Multi Level Menu</text>
66+
<text name="Back">Back</text>
67+
<text name="SuccessfullyRegistered">Successfully registered</text>
68+
<text name="WaitingForEmailActivation">Your email address should be activated</text>
69+
<text name="Roles">Roles</text>
5870
</texts>
5971
</localizationDictionary>

‎src/AbpCompanyName.AbpProjectName.Core/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="2.0.2" targetFramework="net461" />
4-
<package id="Abp.Zero" version="2.0.1" targetFramework="net461" />
5-
<package id="Abp.Zero.Common" version="2.0.1" targetFramework="net461" />
3+
<package id="Abp" version="2.1.3" targetFramework="net461" />
4+
<package id="Abp.Zero" version="2.1.3" targetFramework="net461" />
5+
<package id="Abp.Zero.Common" version="2.1.3" targetFramework="net461" />
66
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
77
<package id="Castle.LoggingFacility" version="3.4.0" targetFramework="net452" />
88
<package id="Castle.Windsor" version="3.4.0" targetFramework="net452" />
@@ -14,5 +14,5 @@
1414
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net461" />
1515
<package id="Nito.AsyncEx" version="4.0.1" targetFramework="net452" />
1616
<package id="System.Collections.Immutable" version="1.3.1" targetFramework="net452" />
17-
<package id="System.Linq.Dynamic.Core" version="1.0.6.13" targetFramework="net461" />
17+
<package id="System.Linq.Dynamic.Core" version="1.0.7.3" targetFramework="net461" />
1818
</packages>

‎src/AbpCompanyName.AbpProjectName.EntityFramework/AbpCompanyName.AbpProjectName.EntityFramework.csproj‎

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,29 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.2.0.2\lib\net46\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=2.1.3.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.2.1.3\lib\net46\Abp.dll</HintPath>
40+
<Private>True</Private>
4041
</Reference>
41-
<Reference Include="Abp.EntityFramework, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.EntityFramework.2.0.2\lib\net46\Abp.EntityFramework.dll</HintPath>
42+
<Reference Include="Abp.EntityFramework, Version=2.1.3.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\Abp.EntityFramework.2.1.3\lib\net46\Abp.EntityFramework.dll</HintPath>
44+
<Private>True</Private>
4345
</Reference>
44-
<Reference Include="Abp.EntityFramework.Common, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.EntityFramework.Common.2.0.2\lib\net46\Abp.EntityFramework.Common.dll</HintPath>
46+
<Reference Include="Abp.EntityFramework.Common, Version=2.1.3.0, Culture=neutral, processorArchitecture=MSIL">
47+
<HintPath>..\packages\Abp.EntityFramework.Common.2.1.3\lib\net46\Abp.EntityFramework.Common.dll</HintPath>
48+
<Private>True</Private>
4649
</Reference>
47-
<Reference Include="Abp.Zero, Version=2.0.1.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Abp.Zero.2.0.1\lib\net46\Abp.Zero.dll</HintPath>
50+
<Reference Include="Abp.Zero, Version=2.1.3.0, Culture=neutral, processorArchitecture=MSIL">
51+
<HintPath>..\packages\Abp.Zero.2.1.3\lib\net46\Abp.Zero.dll</HintPath>
52+
<Private>True</Private>
4953
</Reference>
50-
<Reference Include="Abp.Zero.Common, Version=2.0.1.0, Culture=neutral, processorArchitecture=MSIL">
51-
<HintPath>..\packages\Abp.Zero.Common.2.0.1\lib\net46\Abp.Zero.Common.dll</HintPath>
54+
<Reference Include="Abp.Zero.Common, Version=2.1.3.0, Culture=neutral, processorArchitecture=MSIL">
55+
<HintPath>..\packages\Abp.Zero.Common.2.1.3\lib\net46\Abp.Zero.Common.dll</HintPath>
56+
<Private>True</Private>
5257
</Reference>
53-
<Reference Include="Abp.Zero.EntityFramework, Version=2.0.1.0, Culture=neutral, processorArchitecture=MSIL">
54-
<HintPath>..\packages\Abp.Zero.EntityFramework.2.0.1\lib\net46\Abp.Zero.EntityFramework.dll</HintPath>
58+
<Reference Include="Abp.Zero.EntityFramework, Version=2.1.3.0, Culture=neutral, processorArchitecture=MSIL">
59+
<HintPath>..\packages\Abp.Zero.EntityFramework.2.1.3\lib\net46\Abp.Zero.EntityFramework.dll</HintPath>
60+
<Private>True</Private>
5561
</Reference>
5662
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
5763
<SpecificVersion>False</SpecificVersion>
@@ -69,8 +75,9 @@
6975
<SpecificVersion>False</SpecificVersion>
7076
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
7177
</Reference>
72-
<Reference Include="EntityFramework.DynamicFilters, Version=2.6.0.0, Culture=neutral, PublicKeyToken=146423a1b8d60775, processorArchitecture=MSIL">
73-
<HintPath>..\packages\EntityFramework.DynamicFilters.2.6.0\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
78+
<Reference Include="EntityFramework.DynamicFilters, Version=2.7.0.0, Culture=neutral, PublicKeyToken=146423a1b8d60775, processorArchitecture=MSIL">
79+
<HintPath>..\packages\EntityFramework.DynamicFilters.2.7.0\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
80+
<Private>True</Private>
7481
</Reference>
7582
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
7683
<SpecificVersion>False</SpecificVersion>
@@ -119,8 +126,9 @@
119126
<Reference Include="System.ComponentModel.DataAnnotations" />
120127
<Reference Include="System.Configuration" />
121128
<Reference Include="System.Core" />
122-
<Reference Include="System.Linq.Dynamic.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
123-
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.6.13\lib\net45\System.Linq.Dynamic.Core.dll</HintPath>
129+
<Reference Include="System.Linq.Dynamic.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
130+
<HintPath>..\packages\System.Linq.Dynamic.Core.1.0.7.3\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
131+
<Private>True</Private>
124132
</Reference>
125133
<Reference Include="System.Net" />
126134
<Reference Include="System.Runtime.Caching" />
@@ -138,6 +146,10 @@
138146
<Compile Include="Migrations\201701271145151_AbpZero_Initial.Designer.cs">
139147
<DependentUpon>201701271145151_AbpZero_Initial.cs</DependentUpon>
140148
</Compile>
149+
<Compile Include="Migrations\201707041212290_Upgraded_To_Abp_2_1_3.cs" />
150+
<Compile Include="Migrations\201707041212290_Upgraded_To_Abp_2_1_3.Designer.cs">
151+
<DependentUpon>201707041212290_Upgraded_To_Abp_2_1_3.cs</DependentUpon>
152+
</Compile>
141153
<Compile Include="Migrations\AbpZeroDbMigrator.cs" />
142154
<Compile Include="Migrations\Configuration.cs" />
143155
<Compile Include="AbpProjectNameDataModule.cs" />
@@ -164,6 +176,9 @@
164176
<EmbeddedResource Include="Migrations\201701271145151_AbpZero_Initial.resx">
165177
<DependentUpon>201701271145151_AbpZero_Initial.cs</DependentUpon>
166178
</EmbeddedResource>
179+
<EmbeddedResource Include="Migrations\201707041212290_Upgraded_To_Abp_2_1_3.resx">
180+
<DependentUpon>201707041212290_Upgraded_To_Abp_2_1_3.cs</DependentUpon>
181+
</EmbeddedResource>
167182
</ItemGroup>
168183
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
169184
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

‎src/AbpCompanyName.AbpProjectName.EntityFramework/Migrations/201707041212290_Upgraded_To_Abp_2_1_3.Designer.cs‎

Lines changed: 29 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)