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
maartenkling
c6af5ee670
Merge remote-tracking branch 'upstream/master'
2012-11-13 09:37:14 +01:00
Timo Stollenwerk
e008bcf54d
Whitespace.
2012-11-04 17:25:25 +01:00
maartenkling
f1aaa0d752
The border attribute is obsolete. Consider specifying img { border: 0; } in CSS instead.
2012-11-01 08:31:02 +01:00
Johannes Raggam
882236cb15
For migrations of comments without a valid old_status, apply the 'published'
...
state.
2012-10-31 22:46:10 +01:00
maartenkling
62b0b47b56
remove the submitting completly, the form is submitted fine without and this fixes both #13037 and #12357
2012-10-26 11:12:44 +02:00
maartenkling
cb14c4f89e
change how to submit the form to stop ff to hang, this fixes #13037
2012-10-25 21:46:57 +02:00
maartenkling
96d72e7e29
fix #11324 , add fallback border color for ie8 and browser that not support boxshadows
2012-10-22 10:04:35 +02:00
maartenkling
66898bb87a
remove inline styles, this also fixes #12399
2012-10-22 09:58:40 +02:00
Thijs Jonkman
1fb71d5f17
Unified the site setup html structure
...
Change to unify the site setup html structure
=============================================
- Check for structure:
#portal-column-content
#content
.setup-link
.documentFirstHeading
.documentDescription
#content-core
- Check for body template- class
Related changes
---------------
Templates have also changed in:
plone.app.contentrules
plone.app.controlpanel
plone.app.discussion
plone.app.registry
plone.app.users
Products.CMFPlone
Styles have been updated in plonetheme.sunburst
2012-10-14 17:00:13 +02:00
rnd0101
cdea1ce59d
Update plone/app/discussion/browser/comments.pt
...
i18n for the Anonymous
2012-09-19 12:55:55 +03:00
Izak Burger
cde250bf4c
remove unused local variable.
2012-09-17 23:57:13 +02:00
Izak Burger
4d1e7b5806
don't ignore user_notification checkbox.
2012-09-17 23:51:15 +02:00
Patrick Gerken
9146aa8025
Don't use reindexObject from catalog, but from the object
...
collective.indexing assumes that reindexObject from catalog is not
an official api method, therefor it does not patch it.
This results in missing updates if plone.app.discussion is used
together with solr, which uses collective.indexing
2012-08-22 18:00:27 +02:00
Timo Stollenwerk
702f7e1f1d
Make 'text/plain' the default mime type for comments and make sure the default type is set properly when creating a new comment.
2012-07-12 16:01:07 +02:00
Timo Stollenwerk
ac9d4f9584
Rename the id of the text widgets because there can be css-id clashes with
...
the text field of documents when using TinyMCE in overlays or multiple
instances of TinyMCE on a single page.
2012-07-12 15:49:19 +02:00
Timo Stollenwerk
0535e659ff
Refactor the comment creator/author_name to comply with the Plone core convention to store the username on the creator attribute and not the fullname.
2012-07-12 15:39:27 +02:00
Timo Stollenwerk
19685db96b
Merge pull request #9 from Goldmund-Wyldebeast-Wunderliebe/master
...
no more recursive came_from redirection after logged_in
2012-07-12 03:35:33 -07:00
Timo Stollenwerk
0e587a7d85
Support for Dexterity added.
2012-06-30 10:59:49 +02:00
Paul J Stevens
53428fe5f6
total_comments only counts published comments
...
Also migrate workflow state during migration.
2012-06-13 11:17:22 +00:00
Gaudenz Steinlin
a7b3c818f2
Delete own comments
...
Add permission to allow comment authors to delete their own comments if
there are no replies yet.
2012-05-29 13:33:46 +02:00
Gaudenz Steinlin
4e0bf9f25e
Fix JS comment deletion
...
If the comment tree had just one top level comment the whole tree was
removed by the JS code if just one comment in the tree was deleted.
These comments were (correctly) not removed from the ZODB.
2012-05-29 13:26:05 +02:00
Hanno Schlichting
1b0ba3c0b0
No longer depend on zope.app packages.
2012-05-18 18:19:12 -04:00
Huub Bouma
c9848bebfe
no more recursive came_from redirection after logged_in
2012-04-12 13:06:05 +02:00
Timo Stollenwerk
ebb39b4994
No need to define portal_membership tool twice.
2012-03-19 16:32:33 +01:00
Timo Stollenwerk
58663fb492
Warning message added to discussion control panel that shows up if there are unmigrated comments.
2012-03-15 20:00:08 +01:00
Timo Stollenwerk
c76ef0523e
Merge commit 877f2d3e84
which has been accidentially purged.
2012-03-15 19:06:23 +01:00
Timo Stollenwerk
910f75aa7e
Make comments and controlpanel views more robust, so they don't break if no workflow is assigned to the 'Discussion Item' content type.
2012-03-15 13:06:00 +01:00
Elizabeth Leddy
877f2d3e84
fix url redirect for content types that must have /view in url to view contents
2012-03-14 15:01:17 -07:00
Timo Stollenwerk
80d70bbf08
Whitespace
2012-01-25 15:57:17 +01:00
tisto
c14091c734
Pep8
2012-01-14 08:00:40 +01:00
tisto
11e101f7d7
Pep8
2012-01-14 07:47:07 +01:00
tisto
2dc5393ff2
Pep8
2012-01-14 07:35:59 +01:00
tisto
2d4f7fd665
Pep8
2012-01-14 07:30:43 +01:00
tisto
0558a9b739
Pep8
2012-01-14 07:26:01 +01:00
tisto
a3883d7e7b
Pep8
2012-01-14 07:13:39 +01:00
Timo Stollenwerk
cce409a729
Pep8
2012-01-13 14:40:26 +01:00
Timo Stollenwerk
07cde3ca7b
Pep8
2012-01-13 10:16:01 +01:00
Timo Stollenwerk
5911bae362
whitespace.
...
svn path=/plone.app.discussion/trunk/; revision=51798
2011-08-26 11:13:19 +00:00
Timo Stollenwerk
87700f3810
Markdown syntax added to possible comment text transforms.
...
svn path=/plone.app.discussion/trunk/; revision=51530
2011-08-05 10:08:39 +00:00
Timo Stollenwerk
dbda349768
Automatically reload batch moderation page if no comments are left. This refs #11298 .
...
svn path=/plone.app.discussion/trunk/; revision=51274
2011-07-15 17:29:29 +00:00
Timo Stollenwerk
637ac334ac
Remove debug print.
...
svn path=/plone.app.discussion/trunk/; revision=51259
2011-07-15 08:25:34 +00:00
Timo Stollenwerk
160022b146
Another fix for http://dev.plone.org/plone/ticket/11486 . r51246 fixed Chrome but broke Safari. This fix has been tested in Fx, Chrome, Safari and IE 9.
...
svn path=/plone.app.discussion/trunk/; revision=51258
2011-07-15 08:23:08 +00:00
Timo Stollenwerk
c2ff87a778
Fix discussion control panel submit. This fixes Refs #11486 .
...
svn path=/plone.app.discussion/trunk/; revision=51246
2011-07-14 07:09:58 +00:00
Timo Stollenwerk
98bcc19d5c
Do not render/update the comment form in CommentViewlets if commenting is disabled, since this slows down the page rendering. This fixes http://dev.plone.org/plone/ticket/11930 #11930
...
svn path=/plone.app.discussion/trunk/; revision=50489
2011-06-16 10:59:25 +00:00
WouterVH
f149f0f8dd
- Enable the left-menu on the configlet, to be more consistent with all other configlets.
...
Related to https://dev.plone.org/plone/ticket/11737
[WouterVH]
svn path=/plone.app.discussion/trunk/; revision=50095
2011-05-28 22:02:33 +00:00
Timo Stollenwerk
a7f61eb4d3
Refactor/clean up the handleComment method.
...
svn path=/plone.app.discussion/trunk/; revision=50069
2011-05-27 13:47:15 +00:00
Timo Stollenwerk
1ea5f0cdb4
Make handleComment method store comment attributes from form extenders. This allows us to extend the comment form with external add-ons.
...
svn path=/plone.app.discussion/trunk/; revision=50059
2011-05-26 21:37:37 +00:00
Erico Andrei
9ac35de362
Tests expect a False to be returned from the funcion
...
svn path=/plone.app.discussion/trunk/; revision=49137
2011-04-27 19:33:00 +00:00
Erico Andrei
1a751b495f
Unless Discussion Item has an workflow, moderation is not enabled
...
svn path=/plone.app.discussion/trunk/; revision=49135
2011-04-27 17:41:07 +00:00
Timo Stollenwerk
e75685d5c0
Add links to delete/approve a comment in the moderator notification email.
...
Remove the unnecessary workflow_action parameter from the PublishComments request.
svn path=/plone.app.discussion/trunk/; revision=49045
2011-04-22 17:09:09 +00:00
Timo Stollenwerk
f551e30849
Replace tabs with whitespace in moderation.js.
...
svn path=/plone.app.discussion/trunk/; revision=49036
2011-04-22 15:43:58 +00:00
Timo Stollenwerk
c66e243a86
Make sure the email settings in the control panel are disabled when commenting is disabled globally;
...
Enable/disable moderator_email setting dynamically as mail settings or discussion settings change.
svn path=/plone.app.discussion/trunk/; revision=49035
2011-04-22 15:41:45 +00:00
Timo Stollenwerk
b84211ddf0
Remove ImportError exceptions for Plone < 4.1 code and plone.z3cform < 0.6.0.
...
svn path=/plone.app.discussion/trunk/; revision=49033
2011-04-22 14:59:59 +00:00