Skip to content

Commit 20c8e31

Browse files
committed
Merge from develop branch
2 parents 8889c57 + 178e1c1 commit 20c8e31

File tree

241 files changed

+2390
-12819
lines changed

Some content is hidden

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

241 files changed

+2390
-12819
lines changed

Directory.Build.props

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,18 @@
55
<Authors>WeBlog Community</Authors>
66
<Company>WeTeam Community</Company>
77
<Product>WeBlog</Product>
8-
<Copyright>Copyright © 2011 - 2020</Copyright>
9-
<Version>4.1.0</Version>
10-
<Configurations>Debug sc9.0;Debug sc9.1;Debug sc9.2;Debug sc9.3;Debug sc10.0;Release sc9.0;Release sc9.1;Release sc9.2;Release sc9.3;Release sc10.0</Configurations>
8+
<Copyright>Copyright © 2011 - 2021</Copyright>
9+
<Version>4.2.0</Version>
10+
<Configurations>Debug sc9.1;Debug sc9.2;Debug sc9.3;Debug sc10.0;Debug sc10.1;Release sc9.1;Release sc9.2;Release sc9.3;Release sc10.0;Release sc10.1</Configurations>
1111
</PropertyGroup>
1212
<PropertyGroup Condition="$(Configuration.Contains('Debug'))">
1313
<DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
1414
</PropertyGroup>
1515
<PropertyGroup Condition="$(Configuration.Contains('Release'))">
1616
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
1717
</PropertyGroup>
18-
<PropertyGroup Condition="$(Configuration.Contains('sc9.0'))">
19-
<TargetFramework>net462</TargetFramework>
20-
<DefineConstants>$(DefineConstants)</DefineConstants>
21-
<OutputPath>bin\sc90\</OutputPath>
22-
</PropertyGroup>
2318
<PropertyGroup Condition="$(Configuration.Contains('sc9.1'))">
24-
<TargetFramework>net471</TargetFramework>
19+
<TargetFramework>net471</TargetFramework>
2520
<DefineConstants>$(DefineConstants);SC91</DefineConstants>
2621
<OutputPath>bin\sc91\</OutputPath>
2722
</PropertyGroup>
@@ -40,4 +35,9 @@
4035
<DefineConstants>$(DefineConstants);FEATURE_JOB_ABSTRACTIONS;FEATURE_URL_BUILDERS</DefineConstants>
4136
<OutputPath>bin\sc100\</OutputPath>
4237
</PropertyGroup>
38+
<PropertyGroup Condition="$(Configuration.Contains('sc10.1'))">
39+
<TargetFramework>net48</TargetFramework>
40+
<DefineConstants>$(DefineConstants);FEATURE_JOB_ABSTRACTIONS;FEATURE_URL_BUILDERS</DefineConstants>
41+
<OutputPath>bin\sc101\</OutputPath>
42+
</PropertyGroup>
4343
</Project>

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ A blog module for Sitecore.
55
## Features ##
66

77
- Windows Live Writer integration (MetaWeblog API)
8-
- Page Editor support and custom WebEdit ribbon
8+
- Experience Editor support and custom WebEdit ribbon
99
- Wordpress Import
1010
- CSS-based themes, with custom themes possible
1111
- Various blog navigation components
1212
- Comments with author notification and optional approval workflow
13-
- Comment CAPTCHA through MSCaptcha or reCAPTCHA
13+
- Leverage Sitecore's robot detection for comment submission (no CAPTCHA necessary)
1414
- Gravatar Support
1515
- Social sharing through ShareThis or AddThis, and other Facebook and Twitter widgets
1616
- Tagging and tagcloud

Sitecore.Modules.WeBlog.sln

Lines changed: 54 additions & 128 deletions
Large diffs are not rendered by default.

Test/IntegrationTest/Test.aspx.designer.cs

Lines changed: 78 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)