Commit Graph

225 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
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
ce5c00ca7d Prepare 2.3.0 release. 2014-02-22 07:25:07 +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
Ovidiu Miron
f660a6d980 added to CHANGES.rst 2014-02-04 11:53:51 +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
tisto
66e5563228 Fix buildout. 2013-11-26 20:08:30 +01:00
tisto
a337413d3d Update CHANGES. 2013-11-26 19:29:28 +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
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
3eae5378ff Update version number to 2.3.0 since we need a new master branch for Plone 5 due to the changes in the test setup (PLONE_APP_CONTENTTPYES_FIXTURE). 2013-09-24 15:00:46 +02:00
tisto
f929dc2bd9 Prepare 2.2.9 release. 2013-09-24 14:29:52 +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
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
Timo Stollenwerk
0d18a6dd57 Rename CHANGES.txt to CHANGES.rst. 2013-08-20 14:34:13 +02:00