Skip to content

Commit cadfde2

Browse files
RumecRumec
authored
Merge pull request #32 from Kentico/feat/Hotfix_30_0_1
Upgrade XbK version to 30.0.1
2 parents 8f70f2f + 8cecb82 commit cadfde2

File tree

355 files changed

+2707
-1187
lines changed

Some content is hidden

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

355 files changed

+2707
-1187
lines changed

‎Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
66
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
77
<CentralPackageFloatingVersionsEnabled>true</CentralPackageFloatingVersionsEnabled>
8-
<LastAppliedHotfix>29.7.1</LastAppliedHotfix>
8+
<LastAppliedHotfix>30.0.1</LastAppliedHotfix>
99
<XbyKVersion Condition="'$(XbyKVersion)' == ''">$(LastAppliedHotfix)</XbyKVersion>
1010
</PropertyGroup>
1111
<ItemGroup>

‎examples/DancingGoat-K13Ecommerce/App_Data/CIRepository/@global/cms.alternativeform/cms.class_cms.contentlanguage/contentlanguagecreate.xml‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,20 @@
4949
<fielddescriptionashtml>False</fielddescriptionashtml>
5050
</properties>
5151
</field>
52-
<field column="ContentLanguageIsDefault" enabled="true" guid="bd3fbada-af24-4e47-8807-2e82692cd710" visible="true" order="4">
52+
<field column="ContentLanguageFlagIconName" enabled="true" guid="9d23c0ff-b206-4782-8dfc-f62cd267c3b0" visible="true" order="4">
53+
<settings>
54+
<controlname>Kentico.Administration.IconSelector</controlname>
55+
</settings>
56+
<properties>
57+
<explanationtextashtml>False</explanationtextashtml>
58+
<fieldcaption>{$base.contentlanguages.language.languageflag$}</fieldcaption>
59+
<fielddescription>
60+
<![CDATA[{$base.contentlanguages.language.languageflag.tooltip$}]]>
61+
</fielddescription>
62+
<fielddescriptionashtml>False</fielddescriptionashtml>
63+
</properties>
64+
</field>
65+
<field column="ContentLanguageIsDefault" enabled="true" guid="bd3fbada-af24-4e47-8807-2e82692cd710" visible="true" order="5">
5366
<settings>
5467
<controlname>Kentico.Administration.Checkbox</controlname>
5568
</settings>
@@ -64,15 +77,15 @@
6477
<fielddescriptionashtml>False</fielddescriptionashtml>
6578
</properties>
6679
</field>
67-
<category name="Fallback" order="5">
80+
<category name="Fallback" order="6">
6881
<properties>
6982
<caption>
7083
<![CDATA[{$base.contentlanguages.language.fallback.category$}]]>
7184
</caption>
7285
<visible>true</visible>
7386
</properties>
7487
</category>
75-
<field column="ContentLanguageFallbackContentLanguageID" enabled="true" guid="1f074d33-6319-41bf-8d1a-8c6299520e6d" visible="true" refobjtype="" reftype="" order="6">
88+
<field column="ContentLanguageFallbackContentLanguageID" enabled="true" guid="1f074d33-6319-41bf-8d1a-8c6299520e6d" visible="true" refobjtype="" reftype="" order="7">
7689
<settings>
7790
<controlname>Kentico.Administration.SingleObjectIdSelector</controlname>
7891
<ObjectType>cms.contentlanguage</ObjectType>
@@ -82,10 +95,13 @@
8295
<fieldcaption>
8396
<![CDATA[{$base.contentlanguages.language.fallbacklanguage$}]]>
8497
</fieldcaption>
98+
<fielddescription>
99+
<![CDATA[{$base.contentlanguages.language.fallbacklanguage.tooltip$}]]>
100+
</fielddescription>
85101
<fielddescriptionashtml>False</fielddescriptionashtml>
86102
</properties>
87103
</field>
88-
<field column="ContentLanguageGUID" guid="a2fee50a-81d8-400b-86d5-6d5337892e82" enabled="" order="7" />
104+
<field column="ContentLanguageGUID" guid="a2fee50a-81d8-400b-86d5-6d5337892e82" enabled="" order="8" />
89105
</form>
90106
</FormDefinition>
91107
<FormDisplayName>Create content language</FormDisplayName>

