Commit Graph

514 Commits

Author SHA1 Message Date
Timo Stollenwerk
5f1a7fb5bc Merge branch 'master' into plip10359-z3cform
Conflicts:
	CHANGES.rst
2015-01-29 21:31:45 +01:00
Timo Stollenwerk
c852609111 Merge branch 'master' into delete-own-comments
Conflicts:
	CHANGES.rst
2015-01-29 21:14:05 +01:00
Timo Stollenwerk
785bc7b890 Read mail settings from new (Plone 5) registry. 2014-12-13 16:20:08 +01:00
Victor Fernandez de Alba
30c88842c0 Reapplied on correct branch.
Revert "Revert "Update tag for id=content element to article instead of a simple div.""

This reverts commit 45f58edd06.
2014-10-09 13:30:53 +02:00
Vincent Fretin
06b20b8f81 merge fix from master (Don't execute createReplyForm js if there is no in_reply_to button) 2014-10-09 11:44:31 +02:00
Vincent Fretin
838f229726 Don't execute createReplyForm js if there is no in_reply_to button. 2014-10-09 11:41:00 +02:00
Vincent Fretin
2a8082cfa7 add delete_own_comment_enabled option in control panel 2014-09-20 16:02:48 +02:00
Thomas Desvenain
a94b3249a9 fixed can_delete called from parent 2014-09-05 11:11:54 +02:00
Gil Forcada
fa127ad85c Whitespaces cleanup 2014-08-23 00:31:28 +02:00
Jens W. Klein
2ba35bb0d4 merge fixed 2014-08-17 04:54:12 +02:00
Jens W. Klein
62b2990b7c merged master 2014-08-17 04:48:44 +02:00
Victor Fernandez de Alba
45f58edd06 Revert "Update tag for id=content element to article instead of a simple div."
This reverts commit 0165f1b73c.
2014-08-11 14:11:18 +02:00
Victor Fernandez de Alba
0165f1b73c Update tag for id=content element to article instead of a simple div. 2014-08-11 14:09:48 +02:00
Ammy2
002c81427e Id for textarea of reply form made unique 2014-06-25 02:32:48 +05:30
Andrea Cecchi
9a4e3718fc added Delete comments permission to manage comments deletion 2014-05-15 17:51:05 +02:00
Guido A.J. Stevens
520b1e83f4 provide "delete own comments" as a configurable option 2014-05-15 17:50:32 +02:00
Guido A.J. Stevens
a82352a36c Make comments editable 2014-05-15 17:50:32 +02:00
Timo Stollenwerk
fd6ac0788b Merge pull request #43 from plone/remove-dt-dl-dd
Remove DL's from portal message in templates.
2014-05-12 20:52:49 +02:00
Gaudenz Steinlin
fa17c51a7b Replace $.live with $.on
This is needed for jQuery >= 1.9 compatibility and is compatible with
JQuery >= 1.7 (Plone 4.3 onwards).
2014-04-28 18:06:41 +02:00
Jens W. Klein
2729f5a7e9 required showed up, but validation needs it on field too. huh. this is not what i expected, but, well, its z3cforms 2014-03-26 11:27:12 +01:00
Jens W. Klein
6bfa19411d bugfix 1: according to IDiscussionSettings.anonymous_email_enabled (cite):
If selected, anonymous user will have to give their email. - But field
was not required. Now it is.

bugfix 2: anonymous email field was never saved.
2014-03-25 21:30:50 +01:00
tisto
01641b4957 Merge branch 'fix_reindex_on_publish' of git://github.com/RedTurtle/plone.app.discussion into RedTurtle-fix_reindex_on_publish 2014-03-24 20:49:32 +01:00
maartenkling
0ea9a7131f merge upstream and fix numbering 2014-03-04 09:16:36 +01:00
Kees Hink
6ae623c39d Remove DL's from portal message in templates. 2014-02-11 09:42:42 +01:00
Kees Hink
cc02ed01ad Remove DL's from portal message in templates. 2014-02-11 09:38:54 +01:00
Ovidiu Miron
6bc5db4276 Fixed typo error 2014-02-04 11:46:29 +02:00
Ovidiu Miron
a9d0cb574b Execute the property workflow 2014-02-04 11:15:31 +02:00
maartenkling
8ccd648928 user member.getId as author_username, so membrane users and plone users have portraits and author urls 2014-02-02 14:55:37 +01:00
Benoît Suttor
c3ce01edd0 Use defaultUser.png instead of defaultUser.gif
Indeed, defaultUser.gif is in a deprecated skins folder (Products/CMFPlone/
skins/plone_deprecated/defaultUser.gif) and not defaultUser.png
(Products/CMFPlone/skins/plone_images/defaultUser.png).
Test is also updated.
2013-11-13 15:53:12 +01:00
maartenkling
c45650261e Rename @@discussion-settings to @@discussion-controlpanel 2013-11-12 10:45:59 +01:00
JeanMichel FRANCOIS
410b8c998a Fix ownership of comments. 2013-11-05 10:23:15 +01:00
JeanMichel FRANCOIS
34bbd39829 fix: add form serialized data to the delete comment ajax form submit
Even if in fresh Plone there is no data, I'm in a case where I'm adding
'ajax' marker in the form to not render all the page (which is the case
here) and the render is not used at all except if the action do not
happens in ajax.
2013-08-21 11:07:48 +02:00
Andrea Cecchi
bde1a1a44a fix reindexObject for comment container object 2013-08-20 15:37:56 +02:00
Andreas Zeidler
b027789391 prevent the viewlet from raising an error for objects that are not annotatable 2013-08-15 00:01:22 +02:00
Timo Stollenwerk
b151244138 Pep8. 2013-04-18 15:51:57 +02:00
Timo Stollenwerk
0a8cd01922 Pep8 2013-04-18 15:46:28 +02:00
Timo Stollenwerk
37faab444a Pep8. 2013-04-18 15:38:17 +02:00
Timo Stollenwerk
0b8112fda1 Pep8. 2013-04-18 15:31:40 +02:00
Timo Stollenwerk
65ade424d8 Pep8. 2013-04-17 14:55:50 +02:00
Asko Soukka
4165a74180 Fix migration to not fail when member has been deleted 2013-04-10 10:28:46 +03:00
Felipe Duardo
7f16b55493 return to last commit... 2013-04-09 13:55:21 -03:00
Felipe Duardo
79a96a8c1e Added a prefix to the id attr of the comment field
The W3C validator does not accept the attributes id or class started with numbers.
2013-04-09 12:21:14 -03:00
Patrick Gerken
05f0e7e4d8 Many updates to handle non public comments properly 2013-03-28 14:28:22 +01:00
Timo Stollenwerk
0c6b873bef Do not raise an error when no workflow is assigned to the comment type. 2013-03-27 17:06:14 +01:00
bdbaddog
6f675b6f80 Merge pull request #23 from bdbaddog/fix_comment_user_migration
fix migration of author_name and author_username
2013-02-11 10:20:41 -08:00
ichim-david
e2d8543020 Cherry-picked 7a48d5 and 10f031 from 2.1.x branch to master 2013-02-03 22:07:51 +02:00
JeanMichel FRANCOIS
a16958c1c7 add anonymous_email_enabled settings to really let integrator activate it. add the migration script which add the option to the registry and do not change the behavior: the email will not be displayed by default 2013-01-04 19:00:24 +01:00
William Deegan
68d195375e use member.getProperty('fullname') if member.fullname is an empty string. Not sure in what case this would happen, but it did happen in my site migration 2012-12-15 16:47:01 -08:00
William Deegan
ff1f65a75e simplify some of the logic and get some tests in place to cover them. TDB: test against actual site to ensure the changes to the logic don't break a real environment, but still work with the tests.. 2012-12-13 21:14:40 -08:00
William Deegan
485571325f fix migration of author_name and author_username 2012-11-27 21:32:07 -08:00