Commit Graph

1779 Commits

Author SHA1 Message Date
Philip Bauer
b7f81fc3fe Move anonymous_email_enabled after anonymous_comments in controlpanel 2015-09-13 15:38:46 +02:00
esteele
50d9d685ed Back to development: 2.4.6
[ci skip]
2015-09-11 15:43:38 -04:00
esteele
eb69461f35 Preparing release 2.4.5
[ci skip]
2015-09-11 15:36:47 -04:00
Mikel Larreategi
90ec3d73ac add changelog entry 2015-09-09 15:48:48 +02:00
Mikel Larreategi
b4bb681837 update basque translation 2015-09-09 12:52:14 +02:00
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
Ramon Navarro Bosch
eff573897d Merge pull request #71 from plone/toolbar-fixup
Toolbar fixup
2015-07-16 18:30:11 +02:00
Victor Fernandez de Alba
35862dd6dc Updated links for the renamed 'Types' control panel 2015-07-16 12:17:59 +02:00
Victor Fernandez de Alba
89a18c889d Change the category of the configlet to 'plone-general' 2015-07-15 18:05:24 +02:00
Jens W. Klein
23ff055698 Merge pull request #68 from plone-ve/master
Updated Spanish translation
2015-06-08 19:56:14 +02:00
Leonardo J. Caballero G
fab8e1c3de Updated Changelog file 2015-06-07 17:42:56 -04:30
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
Leonardo J. Caballero G
71bb802118 Merge branch 'master' of https://github.com/plone-ve/plone.app.discussion 2015-05-31 13:43:53 -04:30
Leonardo J. Caballero G
d227307832 Updated Spanish translation with check spell 2015-05-31 13:41:42 -04:30
Leonardo J. Caballero G
4a74083680 Updated .gitignore file 2015-05-31 13:40:31 -04:30
vangheem
4bd649e021 fix test 2015-05-30 19:28:22 -05:00
vangheem
e2192e5973 use modal pattern for comment edit 2015-05-30 15:20:32 -05:00
vangheem
68665b6f2b Only use edit overlay if available for editing comments. We will need a plone 5 alternative 2015-05-30 11:45:02 -05:00
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