Skip to content

Commit f965f07

Browse files
author
Rick Butterfield
committed
Match main branch
1 parent c590eb8 commit f965f07

File tree

72 files changed

+1290
-162
lines changed

Some content is hidden

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

72 files changed

+1290
-162
lines changed

src/Umbraco.Community.Sustainability.TestSite.13.x/appsettings.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,13 @@
1010
}
1111
}
1212
},
13+
//"ConnectionStrings": {
14+
// "umbracoDbDSN": "Data Source=|DataDirectory|/Umbraco.sqlite.db;Cache=Shared;Foreign Keys=True;Pooling=True",
15+
// "umbracoDbDSN_ProviderName": "Microsoft.Data.SQLite"
16+
//},
1317
"ConnectionStrings": {
14-
"umbracoDbDSN": "Data Source=|DataDirectory|/Umbraco.sqlite.db;Cache=Shared;Foreign Keys=True;Pooling=True",
15-
"umbracoDbDSN_ProviderName": "Microsoft.Data.SQLite"
18+
"umbracoDbDSN": "server=.;database=Umbraco_Sustainability;Integrated Security=True;TrustServerCertificate=True",
19+
"umbracoDbDSN_ProviderName": "Microsoft.Data.SqlClient"
1620
},
1721
"Umbraco": {
1822
"CMS": {

src/Umbraco.Community.Sustainability.TestSite.14.x/Umbraco.Community.Sustainability.TestSite.14.x.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Umbraco.Cms" Version="14.0.0-rc2" />
11+
<PackageReference Include="uSync" Version="14.0.0-rc2" />
1112
</ItemGroup>
1213

1314
<ItemGroup>

src/Umbraco.Community.Sustainability.TestSite.14.x/appsettings-schema.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
},
77
{
88
"$ref": "appsettings-schema.Umbraco.Cms.json#"
9+
},
10+
{
11+
"$ref": "appsettings-schema.usync.json#"
912
}
1013
]
1114
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Content Key="e3f55861-b2e4-4420-8b5d-a9a759c6bf26" Alias="Home" Level="1">
3+
<Info>
4+
<Parent Key="00000000-0000-0000-0000-000000000000"></Parent>
5+
<Path>/Home</Path>
6+
<Trashed>false</Trashed>
7+
<ContentType>home</ContentType>
8+
<CreateDate>2024-04-30T15:06:40</CreateDate>
9+
<NodeName Default="Home" />
10+
<SortOrder>0</SortOrder>
11+
<Published Default="true" />
12+
<Schedule />
13+
<Template Key="52824d1a-02c6-4a7e-a4e8-a9424f388608">home</Template>
14+
</Info>
15+
<Properties />
16+
</Content>
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ContentType Key="0b1871d2-31ca-410f-b4f9-f3a5148b579a" Alias="home" Level="1">
3+
<Info>
4+
<Name>Home</Name>
5+
<Icon>icon-notepad</Icon>
6+
<Thumbnail>folder.png</Thumbnail>
7+
<Description></Description>
8+
<AllowAtRoot>True</AllowAtRoot>
9+
<ListView>00000000-0000-0000-0000-000000000000</ListView>
10+
<Variations>Nothing</Variations>
11+
<IsElement>false</IsElement>
12+
<HistoryCleanup>
13+
<PreventCleanup>False</PreventCleanup>
14+
<KeepAllVersionsNewerThanDays></KeepAllVersionsNewerThanDays>
15+
<KeepLatestVersionPerDayForDays></KeepLatestVersionPerDayForDays>
16+
</HistoryCleanup>
17+
<Compositions />
18+
<DefaultTemplate>home</DefaultTemplate>
19+
<AllowedTemplates>
20+
<Template Key="52824d1a-02c6-4a7e-a4e8-a9424f388608">home</Template>
21+
</AllowedTemplates>
22+
</Info>
23+
<Structure />
24+
<GenericProperties />
25+
<Tabs />
26+
</ContentType>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<DataType Key="0225af17-b302-49cb-9176-b9f35cab9c17" Alias="Approved Color" Level="1">
3+
<Info>
4+
<Name>Approved Color</Name>
5+
<EditorAlias>Umbraco.ColorPicker</EditorAlias>
6+
<DatabaseType>Nvarchar</DatabaseType>
7+
</Info>
8+
<Config><![CDATA[{}]]></Config>
9+
</DataType>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<DataType Key="fbaf13a8-4036-41f2-93a3-974f678c312a" Alias="Checkbox list" Level="1">
3+
<Info>
4+
<Name>Checkbox list</Name>
5+
<EditorAlias>Umbraco.CheckBoxList</EditorAlias>
6+
<DatabaseType>Nvarchar</DatabaseType>
7+
</Info>
8+
<Config><![CDATA[{}]]></Config>
9+
</DataType>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<DataType Key="fd1e0da5-5606-4862-b679-5d0cf3a52a59" Alias="Content Picker" Level="1">
3+
<Info>
4+
<Name>Content Picker</Name>
5+
<EditorAlias>Umbraco.ContentPicker</EditorAlias>
6+
<DatabaseType>Nvarchar</DatabaseType>
7+
</Info>
8+
<Config><![CDATA[{}]]></Config>
9+
</DataType>
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<DataType Key="5046194e-4237-453c-a547-15db3a07c4e1" Alias="Date Picker" Level="1">
3+
<Info>
4+
<Name>Date Picker</Name>
5+
<EditorAlias>Umbraco.DateTime</EditorAlias>
6+
<DatabaseType>Date</DatabaseType>
7+
</Info>
8+
<Config><![CDATA[{
9+
"format": "YYYY-MM-DD"
10+
}]]></Config>
11+
</DataType>
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<DataType Key="e4d66c0f-b935-4200-81f0-025f7256b89a" Alias="Date Picker with time" Level="1">
3+
<Info>
4+
<Name>Date Picker with time</Name>
5+
<EditorAlias>Umbraco.DateTime</EditorAlias>
6+
<DatabaseType>Date</DatabaseType>
7+
</Info>
8+
<Config><![CDATA[{
9+
"format": "YYYY-MM-DD HH:mm:ss"
10+
}]]></Config>
11+
</DataType>

0 commit comments

Comments
 (0)