Commit Graph

1201 Commits

Author SHA1 Message Date
Manabu TERADA
b235f74f46 Merge branch 'master' of github.com:plone/plone.app.discussion
Conflicts:
	plone/app/discussion/locales/ja/LC_MESSAGES/plone.app.discussion.po
2015-04-29 17:39:14 +09:00
Takanori Suzuki
b868b44ba0 update japanese translation 2015-04-29 17:27:40 +09:00
David\ Beitey
285dbcd918 i18n for ICaptcha interface field 2015-03-23 18:06:29 +10:00
David Glick
8690461ffb create doc1 in the text fixture rather than in setup for each test 2015-03-09 21:51:45 -07:00
Gil Forcada
4ea41aba43 Fix tests 2015-02-16 16:35:43 +01:00
Gil Forcada
d5b5b1c2cd Fix total_comments indexer
"@property removes Acquisition wrappers from 'self'.
I don't remember why exactly (some implementation detail of Acquisition),
but it's a fact of life."

Quote from @davisagli on
https://github.com/plone/plone.app.discussion/pull/58

In short: removing the @property from total_comments fix the problem.
2015-02-16 11:31:47 +01:00
Gil Forcada
535af3aace Count acquisition wrapped comments
If the View permission is not set directly on the workflow,
but instead is left to be acquired,
total_comments will always return 0.
2015-02-16 11:28:49 +01:00
Gil Forcada
b4c1d9e42d Sort imports
As per the styleguide
2015-02-16 10:22:09 +01:00
vangheem
bd0637e0b2 fix window load event to use 2015-02-11 16:30:03 -06:00
vangheem
c49c9707ec more js improvements 2015-02-10 16:41:00 -06:00
vangheem
ad3953f794 use requirejs if available 2015-02-10 16:21:17 -06:00
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
Roberto Diaz
609e9f61aa Updated SPANISH .po file 2014-12-11 16:26:45 +01:00
Roberto Diaz
2a130ffeb1 Updated CATALAN .po file 2014-12-11 16:26:28 +01:00
João Toss Molon
744b5b6380 Updated pt-br translation 2014-12-05 17:38:04 -02:00
Gil Forcada
19026439dd Use spaces please 2014-12-03 12:03:26 +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
acacc8281a add a test for delete-own-comment view 2014-09-20 16:21:55 +02:00
Vincent Fretin
2a8082cfa7 add delete_own_comment_enabled option in control panel 2014-09-20 16:02:48 +02:00
Vincent Fretin
42d12200a7 Don't use session at all for content rules, set the event in the request to be able to access comment attributes. This fixes 'InvalidObjectReference: A new object is reachable from multiple databases.' if comment contains a RichTextValue which contains a RawValueHolder (persistent object). 2014-09-20 14:54:02 +02:00
Vincent Fretin
ee28528f55 Don't use session at all for content rules, set the event in the request to be able to access comment attributes. This fixes 'InvalidObjectReference: A new object is reachable from multiple databases.' if comment contains a RichTextValue which contains a RawValueHolder (persistent object). 2014-09-20 14:14:19 +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
e9a4dcfc52 relaunched i18ndude and fix italian translations 2014-05-16 17:39:57 +02:00
Andrea Cecchi
4f255a355d rebased CHANGES and tests 2014-05-15 17:51:22 +02:00
Andrea Cecchi
e453e0050b fixed HISTORY and add delete test to test_comments_viewlet 2014-05-15 17:51:22 +02:00
Andrea Cecchi
f67f12bd05 fixed upgrade step 2014-05-15 17:51:05 +02:00
Andrea Cecchi
9a4e3718fc added Delete comments permission to manage comments deletion 2014-05-15 17:51:05 +02:00
Andrea Cecchi
fd16144b9b fixed edit test 2014-05-15 17:51:05 +02:00
Andrea Cecchi
3711d2fb5f rebased branch from master 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
2b18d5a2e4 Revert "Merge pull request #38 from delib/evilbungle-comment-acquisition"
This reverts commit e18598e316, reversing
changes made to fd6ac0788b.

This pull request introduces two test failures. See http://jenkins.plone.org/job/plone-5.0-python-2.7/lastCompletedBuild/testReport/ for details.
2014-05-13 07:07:37 +02:00
Timo Stollenwerk
e18598e316 Merge pull request #38 from delib/evilbungle-comment-acquisition
Fixing incorrect behaviour with acquired permissions
2014-05-12 22:53:34 +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
Alin Voinea
fe91d7801e Add tests for custom events and contentrules events/string substitutions 2014-05-12 20:20:18 +03:00
Jens W. Klein
311eef63eb Merge pull request #48 from l34marr/translation
Update Traditional Chinese Translation.
2014-05-12 10:39:33 +02:00
tisto
22ed06b66d Add second robot test to test adding comments. 2014-05-02 13:42:19 +02:00
tisto
f894d47d62 Add basic robot test setup and a first test. 2014-05-02 13:22:08 +02:00
TsungWei Hu
6ced9ed0a5 Update Traditional Chinese Translation. 2014-05-02 18:30:08 +08: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
Alin Voinea
6565dfe19e i18n update 2014-04-18 17:26:27 +03:00
Alin Voinea
28d7556c92 Remove hard dependency on plone.stringinterp 2014-04-18 16:42:06 +03:00
Alin Voinea
13830715a7 Add custom content rules string substitutions
- Add content rules string substitutions for comment:
  - id
  - text
  - author email
  - author user name
  - author full name
