ajung/plone.app.discussion
ajung
/
plone.app.discussion
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,135 Commits 1 Branch 0 Tags 5 MiB
Commit Graph

2135 Commits

Author SHA1 Message Date
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
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
vangheem bd0637e0b2 fix window load event to use 2015-02-11 16:30:03 -06:00
Timo Stollenwerk 4949b26584 Add newline at the end of the file. 2015-02-11 17:21:34 +01:00
vangheem c49c9707ec more js improvements 2015-02-10 16:41:00 -06:00
vangheem ad3953f794 use requirejs if available 2015-02-10 16:21:17 -06: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
Roberto Diaz 609e9f61aa Updated SPANISH .po file 2014-12-11 16:26:45 +01:00
Roberto Diaz 2a130ffeb1 Updated CATALAN .po file 2014-12-11 16:26:28 +01:00
Timo Stollenwerk 984f34e3a9 Merge pull request #57 from jtmolon/master 
Updated pt-br translation
 2014-12-05 21:12:45 +01:00
João Toss Molon 744b5b6380 Updated pt-br translation 2014-12-05 17:38:04 -02:00
Gil Forcada 19026439dd Use spaces please 2014-12-03 12:03:26 +01:00
esteele ba28439d94 Back to development: 2.3.4 2014-10-23 21:37:49 -04:00