Commit Graph

1753 Commits

Author SHA1 Message Date
Timo Stollenwerk
c933d261e2 Merge branch 'plip10359-z3cform' 2015-01-29 21:32:06 +01:00
Timo Stollenwerk
5f1a7fb5bc Merge branch 'master' into plip10359-z3cform
Conflicts:
	CHANGES.rst
2015-01-29 21:31:45 +01:00
Timo Stollenwerk
4f1491bea8 Let's use travis for static code analysis only. 2015-01-29 21:25:38 +01:00
Timo Stollenwerk
1b67cc7596 Next release needs to be a major version because of an API change and upgrade step. 2015-01-29 21:24:26 +01:00
Timo Stollenwerk
d7feb46bcb Merge branch 'delete-own-comments' 2015-01-29 21:19:50 +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
0591f9ad2d Fix buildout. 2015-01-29 20:29:53 +01:00
Timo Stollenwerk
52de2e809a Delete jenkins.cfg. 2015-01-29 19:35:11 +01:00
Timo Stollenwerk
fd4203b940 Add travis configuration. 2015-01-29 19:34:30 +01:00
Timo Stollenwerk
07076e157b Fix buildout. 2015-01-29 19:32:43 +01:00
Timo Stollenwerk
785bc7b890 Read mail settings from new (Plone 5) registry. 2014-12-13 16:20:08 +01:00
Timo Stollenwerk
e11471a44e Fix README.rst styles. 2014-12-13 09:34:09 +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
Timo Stollenwerk
984f34e3a9 Merge pull request #57 from jtmolon/master
Updated pt-br translation
2014-12-05 21:12:45 +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
esteele
ba28439d94 Back to development: 2.3.4 2014-10-23 21:37:49 -04:00
esteele
75b8c13640 Preparing release 2.3.3 2014-10-23 21:36:21 -04:00
Ramon Navarro Bosch
0bbbc9ba2f Merge pull request #54 from plone/barceloneta
Reapplied on correct branch.
2014-10-09 14:00:09 +02: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
Vincent Fretin
80a9dea1d8 no extra debug for plone.app.robotframework 2014-09-20 14:08:50 +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
Timo Stollenwerk
21a03d295e Merge pull request #53 from Ammy2/master
Id for the textarea of reply form made unique
2014-06-29 19:25:22 +02:00
Ammy2
002c81427e Id for textarea of reply form made unique 2014-06-25 02:32:48 +05:30
Jens W. Klein
d1bd62046b Merge pull request #52 from cekk/italian-translations
relaunched i18ndude and fix italian translations
2014-05-16 23:32:20 +02:00
Andrea Cecchi
e9a4dcfc52 relaunched i18ndude and fix italian translations 2014-05-16 17:39:57 +02:00
Timo Stollenwerk
7f8be09d82 Merge pull request #50 from cekk/edit-delete-final
Edit and delete comments
2014-05-16 11:14:43 +02:00
Andrea Cecchi
4a83166d95 fixed CHANGES 2014-05-15 18:06:38 +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
Andrea Cecchi
dec8bd63dd rebased CHANGES and tests 2014-05-15 16:55:27 +02:00
Andrea Cecchi
22cc340ff6 fixed HISTORY and add delete test to test_comments_viewlet 2014-05-15 16:54:54 +02:00