Commit Graph
66 Commits
Author SHA1 Message Date
Timo Stollenwerk 9b23e270c0 Back to development: 2.4.5 2015-07-18 06:03:59 +02:00
Timo Stollenwerk 7edd363169 Preparing release 2.4.4 2015-07-18 06:03:24 +02:00
Timo Stollenwerk a3b540c484 Update changelog. 2015-07-18 05:42:15 +02:00
Timo Stollenwerk 53000c27f2 Back to development: 2.4.4 2015-06-05 09:46:48 +02:00
Timo Stollenwerk e6c654dfd4 Preparing release 2.4.3 2015-06-05 09:46:21 +02:00
Timo Stollenwerk f5f2beff10 Back to development: 2.4.3 2015-05-04 22:05:59 +02:00
Timo Stollenwerk 815b44dfd9 Preparing release 2.4.2 2015-05-04 22:05:12 +02:00
Timo Stollenwerk 48cb779f8f Blank lines. 2015-05-04 22:04:51 +02:00
Timo Stollenwerk ad5f8f6089 Merge pull request #65 from plonejp/master
Please merge for this po files for Japanese
2015-04-29 14:57:32 +02:00
Timo Stollenwerk 8843d8d804 Remove merge leftover. 2015-04-27 15:01:13 +02:00
Timo Stollenwerk 8d72da071f Revert "Jenkins test 3."
This reverts commit ea99af48a2.
2015-02-27 15:15:03 +01:00
Timo Stollenwerk ea99af48a2 Jenkins test 3. 2015-02-27 13:55:47 +01:00
Timo Stollenwerk 1b822af699 Merge branch 'master' of git://github.com/plone/plone.app.discussion 2015-02-27 13:47:35 +01:00
Timo Stollenwerk b8dd283e4d Jenkins test 2. 2015-02-27 13:47:30 +01:00
Timo Stollenwerk aa71b5f0ad Revert "Revert "Trigger jenkins again.""
This reverts commit a55020939e.
2015-02-13 15:10:59 +01:00
Timo Stollenwerk a55020939e Revert "Trigger jenkins again."
This reverts commit 13c013b15b.
2015-02-13 15:07:35 +01:00
Timo Stollenwerk 13c013b15b Trigger jenkins again. 2015-02-13 15:04:29 +01:00
Timo Stollenwerk 9e0bd9713a Trigger jenkins. 2015-02-13 14:57:30 +01:00
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
Timo Stollenwerk 984f34e3a9 Merge pull request #57 from jtmolon/master
Updated pt-br translation
2014-12-05 21:12:45 +01: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
Timo Stollenwerk 7f8be09d82 Merge pull request #50 from cekk/edit-delete-final
Edit and delete comments
2014-05-16 11:14:43 +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
Timo Stollenwerk 8709e0b14b Merge pull request #49 from eea/master
Add tests for custom events and contentrules events/string substitutions
2014-05-12 19:53:01 +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
tisto 5a9bfdf876 Back to development: 2.3.3 2014-04-05 16:36:11 +02:00
tisto c1c36c0133 Remove changes.txt in docs folder since this confuses zest.releaser. 2014-04-05 16:26:24 +02:00
tisto 5c43271430 Remove message_extractors from setup.py since they currently prevent us from making a release (distutils raise an error). 2014-04-05 16:24:11 +02:00
tisto 7ebd2de06f Preparing release 2.3.2 2014-04-05 16:22:19 +02: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
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
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
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 270f4d5653 Merge branch 'master' into edit-comments-squashed
Conflicts:
	CHANGES.rst
2013-09-24 15:38:56 +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 3ab24b12bc Pin zope.interface to 4.0.5. 2013-09-24 14:29:38 +02:00
tisto 08c3db59e1 Portuguese translation added. 2013-09-24 14:21:45 +02:00
Timo Stollenwerk 9049368cba Refactor tests to use the PLONE_APP_CONTENTTYPES_FIXTURE instead of the PLONE_FIXTURE. This fixes all test p.a.discussion test failures. 2013-08-29 22:20:47 +02:00
Timo Stollenwerk ad8d55cdb9 Merge pull request #28 from witsch/non-annotatables
fix for non-annotatable objects
2013-08-20 01:23:31 -07:00