Merge branch 'master' into plip10359-z3cform

Conflicts:
	CHANGES.rst
This commit is contained in:
Timo Stollenwerk
2015-01-29 21:31:45 +01:00
105 changed files with 4849 additions and 3559 deletions
@@ -1,5 +1,5 @@
<metadata>
<version>100</version>
<version>102</version>
<dependencies>
<dependency>profile-plone.app.registry:default</dependency>
</dependencies>
@@ -1,4 +1,7 @@
<?xml version="1.0"?>
<registry>
<records interface="plone.app.discussion.interfaces.IDiscussionSettings" />
</registry>
<records interface="plone.app.discussion.interfaces.IDiscussionSettings">
<value key="edit_comment_enabled">False</value>
<value key="delete_own_comment_enabled">False</value>
</records>
</registry>
@@ -3,11 +3,28 @@
<permissions>
<permission name="Review comments" acquire="True">
<role name="Manager"/>
<role name="Site Administrator"/>
<role name="Site Administrator"/>
<role name="Reviewer"/>
</permission>
<permission name="Edit comments" acquire="True">
<role name="Manager"/>
<role name="Site Administrator"/>
<role name="Reviewer"/>
<role name="Owner"/>
</permission>
<permission name="Delete comments" acquire="True">
<role name="Manager"/>
<role name="Site Administrator"/>
<role name="Reviewer"/>
</permission>
<permission name="Reply to item" acquire="False">
<role name="Authenticated"/>
</permission>
<permission name="Delete own comments" acquire="False">
<role name="Manager"/>
<role name="Site Administrator"/>
<role name="Reviewer"/>
<role name="Owner"/>
</permission>
</permissions>
</rolemap>