Commit Graph

1709 Commits

Author SHA1 Message Date
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
tisto f3a247dcd7 Fix buildout that broke due to version conflicts caused by the latest p.a.contenttypes release. 2014-03-23 17:46:53 +01:00
Timo Stollenwerk f65ef6cfe7 Merge pull request #41 from maartenkling/master
uses member.getId as author_username, so membrane users have portrait and author url
2014-03-04 12:09:26 +01:00
maartenkling 0ea9a7131f merge upstream and fix numbering 2014-03-04 09:16:36 +01:00
Timo Stollenwerk e0ae1c0eaa Preparing release 2.3.1 2014-02-22 10:12:32 +01:00
Timo Stollenwerk a26a4b363c 2.3.0 was a brown bag release. 2014-02-22 10:12:15 +01:00
Timo Stollenwerk 7a8f60dd5f Back to development: 2.3.1 2014-02-22 10:11:05 +01:00
Timo Stollenwerk cd65923df5 Make sure a release includes *.rst files. 2014-02-22 07:58:35 +01:00
Timo Stollenwerk ce5c00ca7d Prepare 2.3.0 release. 2014-02-22 07:25:07 +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
ichim-david aa87302280 Amend commit history of changes made by omiron from pull request 42 for a clearer message of intended fix 2014-02-10 11:51:35 +02:00
Alexandru Ghica fe747f2ae9 Merge pull request #42 from eea/master
Comments do not retain Mark for Deletion state
2014-02-04 02:15:24 -08:00
Ovidiu Miron f660a6d980 added to CHANGES.rst 2014-02-04 11:53:51 +02: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 f37e96bb90 fix typo in changelog 2014-02-02 15:02:21 +01: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
Timo Stollenwerk f7c1450a1e Merge pull request #40 from tisto/master
Remov qunit and jstestdriver test setup.
2013-12-15 07:02:16 -08:00
tisto a2ae2a888f Remov qunit and jstestdriver test setup. 2013-12-15 12:56:51 +01:00
Timo Stollenwerk 5c4599a7f3 Merge pull request #39 from tisto/master
Pep8 and code analysis.
2013-12-15 03:05:53 -08:00
tisto 38cfae5647 Set flake8 max complexity to 50. 2013-12-15 12:04:05 +01:00
tisto f0a9d9ad6b Pep8 2013-12-15 12:02:32 +01:00
tisto b5f4df5f17 Add code analysis section. 2013-12-15 12:00:25 +01:00
tisto 66e5563228 Fix buildout. 2013-11-26 20:08:30 +01:00
tisto a337413d3d Update CHANGES. 2013-11-26 19:29:28 +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 1bf4dacc1d Back out internal version number 2013-11-25 13:04:24 +00: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
Jess Henderson 7269dfca65 Add dev.delib-da.1 to version pin 2013-11-22 11:51:47 +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
David Glick 05fed2def7 Merge pull request #37 from plone/bsuttor-use-defaultUser-png
Use defaultUser.png instead of defaultUser.gif
2013-11-13 11:07:45 -08: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