‎examples/DancingGoat-K13Ecommerce/App_Data/CIRepository/@global/cms.alternativeform/cms.class_cms.contentlanguage/contentlanguageedit.xml‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,20 @@
4949
<fielddescriptionashtml>False</fielddescriptionashtml>
5050
</properties>
5151
</field>
52-
<field column="ContentLanguageIsDefault" enabled="true" guid="bd3fbada-af24-4e47-8807-2e82692cd710" visible="true" order="4">
52+
<field column="ContentLanguageFlagIconName" enabled="true" guid="9d23c0ff-b206-4782-8dfc-f62cd267c3b0" visible="true" order="4">
53+
<settings>
54+
<controlname>Kentico.Administration.IconSelector</controlname>
55+
</settings>
56+
<properties>
57+
<explanationtextashtml>False</explanationtextashtml>
58+
<fieldcaption>{$base.contentlanguages.language.languageflag$}</fieldcaption>
59+
<fielddescription>
60+
<![CDATA[{$base.contentlanguages.language.languageflag.tooltip$}]]>
61+
</fielddescription>
62+
<fielddescriptionashtml>False</fielddescriptionashtml>
63+
</properties>
64+
</field>
65+
<field column="ContentLanguageIsDefault" enabled="true" guid="bd3fbada-af24-4e47-8807-2e82692cd710" visible="true" order="5">
5366
<settings>
5467
<controlname>Kentico.Administration.Checkbox</controlname>
5568
</settings>
@@ -64,15 +77,15 @@
6477
<fielddescriptionashtml>False</fielddescriptionashtml>
6578
</properties>
6679
</field>
67-
<category name="Fallback" order="5">
80+
<category name="Fallback" order="6">
6881
<properties>
6982
<caption>
7083
<![CDATA[{$base.contentlanguages.language.fallback.category$}]]>
7184
</caption>
7285
<visible>true</visible>
7386
</properties>
7487
</category>
75-
<field column="ContentLanguageFallbackContentLanguageID" enabled="true" guid="1f074d33-6319-41bf-8d1a-8c6299520e6d" visible="true" refobjtype="" reftype="" order="6">
88+
<field column="ContentLanguageFallbackContentLanguageID" enabled="true" guid="1f074d33-6319-41bf-8d1a-8c6299520e6d" visible="true" refobjtype="" reftype="" order="7">
7689
<settings>
7790
<controlname>Kentico.Administration.SingleObjectIdSelector</controlname>
7891
<ObjectType>cms.contentlanguage</ObjectType>
@@ -82,10 +95,13 @@
8295
<fieldcaption>
8396
<![CDATA[{$base.contentlanguages.language.fallbacklanguage$}]]>
8497
</fieldcaption>
98+
<fielddescription>
99+
<![CDATA[{$base.contentlanguages.language.fallbacklanguage.tooltip$}]]>
100+
</fielddescription>
85101
<fielddescriptionashtml>False</fielddescriptionashtml>
86102
</properties>
87103
</field>
88-
<field column="ContentLanguageGUID" guid="a2fee50a-81d8-400b-86d5-6d5337892e82" enabled="" order="7" />
104+
<field column="ContentLanguageGUID" guid="a2fee50a-81d8-400b-86d5-6d5337892e82" enabled="" order="8" />
89105
</form>
90106
</FormDefinition>
91107
<FormDisplayName>Edit content language</FormDisplayName>

‎examples/DancingGoat-K13Ecommerce/App_Data/CIRepository/@global/cms.alternativeform/cms.class_cms.licensekey/edit.xml‎

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

‎examples/DancingGoat-K13Ecommerce/App_Data/CIRepository/@global/cms.alternativeform/cms.class_cms.scheduledtask/create.xml‎

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

0 commit comments

Comments
 (0)