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
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
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
Timo Stollenwerk
e11471a44e
Fix README.rst styles.
2014-12-13 09:34:09 +01:00
João Toss Molon
744b5b6380
Updated pt-br translation
2014-12-05 17:38:04 -02: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
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
Jens W. Klein
62b2990b7c
merged master
2014-08-17 04:48:44 +02:00
Andrea Cecchi
e9a4dcfc52
relaunched i18ndude and fix italian translations
2014-05-16 17:39:57 +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
9a4e3718fc
added Delete comments permission to manage comments deletion
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
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
TsungWei Hu
2360934029
Update ChangeLog.
2014-05-07 23:28:48 +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
ab926d6a10
Update change log
...
Conflicts:
CHANGES.rst
2014-04-18 16:35:45 +03:00
tisto
5a9bfdf876
Back to development: 2.3.3
2014-04-05 16:36:11 +02:00
tisto
7ebd2de06f
Preparing release 2.3.2
2014-04-05 16:22:19 +02: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
996592835b
state latest changes
2014-03-25 19:15:52 +01:00
Jens W. Klein
dd0831c7d7
state last change
2014-03-25 18:35:33 +01:00
tisto
9e7b574690
Move 'Fix reindexObject ...' CHANGES entry to the current release.
2014-03-24 20:51:26 +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
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