2014-04-18 16:36:06 +03:00
Alin Voinea
ab926d6a10 Update change log
Conflicts:
	CHANGES.rst
2014-04-18 16:35:45 +03:00
Alin Voinea
14d4382ca6 Use commented object as context instead of comment within event trigger
- In order this to work with plone.contentrules use commented object as
  the main context within custom discussion events and add comment as the
  second parameter.
2014-04-18 16:33:12 +03:00
Alin Voinea
4343197209 Trigger custom comment events on comment add/remove/reply
Conflicts:
	plone/app/discussion/interfaces.py
2014-04-18 16:32:43 +03: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
Jens W. Klein
9575a0436a synced with recent i18ndude and updated missing german translations 2014-03-25 19:14:26 +01:00
Jens W. Klein
14263973f0 synced with recent i18ndude and updated missing german translations (mostly in settings form) 2014-03-25 19:13:43 +01:00
Jens W. Klein
0a6d429237 corrected outdated help text 2014-03-25 18:53:51 +01:00
Jens W. Klein
334b01f9ff run of update translations. nothing really changed. anyway, no we're sure. next: missing translations (de) 2014-03-25 18:39:08 +01:00
Jens W. Klein
6609ab6af5 make flake8 happy 2014-03-25 18:38:12 +01:00
Jens W. Klein
a145413ac2 make flake8 happy 2014-03-25 18:37:06 +01:00
Jens W. Klein
67213b70eb make flake8 happy 2014-03-25 18:36:14 +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
tisto
9c9c2e2aaa Merge branch 'master' of git://github.com/huubbouma/plone.app.discussion into huubbouma-master
Conflicts:
	CHANGES.rst
2014-03-23 18:54:44 +01:00
maartenkling
0ea9a7131f merge upstream and fix numbering 2014-03-04 09:16:36 +01:00
Philip Bauer
d788d07a87 fix test. the richtext-field in plone.app.contenttypes uses a behavior 2014-02-14 09:40:55 +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
Timo Stollenwerk
a8dc5dd3f0 Remove test_suite functions since they are only needed for zope.testing < 3.8.0. 2013-12-19 09:54:03 +01:00
tisto
a2ae2a888f Remov qunit and jstestdriver test setup. 2013-12-15 12:56:51 +01:00
tisto
f0a9d9ad6b Pep8 2013-12-15 12:02:32 +01:00
Timo Stollenwerk
a2552acd2b Merge pull request #36 from aputtu/patch-1
Corrections and additions to the Danish translation
2013-11-26 10:27:52 -08:00
Alan Hoey
8161dc14da Fixing test failures. 2013-11-25 12:54:49 +00:00
Alan Hoey
e6ec6ebe16 Add tests to confirm that some methods of a conversation incorrectly use an unwrapped comment to determine whether anonymous users can view. 2013-11-25 12:52:31 +00:00
Alan Hoey
4804868ab2 Refactor acquisition tests to define the expected behaviour when dealing with wrapped and unwrapped comments. 2013-11-25 12:06:05 +00:00
Alan Hoey
4be4c03c49 Fix total comments index 2013-11-21 18:13:31 +00:00
vmaksymiv
8e56b99638 added test acquisition chain for unwrapped object
Conflicts:
	plone/app/discussion/tests/test_acquisition.py
2013-11-21 17:23:36 +00:00
Kees Hink
5fb6968fca Add a test for Acquisition in comments. 2013-11-21 17:22:12 +00:00
Roman Kozlovskyi
f1747c7a87 Updated ukrainian translations 2013-11-17 21:10:02 +02:00
David Glick
7cfbd20d72 don't fail test if portal_atct is missing 2013-11-15 00:11:13 -08:00
Timo Stollenwerk
654869a30d Remove old topic test. New collections are tested in p.a.contenttypes anyways. 2013-11-14 11:01:14 +01:00
Mikel Larreategi
4fdd1f7467 update basque translation 2013-11-14 09:13:20 +01:00
Mikel Larreategi
ceae98cd19 update basque translation 2013-11-14 09:12:38 +01:00
Mikel Larreategi
2f781fe6e9 update basque translation 2013-11-14 09:12:31 +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
aputtu
00861f5f9c Corrections and additions to the Danish translation 2013-10-22 20:22:05 +02:00
David Glick
dcba2c2714 re-add ICommentingTool to support migration 2013-10-18 21:40:50 -07:00
tisto
d225cbfc9a Remove bbb directory. 2013-10-16 19:20:15 +02:00
tisto
e7cae8430a Replace deprecated test assert statements. 2013-10-10 16:29:15 +02:00
tisto
fbc78e2951 Remove portal_discussion tool. 2013-10-10 15:36:18 +02:00
tisto
08c3db59e1 Portuguese translation added. 2013-09-24 14:21:45 +02:00
Huub Bouma
fd85de9c30 Fix comments Title if utf-8 characters in author_name 2013-09-20 16:28:05 +02:00