Skip to content

Commit

Permalink
[fc] Repository: plone.app.discussion
Browse files Browse the repository at this point in the history
Branch: refs/heads/master
Date: 2020-01-08T12:22:09+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@ee6b107

publish only pending comment, else show status message

Files changed:
M plone/app/discussion/browser/moderation.py
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-08T12:22:09+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@840bc8d

changelog

Files changed:
A news/163.enhancement
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-08T12:22:09+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@875409d

Moderation view tabbed

two tabs for comments to moderate and comments approved

Files changed:
M plone/app/discussion/browser/configure.zcml
M plone/app/discussion/browser/moderation.pt
M plone/app/discussion/browser/moderation.py
D plone/app/discussion/browser/comments_approved.pt
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-08T12:22:09+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@f7b8335

additional workflow with rejected state

moderation view and approved comments view: buttons for reject and approve

Files changed:
A plone/app/discussion/profiles/default/workflows/comment_3state_review_workflow/definition.xml
M plone/app/discussion/browser/configure.zcml
M plone/app/discussion/browser/javascripts/moderation.js
M plone/app/discussion/browser/moderation.pt
M plone/app/discussion/browser/moderation.py
M plone/app/discussion/profiles/default/workflows.xml
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-08T12:36:28+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@084d289

Additional (optional) workflow: "Comment Multiple State Review Workflow"

Moderator is not forced to delete a comment or to let it pending:
Workflow has two more states "rejected" and "spam" to existing review workflow.
Moderation view extended showing all states. Filter by state.

Files changed:
A news/164.enhancement
A plone/app/discussion/profiles/default/workflows/comment_multiple_state_review_workflow/definition.xml
M plone/app/discussion/browser/comments.pt
M plone/app/discussion/browser/configure.zcml
M plone/app/discussion/browser/controlpanel.py
M plone/app/discussion/browser/javascripts/comments.js
M plone/app/discussion/browser/javascripts/moderation.js
M plone/app/discussion/browser/moderation.pt
M plone/app/discussion/browser/moderation.py
M plone/app/discussion/profiles/default/metadata.xml
M plone/app/discussion/profiles/default/workflows.xml
M plone/app/discussion/tests/functional_test_comment_review_workflow.txt
M plone/app/discussion/tests/functional_test_comments.txt
M plone/app/discussion/tests/test_moderation_view.py
M plone/app/discussion/tests/test_workflow.py
M plone/app/discussion/upgrades.py
M plone/app/discussion/upgrades.zcml
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-08T12:37:34+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@64d50fb

fix docstring

Files changed:
M plone/app/discussion/browser/moderation.pt
M plone/app/discussion/browser/moderation.py
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-08T12:37:34+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@7a68067

disable portlet slots

Files changed:
M plone/app/discussion/browser/moderation.pt
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-08T12:37:34+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@d93525f

Moderation view: filter on state only for comment_multiple_state_review_workflow

Files changed:
M plone/app/discussion/browser/moderation.pt
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-08T12:39:57+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@bf20752

bulk moderation of comments

extended for comment_multiple_state_review_workflow, refactoring and tests

Files changed:
A plone/app/discussion/tests/robot/test_moderation.robot
A plone/app/discussion/tests/test_moderation_multiple_state_view.py
M plone/app/discussion/browser/configure.zcml
M plone/app/discussion/browser/javascripts/moderation.js
M plone/app/discussion/browser/moderation.pt
M plone/app/discussion/browser/moderation.py
M plone/app/discussion/events.py
M plone/app/discussion/interfaces.py
M plone/app/discussion/profiles/default/workflows/comment_multiple_state_review_workflow/definition.xml
M plone/app/discussion/tests/test_moderation_view.py
D plone/app/discussion/profiles/default/workflows/comment_3state_review_workflow/definition.xml
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-08T12:39:58+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@3049041

batch navigation: reload on filtering by review_state

Files changed:
M plone/app/discussion/browser/javascripts/moderation.js
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-08T12:41:06+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@dfc21d1

comment "approved" renamed to "published"

Files changed:
M plone/app/discussion/browser/javascripts/moderation.js
M plone/app/discussion/browser/moderation.py
M plone/app/discussion/profiles/default/workflows/comment_multiple_state_review_workflow/definition.xml
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-08T12:41:06+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@54de9b3

Update test_moderation.robot

Files changed:
M plone/app/discussion/tests/robot/test_moderation.robot
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-08T12:41:06+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@96e0fb8

last transition entry as is from history

Files changed:
M plone/app/discussion/browser/javascripts/moderation.js
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-08T12:41:06+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@f777315

moderation view: get last transition entry faster

get it from @@contenthistorypopup instead from @@HistoryView

