Skip to content

Commit d3fe723

Browse files
authored
Merge pull request #50 from DNNCommunity/development
Merging for 7.2.2 release
2 parents 659642d + 2c3842b commit d3fe723

14 files changed

+92
-101
lines changed

.github/CONTRIBUTING.md

+46-57
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,64 @@
11
# How to contribute
22

3-
Community contributions are essential part of any open source project. The
4-
community has access to a large number of unique configurations which would
5-
be extremely difficult for the core maintainers to reproduce. We want to keep
6-
it as easy as possible to contribute changes that get things working in your
7-
environment. There are a few guidelines that we need contributors to follow
8-
so that we can have a chance of keeping on top of things.
3+
Community contributions are essential part of any open source project. The community has access to a large number of unique configurations which would be extremely difficult for the core maintainers to reproduce. We want to keep it as easy as possible to contribute changes that get things working in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
94

10-
## Getting Started
5+
Make sure you have a [GitHub account](https://github.com/signup/free) to start with.
116

7+
## Level 1 contributions: easy ways to contribute
8+
There are several ways to contribute, depending on your background, level of expertise and willingness to spend some time. Everybody should be able to contribute on a minimal level:
9+
* Create or document issues
10+
* Create or improve documentation
11+
* Be a tester
1212

13-
* Make sure you have a [GitHub account](https://github.com/signup/free)
14-
* **Submit an issue** for your issue, assuming one does not already exist. If you have the rights, you should assign yourself to the issue. If you do not have that ability please add a comment noting that a pull request will be submitted for the issue. After review, if the pull request is accepted, we will mark the issue as resolved and assign it to a release so it can be QA'ed.
15-
* Clearly describe the issue including steps to reproduce when it is a bug.
16-
* Make sure you fill in the earliest version that you know has the issue.
17-
* Fork the repository on GitHub
13+
### Create issues
14+
Anybody with a GutHub account can create new issues. Please verify that a simlar issue has not been created before. Clearly describe the issue you encounter.
1815

19-
## Making Changes
20-
21-
* Create a topic branch from where you want to base your work.
22-
* This is usually the 'development' branch.
23-
* Release branches should only be targeted by official committers.
24-
* To quickly create a topic branch based on development; `git checkout -b my_contribution development`
25-
* Make commits of logical units.
26-
* Check for unnecessary whitespace with `git diff --check` before committing.
27-
* Make sure your commit messages are in the proper format
28-
* For bonus points run and add unit tests
29-
* Make sure you have added the necessary tests for your changes.
30-
* Run _all_ the tests to assure nothing else was accidentally broken.
16+
### Create or improve documentation
17+
Create an issue with suggestions for document improvements. If you have an idea about the new documenation, add that text (prefereably in markdown format) in the issue as proposed new or improved documentation.
3118

19+
### Be a tester
20+
Download an install version of the extension and test it in your own environment. If you are reviewing issues, try to reproduce issues that have been created and enhance documentation of the issue to reproduce any bugs.
3221

33-
## Making Trivial Changes
22+
If there is a new version of an extension, be one of the first to test that new version on a fresh install and as an upgrade of a previous version. Report your findings as issues.
3423

35-
### Documentation
24+
# Level 2 contributions: Provide improved or new code
25+
If you are commited as community member and have programming skills, there is more that you can do:
26+
* Create code fixes
27+
* Create new functionality
3628

37-
For changes of a trivial nature to comments and documentation, it is not
38-
always necessary to create a new ticket in the issue tracker. In this case, it is appropriate to start the first line of a commit with '(doc)' instead of
39-
a ticket number.
29+
We asume that you have some basic Git(Hub) knowledge and know how to work with fork, clone, create issue, commit, push, pull requests
4030

41-
````
42-
(doc) Add documentation commit example to CONTRIBUTING
31+
## Get started with code contributions
4332

44-
There is no example for contributing a documentation commit
45-
to the DNN repository. This is a problem because the contributor
46-
is left to assume how a commit of this nature may appear.
33+
### Fork the repository on GitHub
34+
If this is your first time working with the repository, you will need to fork the repository to get your system configured for local development.
4735

48-
The first line is a real life imperative statement with '(doc)' in
49-
place of what would have been the ticket number in a
50-
non-documentation related commit. The body describes the nature of
51-
the new documentation or comments added.
52-
````
36+
If you are new to Dnn Development, you can start by watching this video playlist which explains how to setup the required tools, your development environment and submit pull requests for modules, the Platform and the Persona Bar.
37+
[How to make a pull requests playlist](https://www.youtube.com/playlist?list=PLIx1M8IdVvqZ0bnODGqJyxvONNPj5BzMP)
5338

54-
## Submitting Changes
55-
56-
* Sign the [Contributor License Agreement](http://www.dnnsoftware.com).
57-
* Push your changes to a topic branch in your fork of the repository.
58-
* Submit a pull request to the DNN.Platform repository in the DNNSoftware organization.
59-
* The committers will handle updating the associated issue in the DNN Tracker to ensure it gets the necessary code review and QA.
39+
* Click fork on the project. You will get a fork of the repository in your own GitHub account
40+
* Clone your fork locally with `git clone
41+
* Add the *upstream connection* to the original repository, so you can rebase and update your fork with `git remote add upstream` to the base (the original) repository
42+
* To update your fork to the latest, you can then run `git fetch upstream` followed by `git push`
43+
44+
## Making Changes
45+
* Create a topic branch from where you want to base your work. This is usually a branch linked to the *issue #* your are trying to solve
46+
* Make commits of logical units
47+
* When ready to publish your changes, you can with `git push -u origin my_contribution`
48+
* Make sure your pull request description tags the GitHub issue ID, so it is clear what issue you have fixed
49+
* Make sure your commit messages are in the proper format
6050

61-
## Acceptance of your Changes
62-
* We have a group of fellow developers that review pull requests submitted by developers like yourself.
63-
* If your changes look good, then changes are merged to an appropriate release.
64-
* We may ask you to make further changes or reject the change (with proper reasonsing - we hope that's not the case though).
65-
* You should get an email notification as we complete processing of your pull request.
51+
## Submitting changes
52+
* Push your changes to a topic branch in your fork of the repository
53+
* Submit a pull request to the original (upstream( repository
54+
* The committers will handle updating the associated issue in the DNN Tracker to ensure it gets the necessary code review and QA
6655

67-
## Downloading latest package with your changes
68-
* As soon as changes are accepted, our team city build server gets into action.
69-
* New builds are usually available within 10 minutes of acceptance.
56+
## Acceptance of your changes
57+
* We have a group of fellow developers that review pull requests submitted by developers like yourself
58+
* If your changes look good, then changes are merged to an appropriate release
59+
* You should get an email notification as we complete processing of your pull request
7060

71-
# Additional Resources
61+
# Level 3 contributions: Become a repository custodian
62+
If you are really commited, want to work with highly commited team members (like yourself?) and want to contibute by taking care of one or more repositories, you might want to become a *repository custodian*.
7263

73-
* [Contributor License Agreement](http://www.dnnsoftware.com)
74-
* [General GitHub documentation](http://help.github.com/)
75-
* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
64+
Contact one of the team members of the organisation and discuss the opportunities.

App.config

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0"?>
2+
<configuration>
3+
4+
<system.web>
5+
<compilation debug="true" targetFramework="4.5.2"/>
6+
<httpRuntime targetFramework="4.5.2"/>
7+
</system.web>
8+
9+
<runtime>
10+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
11+
<dependentAssembly>
12+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
13+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
14+
</dependentAssembly>
15+
</assemblyBinding>
16+
</runtime>
17+
</configuration>

AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
// </auto-generated>
99
//------------------------------------------------------------------------------
1010

11-
[assembly: System.Reflection.AssemblyVersion("07.02.01.00")]
11+
[assembly: System.Reflection.AssemblyVersion("07.02.02.00")]
1212

1313

Components/Business/AnnouncementInfo.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#region License
22

33
//
4-
// DotNetNuke® - http://www.dotnetnuke.com
4+
// DotNetNuke - http://www.dotnetnuke.com
55
// Copyright (c) 2002-2012
66
// by DotNetNuke Corporation
77
//
@@ -173,7 +173,8 @@ public ContentItem ContentItem
173173

174174

175175
private UrlTrackingInfo _urlTrackingInfo;
176-
176+
177+
[IgnoreColumn]
177178
private UrlTrackingInfo UrlTrackingInfo
178179
{
179180
get { return _urlTrackingInfo ?? (_urlTrackingInfo = new UrlController().GetUrlTracking(PortalID, URL, ModuleID)); }

Components/Business/AnnouncementsController.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public void UpdateAnnouncement(AnnouncementInfo announcement)
100100
ContentTypeId = 4
101101
};
102102

103-
if (objContentItem.ContentItemId == Null.NullInteger)
103+
if (objContentItem.ContentItemId == Null.NullInteger || objContentItem.ContentItemId == 0)
104104
{
105105
announcement.ContentItemID = new ContentController().AddContentItem(objContentItem);
106106
}

Components/Common/ExtensionMethods.cs

+7-4
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,14 @@ public static int GetInteger(this Hashtable valueTable, string valueName, int de
5151
int resultValue = defaultValue;
5252
if ((valueTable[valueName] != null))
5353
{
54-
if (!int.TryParse((string)valueTable[valueName],out resultValue))
55-
{
56-
resultValue = defaultValue;
57-
}
54+
resultValue = int.TryParse((string)valueTable[valueName], out resultValue) ? resultValue : Null.NullInteger;
5855
}
56+
57+
if (resultValue == Null.NullInteger)
58+
{
59+
resultValue = defaultValue;
60+
}
61+
5962
return resultValue;
6063
}
6164

DotNetNuke.Announcements.csproj

+6-19
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,6 @@
8080
<PublishDatabases>false</PublishDatabases>
8181
</PropertyGroup>
8282
<ItemGroup>
83-
<Import Include="DotNetNuke" />
84-
<Import Include="DotNetNuke.Common" />
85-
<Import Include="DotNetNuke.Common.Utilities" />
86-
<Import Include="DotNetNuke.Data" />
87-
<Import Include="DotNetNuke.Entities.Users" />
88-
<Import Include="DotNetNuke.Framework" />
89-
<Import Include="DotNetNuke.Services.Exceptions" />
90-
<Import Include="DotNetNuke.Services.Localization" />
91-
<Import Include="DotNetNuke.UI" />
9283
<Import Include="Microsoft.VisualBasic" />
9384
<Import Include="System" />
9485
<Import Include="System.Collections" />
@@ -206,7 +197,6 @@
206197
<Content Include="Templates\SimpleAnnouncements\template.xml" />
207198
<Content Include="AnnouncementsView.ascx" />
208199
<Content Include="AnnouncementsSettings.ascx" />
209-
<Content Include="_Dependencies\ReadMe.txt" />
210200
</ItemGroup>
211201
<ItemGroup>
212202
<Content Include="App_LocalResources\AnnouncementsView.ascx.resx">
@@ -271,6 +261,7 @@
271261
<None Include="packages\MSBuildTasks.1.5.0.235\tools\MSBuild.Community.Tasks.xsd">
272262
<SubType>Designer</SubType>
273263
</None>
264+
<Content Include="App.config" />
274265
</ItemGroup>
275266
<ItemGroup>
276267
<WCFMetadata Include="Connected Services\" />
@@ -315,14 +306,14 @@
315306
<SpecificVersion>False</SpecificVersion>
316307
<Private>False</Private>
317308
</Reference>
318-
<Reference Include="DotNetNuke.Web.Client, Version=9.1.1.3, Culture=neutral, processorArchitecture=MSIL">
309+
<Reference Include="DotNetNuke.Web.Client, Version=9.1.1.129, Culture=neutral, processorArchitecture=MSIL">
310+
<HintPath>packages\DotNetNuke.Web.Client.9.1.1.129\lib\net40\DotNetNuke.Web.Client.dll</HintPath>
319311
<SpecificVersion>False</SpecificVersion>
320-
<HintPath>..\..\bin\DotNetNuke.Web.Client.dll</HintPath>
321312
<Private>False</Private>
322313
</Reference>
323-
<Reference Include="DotNetNuke.Web.Deprecated, Version=9.1.1.3, Culture=neutral, processorArchitecture=MSIL">
314+
<Reference Include="DotNetNuke.Web.Deprecated, Version=9.1.1.129, Culture=neutral, processorArchitecture=MSIL">
315+
<HintPath>packages\DotNetNuke.Web.Deprecated.9.1.1.129\lib\net40\DotNetNuke.Web.Deprecated.dll</HintPath>
324316
<SpecificVersion>False</SpecificVersion>
325-
<HintPath>..\..\bin\DotNetNuke.Web.Deprecated.dll</HintPath>
326317
<Private>False</Private>
327318
</Reference>
328319
<Reference Include="DotNetNuke.WebControls">
@@ -334,10 +325,6 @@
334325
<SpecificVersion>False</SpecificVersion>
335326
<Private>False</Private>
336327
</Reference>
337-
<Reference Include="FiftyOne.Foundation">
338-
<HintPath>packages\DotNetNuke.Bundle.9.1.1.129\lib\FiftyOne.Foundation.dll</HintPath>
339-
<Private>False</Private>
340-
</Reference>
341328
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
342329
<HintPath>packages\DotNetNuke.Core.9.1.1.129\lib\net40\Microsoft.ApplicationBlocks.Data.dll</HintPath>
343330
<SpecificVersion>False</SpecificVersion>
@@ -362,8 +349,8 @@
362349
</Reference>
363350
<Reference Include="System.XML" />
364351
<Reference Include="Telerik.Web.UI, Version=2013.2.717.40, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
352+
<HintPath>packages\DotNetNuke.Web.Deprecated.9.1.1.129\lib\net40\Telerik.Web.UI.dll</HintPath>
365353
<SpecificVersion>False</SpecificVersion>
366-
<HintPath>..\..\bin\Telerik.Web.UI.dll</HintPath>
367354
<Private>False</Private>
368355
</Reference>
369356
<Reference Include="WebFormsMvp, Version=1.4.1.0, Culture=neutral, PublicKeyToken=537f18701145dff0, processorArchitecture=MSIL">

DotNetNuke.Announcements.dnn

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="DNN_Announcements" type="Module" version="07.02.01">
3+
<package name="DNN_Announcements" type="Module" version="07.02.02">
44
<friendlyName>Announcements</friendlyName>
55
<description>This module renders a list of announcements. The way the announcements are rendered is completely customizable by templating.</description>
66
<iconFile>~/DesktopModules/Announcements/Images/icon-announcements-32px.png</iconFile>

Installation/version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.2.1.0
1+
7.2.2.0

MVP/Presenters/AnnouncementsSettingsPresenter.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
namespace DotNetNuke.Modules.Announcements.MVP.Presenters
1111
{
1212
public class AnnouncementsSettingsPresenter : ModuleSettingsPresenter<IAnnouncementsSettings, AnnouncementsSettingsModel>
13-
{
14-
private readonly IAnnouncementsController _announcementsController;
15-
13+
{
1614

1715
public AnnouncementsSettingsPresenter(IAnnouncementsSettings announcementsSettings)
1816
: base(announcementsSettings)

README.md

+3
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,6 @@ DNN Announcements is a basic module used for displaying news items on your DNN s
2222
This module is currently maintained by @erikvb and Joseph Craig
2323

2424
Please coordinate with them before publishing any new release and mark them as reviewers on pull requests
25+
26+
## Contributing
27+
If you would like to contribute to this project, please read [CONTRIBUTING.md](https://github.com/DNNCommunity/DNN.Announcements/blob/development/.github/CONTRIBUTING.md)

Templates/ModernAnnouncements/template.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<TemplateInfo>
33
<Type>SimpleTemplate</Type>
44
<ItemTemplate>item.htm</ItemTemplate>
5-
<AltItemTemplate></AltItemTemplate>
5+
<AltItemTemplate>alternatingitem.htm</AltItemTemplate>
66
<HeaderTemplate>header.htm</HeaderTemplate>
77
<FooterTemplate>footer.htm</FooterTemplate>
8-
<SeparatorTemplate></SeparatorTemplate>
9-
<DetailTemplate></DetailTemplate>
8+
<SeparatorTemplate>separator.htm</SeparatorTemplate>
9+
<DetailTemplate>detail.htm</DetailTemplate>
1010
<CssFile></CssFile>
1111
<JsFile></JsFile>
1212
<Version>01.00.00</Version>

_Dependencies/ReadMe.txt

-9
This file was deleted.

packages.config

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<package id="DotNetNuke.Core" version="9.1.1.129" targetFramework="net452" />
55
<package id="DotNetNuke.Instrumentation" version="9.1.1.129" targetFramework="net452" />
66
<package id="DotNetNuke.Web" version="9.1.1.129" targetFramework="net452" />
7+
<package id="DotNetNuke.Web.Client" version="9.1.1.129" targetFramework="net452" />
8+
<package id="DotNetNuke.Web.Deprecated" version="9.1.1.129" targetFramework="net452" />
79
<package id="DotNetNuke.WebApi" version="9.1.1.129" targetFramework="net452" />
810
<package id="MSBuildTasks" version="1.5.0.235" targetFramework="net452" developmentDependency="true" />
911
</packages>

0 commit comments

Comments
 (0)