Commit Graph

1709 Commits

Author SHA1 Message Date
Leonardo J. Caballero G 4a74083680 Updated .gitignore file 2015-05-31 13:40:31 -04:30
Low Kian Seong da84d4d642 Fixing broken test on travis 2015-05-13 20:03:11 +08:00
Gil Forcada Codinachs 4556486082 Merge pull request #67 from plonejp/master
Updated Japanese translation
2015-05-11 08:39:58 +02:00
Manabu TERADA a781e6b7fc wrote changes.rst 2015-05-11 10:16:11 +09:00
Takanori Suzuki 44e7f16636 fix fuzzy translation for japanese 2015-05-09 15:12:29 +09:00
Takanori Suzuki f745e7c976 update japanese translation 2015-05-09 15:05:35 +09:00
vangheem 1a04b5b042 fix test failures with csrf protection and locking behavior 2015-05-08 12:06:29 -05: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
Gil Forcada add7610466 Add changelog entries 2015-05-03 23:10:45 +02:00
Gil Forcada 7c8a1371ee 'X not in Y' 2015-05-03 08:56:58 +02:00
Gil Forcada dcb2a5f51b 2 spaces between top level classes 2015-05-03 08:43:22 +02:00
Gil Forcada 8410b7525f Do not redefine comment 2015-05-03 08:42:52 +02:00
Gil Forcada 754e712372 Typo 2015-05-03 08:42:07 +02:00
Gil Forcada ce48a9ed46 2 spaces before inline comment 2015-05-03 08:41:56 +02:00
Gil Forcada 8b883451ca 80 chars 2015-05-03 08:41:24 +02:00
Gil Forcada fad5a96129 Unused variable 2015-05-03 08:27:21 +02:00
Gil Forcada 411f36e708 One argument per line 2015-05-03 08:27:03 +02:00
Gil Forcada 2baafcbfd8 Typo 2015-05-03 08:25:19 +02:00
Gil Forcada 0ade2c4329 'X not in Y' is recommended 2015-05-03 08:25:08 +02:00
Gil Forcada 9066183ea9 2 lines between top level functions/classes 2015-05-03 08:24:08 +02:00
Gil Forcada 4bc77a2831 Sort imports
Remove unused ones as well.
2015-05-03 08:16:41 +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
Manabu TERADA 16a6090693 added changes.rst 2015-04-29 18:39:20 +09:00
Takanori Suzuki acae47c17a update japanese translation 2015-04-29 17:57:23 +09:00
Manabu TERADA b235f74f46 Merge branch 'master' of github.com:plone/plone.app.discussion
Conflicts:
	plone/app/discussion/locales/ja/LC_MESSAGES/plone.app.discussion.po
2015-04-29 17:39:14 +09:00
Takanori Suzuki b868b44ba0 update japanese translation 2015-04-29 17:27:40 +09:00
Timo Stollenwerk 8843d8d804 Remove merge leftover. 2015-04-27 15:01:13 +02:00
Gil Forcada b4cc3b0f54 Revert "Trigger jenkins"
This reverts commit b550683868.
2015-04-05 00:42:00 +02:00
Gil Forcada b550683868 Trigger jenkins 2015-04-05 00:39:08 +02:00
esteele 4f03f173e7 Back to development: 2.4.2 2015-03-26 15:50:55 -04:00
esteele 9cc97f8f95 Preparing release 2.4.1 2015-03-26 15:49:17 -04:00
David\ Beitey 285dbcd918 i18n for ICaptcha interface field 2015-03-23 18:06:29 +10:00
esteele f7b4eb982d Back to development: 2.4.1 2015-03-12 10:22:07 -04:00
esteele 7ea789770b Preparing release 2.4.0 2015-03-12 10:21:21 -04:00
Gil Forcada 83046caf73 Merge pull request #63 from plone/davisagli-test-fixture
create doc1 once in the text fixture rather than in setup for each test
2015-03-10 09:46:28 +01:00
David Glick 8690461ffb create doc1 in the text fixture rather than in setup for each test 2015-03-09 21:51:45 -07: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
Gil Forcada 2faf69bdbb Merge pull request #62 from plone/acquisition-total-comments-4
Acquisition total comments
2015-02-25 21:47:42 +01:00
Gil Forcada 2a423095ab Add note on CHANGES.rst 2015-02-25 21:47:08 +01:00
Gil Forcada 4ea41aba43 Fix tests 2015-02-16 16:35:43 +01:00
Gil Forcada d5b5b1c2cd Fix total_comments indexer
"@property removes Acquisition wrappers from 'self'.
I don't remember why exactly (some implementation detail of Acquisition),
but it's a fact of life."

Quote from @davisagli on
https://github.com/plone/plone.app.discussion/pull/58

In short: removing the @property from total_comments fix the problem.
2015-02-16 11:31:47 +01:00
Gil Forcada 535af3aace Count acquisition wrapped comments
If the View permission is not set directly on the workflow,
but instead is left to be acquired,
total_comments will always return 0.
2015-02-16 11:28:49 +01:00
Gil Forcada b4c1d9e42d Sort imports
As per the styleguide
2015-02-16 10:22:09 +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