Files changed:
M plone/app/discussion/browser/javascripts/moderation.js
M plone/app/discussion/browser/moderation.pt
M plone/app/discussion/tests/functional_test_comment_review_workflow.txt
M plone/app/discussion/tests/robot/test_moderation.robot
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-08T12:42:03+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@c1ec431

extended existing review workflow by stati 'rejected' and 'spam'

removed addional third workflow

Files changed:
M plone/app/discussion/browser/controlpanel.py
M plone/app/discussion/browser/javascripts/moderation.js
M plone/app/discussion/browser/moderation.pt
M plone/app/discussion/browser/moderation.py
M plone/app/discussion/profiles/default/workflows.xml
M plone/app/discussion/profiles/default/workflows/comment_review_workflow/definition.xml
M plone/app/discussion/tests/robot/test_moderation.robot
M plone/app/discussion/tests/test_moderation_multiple_state_view.py
M plone/app/discussion/upgrades.py
M plone/app/discussion/upgrades.zcml
D plone/app/discussion/profiles/default/workflows/comment_multiple_state_review_workflow/definition.xml
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-11T11:04:19+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@e308097

rebase cleanup

Files changed:
A news/163.bugfix
A news/163.feature.1
A news/163.feature.2
A news/164.feature
D news/163.enhancement
D news/164.enhancement
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-11T11:08:22+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@36c834e

rebase cleanup

Files changed:
D news/163.bugfix
D news/163.feature.1
D news/163.feature.2
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-11T11:43:35+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@dde8640

Update test_comments_viewlet.py

Files changed:
M plone/app/discussion/tests/test_comments_viewlet.py
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-13T11:23:48+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@336808b

Update metadata.xml

Files changed:
M plone/app/discussion/profiles/default/metadata.xml
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-13T11:23:58+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@812b28d

clean up

Files changed:
M plone/app/discussion/browser/moderation.py
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-14T14:05:36+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@6409366

Style: Filter by review state: more space between options

Files changed:
M plone/app/discussion/browser/moderation.pt
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-14T15:59:05+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@9b1eb68

Upgrade step added

Upgrade applies workflow changes to existing instances

Files changed:
M plone/app/discussion/profiles/default/metadata.xml
M plone/app/discussion/upgrades.py
M plone/app/discussion/upgrades.zcml
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-14T16:26:32+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@6794d95

Translation: label for save button on edit form

Files changed:
M plone/app/discussion/browser/comment.py
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-16T15:32:46+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@f7ae6e4

unique css ids

and bug fix test: editing comment: button label "save" instead of "edit comment"

Files changed:
M news/164.feature
M plone/app/discussion/browser/comments.pt
M plone/app/discussion/browser/javascripts/comments.js
M plone/app/discussion/tests/functional_test_comments.txt
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-01-21T12:02:09+01:00
Author: Katja Suess (ksuess) <k.suess@rohberg.ch>
Commit: plone/plone.app.discussion@61545c6

Moderation on commented page also with ajax like on moderation view

Files changed:
M plone/app/discussion/browser/javascripts/comments.js
M plone/app/discussion/browser/javascripts/moderation.js
M plone/app/discussion/browser/moderation.py
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2020-03-16T23:18:14+01:00
Author: Maurits van Rees (mauritsvanrees) <m.van.rees@zestsoftware.nl>
Commit: plone/plone.app.discussion@d39b2fc

Merge pull request #166 from plone/moderation-extended

Extended Moderation of comments

Files changed:
A news/164.feature
A plone/app/discussion/tests/robot/test_moderation.robot
A plone/app/discussion/tests/test_moderation_multiple_state_view.py
M plone/app/discussion/browser/comment.py
M plone/app/discussion/browser/comments.pt
M plone/app/discussion/browser/configure.zcml
M plone/app/discussion/browser/controlpanel.py
M plone/app/discussion/browser/javascripts/comments.js
M plone/app/discussion/browser/javascripts/moderation.js
M plone/app/discussion/browser/moderation.pt
M plone/app/discussion/browser/moderation.py
M plone/app/discussion/events.py
M plone/app/discussion/interfaces.py
M plone/app/discussion/profiles/default/metadata.xml
M plone/app/discussion/profiles/default/workflows/comment_review_workflow/definition.xml
M plone/app/discussion/tests/functional_test_comment_review_workflow.txt
M plone/app/discussion/tests/functional_test_comments.txt
M plone/app/discussion/tests/test_comments_viewlet.py
M plone/app/discussion/tests/test_moderation_view.py
M plone/app/discussion/tests/test_workflow.py
M plone/app/discussion/upgrades.py
M plone/app/discussion/upgrades.zcml
D plone/app/discussion/browser/comments_approved.pt
  • Loading branch information
mauritsvanrees committed Mar 16, 2020
1 parent 7c140c2 commit 57b5866
Showing 1 changed file with 495 additions and 49 deletions.
Loading

0 comments on commit 57b5866

Please sign in to comment.