Commit graph

22865 commits

Author SHA1 Message Date
LEZY Thomas
532e4470ea [ticket/12597] Fix language key name
PHPBB3-12597
2014-05-28 22:09:38 +02:00
Joas Schilling
95ebe2dcbf Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12582] Use the correct script name.
  [ticket/12582] Fix coding style.
  [ticket/12582] Remove set -e due to exiftool not liking 0 byte files.
  [ticket/12582] Strip away copyrighted ICC profile
  [ticket/12582] Change strip_icc_profiles.sh to only take a single file.
  [ticket/12582] Run strip_icc_profiles.sh on Travis CI.
  [ticket/12582] Overwrite inplace instead of creating _original files.
  [ticket/12582] Add script for strippping ICC profiles from images.
2014-05-28 21:50:50 +02:00
Joas Schilling
47b240660b Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
2014-05-28 21:50:25 +02:00
Joas Schilling
3021a6e12a Merge pull request #2505 from bantu/ticket/12582-ascraeus
[ticket/12582] Strip away copyrighted ICC profile from images

* bantu/ticket/12582-ascraeus:
  [ticket/12582] Use the correct script name.
  [ticket/12582] Fix coding style.
  [ticket/12582] Remove set -e due to exiftool not liking 0 byte files.
  [ticket/12582] Strip away copyrighted ICC profile
  [ticket/12582] Change strip_icc_profiles.sh to only take a single file.
  [ticket/12582] Run strip_icc_profiles.sh on Travis CI.
  [ticket/12582] Overwrite inplace instead of creating _original files.
  [ticket/12582] Add script for strippping ICC profiles from images.
2014-05-28 21:50:19 +02:00
Joas Schilling
f09799322e Merge pull request #2498 from bantu/ticket/12582
[ticket/12582] Strip away copyrighted ICC profile from images

* bantu/ticket/12582:
  [ticket/12582] Fix coding style.
  [ticket/12582] Remove set -e due to exiftool not liking 0 byte files.
  [ticket/12582] Strip away copyrighted ICC profile
  [ticket/12582] Change strip_icc_profiles.sh to only take a single file.
  [ticket/12582] Run strip_icc_profiles.sh on Travis CI.
  [ticket/12582] Overwrite inplace instead of creating _original files.
  [ticket/12582] Add script for strippping ICC profiles from images.
2014-05-28 21:49:54 +02:00
Joas Schilling
b2742243c7 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12174] Add tests
  [ticket/12174] Coding style
  [ticket/12174] Remove $update_topic_attachments_flag
  [ticket/12174] Don't update the flag for a post without attachment
  [ticket/12174] Update the conditions
  [ticket/12174] Remove inline assignment
  [ticket/12174] Update sql query
  [ticket/12174] Revert the changes on $topic_update_array
  [ticket/12174] Corrections
  [ticket/12174] Update topic_attachment flag when a post is soft-deleted
2014-05-28 21:45:50 +02:00
Joas Schilling
e2308df14d Merge pull request #2426 from Nicofuma/ticket/12174
[ticket/12174] Update topic_attachment flag when a post is soft-deleted

* Nicofuma/ticket/12174:
  [ticket/12174] Add tests
  [ticket/12174] Coding style
  [ticket/12174] Remove $update_topic_attachments_flag
  [ticket/12174] Don't update the flag for a post without attachment
  [ticket/12174] Update the conditions
  [ticket/12174] Remove inline assignment
  [ticket/12174] Update sql query
  [ticket/12174] Revert the changes on $topic_update_array
  [ticket/12174] Corrections
  [ticket/12174] Update topic_attachment flag when a post is soft-deleted
2014-05-28 21:45:39 +02:00
LEZY Thomas
54d60e3f78 [ticket/12597] Fix coding style and typing mistakes
PHPBB3-12597
2014-05-28 21:26:33 +02:00
LEZY Thomas
9f942776ad [ticket/12597] Changes name of command cron:run-all to cron:run.
Also adds an optional argument to specify one precise cron task to
lauch, and modifies test file accordingly.

PHPBB3-12597
2014-05-28 20:03:28 +02:00
LEZY Thomas
61ad42790f [ticket/12597] Fix various problems
Actually fix the return status of command cron:run-all
Fix some doc block coding style issue
Fix missing and obsolete file headers
Delete a useless constructor method

PHPBB3-12597
2014-05-28 19:22:25 +02:00
LEZY Thomas
18875894ec [ticket/12597] Fix constructor bug and servral doc blocs
PHPBB3-12597
2014-05-28 18:19:46 +02:00
Andreas Fischer
3ab06314f1 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12594] Replace phpBB Group with phpBB Limited
  [ticket/12594] Update footer credit lines
  [ticket/12594] Remove @package tags and update file headers
2014-05-28 18:19:20 +02:00
Andreas Fischer
c8e7b2c5d4 Merge pull request #2507 from Marshalrusty/ticket/12594
File headers, credit lines, etc. should reflect updated legal info

* Marshalrusty/ticket/12594:
  [ticket/12594] Replace phpBB Group with phpBB Limited
  [ticket/12594] Update footer credit lines
  [ticket/12594] Remove @package tags and update file headers
2014-05-28 18:19:20 +02:00
LEZY Thomas
0d839cbefc [ticket/12597] Modification of return statuses and of test files
PHPBB3-12597
2014-05-28 18:02:30 +02:00
LEZY Thomas
5fca308138 [ticket/12597] Fix misplaced release of db lock
PHPBB3-12597
2014-05-28 16:47:57 +02:00
LEZY Thomas
9a78772745 [ticket/12597] Change EXECUTE to RUN in language
Fix previous commit : change execute to run in language keys

PHPBB3-12597
2014-05-28 14:57:16 +02:00
Tristan Darricau
ad4a373557 [ticket/12174] Add tests
PHPBB3-12174
2014-05-28 14:55:55 +02:00
LEZY Thomas
6f279c1bf4 [ticket/12597] Update pull-request
Removes a useless comment.
Switchs command name from cron:execute-all to cron:run-all.
Replaces assertEquals by assertSame

PHPBB3-12597
2014-05-28 14:49:55 +02:00
brunoais
8173f96d60 [ticket/12604] Fix wrong padding when no notifications
Added a class to the <li> when the <li> represents that there's no
notifications (no_notifications) and
Added a CSS rule that matches the change to the HTML source for when
there's no notifications.

PHPBB3-12604
2014-05-28 11:59:44 +01:00
LEZY Thomas
9761c1bf61 [ticket/12597] Fix various refactoring mistakes
PHPBB3-12597
2014-05-28 12:57:49 +02:00
LEZY Thomas
6f0121e2a4 [ticket/12597] Correcting bug in cron.php
PHPBB3-12597
2014-05-28 12:36:55 +02:00
LEZY Thomas
8a1e189970 [ticket/12597] Add doc blocs in execute_all.php
PHPBB3-12597
2014-05-28 12:20:02 +02:00
LEZY Thomas
50cb9d5838 [ticket/12597] Correcing coding style mistakes
PHPBB3-12597
2014-05-28 11:57:20 +02:00
Tristan Darricau
d3f4dbedde [ticket/10899] Remove trailing ;
PHPBB3-10899
2014-05-28 11:50:13 +02:00
LEZY Thomas
6f3276653f [ticket/12597] Improvement of test files
PHPBB3-12597
2014-05-28 11:12:50 +02:00
Tristan Darricau
6a3b343dfc [ticket/11226] Add tests
PHPBB3-11226
2014-05-28 10:53:19 +02:00
Tristan Darricau
dfec62c68d [ticket/10899] Fix typo in the class name
PHPBB3-10899
2014-05-28 01:14:36 +02:00
Yuriy Rusko
55e1f02151 [ticket/12594] Replace phpBB Group with phpBB Limited
PHPBB3-12594
2014-05-28 01:07:56 +02:00
Yuriy Rusko
2a42aee8ac Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594 2014-05-28 01:02:39 +02:00
Tristan Darricau
05e76e55e1 [ticket/10899] Add unit tests
PHPBB3-10899
2014-05-28 00:54:22 +02:00
Joas Schilling
cf12e17944 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12509] Add example in doc block
  [ticket/12509] Add missing ',' in arrays
  [ticket/12509] Update calls to set_custom_style in forgotten places
  [ticket/12509] Fix path in adm/index.php
  [ticket/12509] Fix typo in adm/index.php
  [ticket/12509] Fix doc block
  [ticket/12509] Fix the call to set_custom_file in adm/index and messenger
  [ticket/12509] Update acp custom_style setter
  [ticket/12509] Add an option to set the path of custom file for extensions
2014-05-28 00:23:52 +02:00
Joas Schilling
08c01b7cee Merge pull request #2455 from Nicofuma/ticket/12509
[ticket/12509] Add an option to set the path of custom style directory (ie: email templates) for extensions

* Nicofuma/ticket/12509:
  [ticket/12509] Add example in doc block
  [ticket/12509] Add missing ',' in arrays
  [ticket/12509] Update calls to set_custom_style in forgotten places
  [ticket/12509] Fix path in adm/index.php
  [ticket/12509] Fix typo in adm/index.php
  [ticket/12509] Fix doc block
  [ticket/12509] Fix the call to set_custom_file in adm/index and messenger
  [ticket/12509] Update acp custom_style setter
  [ticket/12509] Add an option to set the path of custom file for extensions
2014-05-28 00:23:37 +02:00
Joas Schilling
317ce7b0c7 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12536] Restore missing @throws
  [ticket/12536] Add test cases with empty versions list
  [ticket/12536] Use stable values when unstable are unavailable
  [ticket/12536] Update doc block
  [ticket/12536] Return empty array if stability unavailable
  [ticket/12536] Get Versions Should Not Require Both Stable and Unstable
2014-05-28 00:07:45 +02:00
Joas Schilling
83fc8725da Merge pull request #2453 from Nicofuma/ticket/12536
[ticket/12536] Get Versions Should Not Require Both Stable and Unstable

* Nicofuma/ticket/12536:
  [ticket/12536] Restore missing @throws
  [ticket/12536] Add test cases with empty versions list
  [ticket/12536] Use stable values when unstable are unavailable
  [ticket/12536] Update doc block
  [ticket/12536] Return empty array if stability unavailable
  [ticket/12536] Get Versions Should Not Require Both Stable and Unstable
2014-05-28 00:07:33 +02:00
Andreas Fischer
97dc817158 [ticket/12582] Use the correct script name.
PHPBB3-12582
2014-05-27 23:50:52 +02:00
Dhruv
9d41bca27d Merge branch 'develop-ascraeus' into develop
# By Tabitha Backoff
# Via Dhruv Goel (1) and Tabitha Backoff (1)
* develop-ascraeus:
  [ticket/12596] Add template event acp_group_options_before/after
2014-05-28 01:30:18 +05:30
Dhruv Goel
e9f28c7be0 Merge pull request #2502 from tmbackoff/ticket/12596
[ticket/12596] Add template event acp_group_options_before/after
2014-05-28 01:29:27 +05:30
Yuriy Rusko
1d61bcedfd Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594
Conflicts:
	phpBB/docs/hook_system.html
2014-05-27 21:55:40 +02:00
Yuriy Rusko
27f787e5e4 [ticket/12594] Update footer credit lines
PHPBB3-12594
2014-05-27 21:39:30 +02:00
Andreas Fischer
f4d37749b6 Merge branch 'ticket/12582' into ticket/12582-ascraeus
* ticket/12582:
  [ticket/12582] Fix coding style.
2014-05-27 20:56:47 +02:00
Andreas Fischer
de71837b71 [ticket/12582] Fix coding style.
PHPBB3-12582
2014-05-27 20:56:29 +02:00
Andreas Fischer
709e363349 Merge branch 'ticket/12582' into ticket/12582-ascraeus
* ticket/12582:
  [ticket/12582] Remove set -e due to exiftool not liking 0 byte files.
2014-05-27 20:53:22 +02:00
Andreas Fischer
d7c143da24 [ticket/12582] Remove set -e due to exiftool not liking 0 byte files.
PHPBB3-12582
2014-05-27 20:51:48 +02:00
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers
PHPBB3-12594
2014-05-27 20:51:13 +02:00
Andreas Fischer
a1e31f4389 Merge branch 'ticket/12582' into ticket/12582-ascraeus
* ticket/12582:
  [ticket/12582] Strip away copyrighted ICC profile
  [ticket/12582] Change strip_icc_profiles.sh to only take a single file.
  [ticket/12582] Run strip_icc_profiles.sh on Travis CI.
  [ticket/12582] Overwrite inplace instead of creating _original files.
  [ticket/12582] Add script for strippping ICC profiles from images.

Conflicts:
	.travis.yml
2014-05-27 20:38:20 +02:00
Tristan Darricau
ac1eb2d789 [ticket/10899] Get $phpbb_log from the container
PHPBB3-10899
2014-05-27 19:57:25 +02:00
Andreas Fischer
2aef05106c Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (21 commits)
  [ticket/12155] Remove use of !important and move reddish color back to .button
  [ticket/12155] Reposition the button icons to the left side while we're at it.
  [ticket/12155] Get rid of line-height value causing alignment issues in FF.
  [ticket/12155] Get rid of the <span> where possible and fix buttons in Safari.
  [ticket/12155] Fix misplaced semicolon and ensure that value comparison works.
  [ticket/12155] Combine the post and topic/PM button icons into a single sprite
  [ticket/12155] Move icon class directly to <a> and use <span> consistently.
  [ticket/12155] Remove star hack from padding-right property of .button.
  [ticket/12155] Fix tabbing and put one selector per line if string is too long
  [ticket/12155] Make opacity transition faster and fix background image paths.
  [ticket/12155] Keep the selection method consistent with the one below it.
  [ticket/12155] Fade out the buttons when leaving the post.
  [ticket/12155] Display the buttons only when hovering the post.
  [ticket/12155] Make the buttons bigger on touch devices.
  [ticket/12155] Clean up icons.
  [ticket/12155] Remove unused font.
  [ticket/12155] Remove obsolete images.
  [ticket/12155] Use the new .button class as the basis for the post buttons.
  [ticket/12155] Move existing button style to a more generic class.
  [ticket/12155] Remove obsolete language images.
  ...
2014-05-27 18:41:31 +02:00
Andreas Fischer
0acaa77229 Merge pull request #2469 from prototech/ticket/12155
[ticket/12155] Construct post buttons using CSS.

* prototech/ticket/12155: (21 commits)
  [ticket/12155] Remove use of !important and move reddish color back to .button
  [ticket/12155] Reposition the button icons to the left side while we're at it.
  [ticket/12155] Get rid of line-height value causing alignment issues in FF.
  [ticket/12155] Get rid of the <span> where possible and fix buttons in Safari.
  [ticket/12155] Fix misplaced semicolon and ensure that value comparison works.
  [ticket/12155] Combine the post and topic/PM button icons into a single sprite
  [ticket/12155] Move icon class directly to <a> and use <span> consistently.
  [ticket/12155] Remove star hack from padding-right property of .button.
  [ticket/12155] Fix tabbing and put one selector per line if string is too long
  [ticket/12155] Make opacity transition faster and fix background image paths.
  [ticket/12155] Keep the selection method consistent with the one below it.
  [ticket/12155] Fade out the buttons when leaving the post.
  [ticket/12155] Display the buttons only when hovering the post.
  [ticket/12155] Make the buttons bigger on touch devices.
  [ticket/12155] Clean up icons.
  [ticket/12155] Remove unused font.
  [ticket/12155] Remove obsolete images.
  [ticket/12155] Use the new .button class as the basis for the post buttons.
  [ticket/12155] Move existing button style to a more generic class.
  [ticket/12155] Remove obsolete language images.
  ...
2014-05-27 18:41:31 +02:00
LEZY Thomas
abb8a2892d [ticket/12597] Command for executing all available cron tasks
Command cron:execute-all executes all available cron tasks.
Test files in tests/console/cron folder

PHPBB3-12597
2014-05-27 18:37:37 +02:00
David Prévot
b485318ba9 [ticket/12582] Strip away copyrighted ICC profile
This images embed a non free ICC profile that doesn’t allow
modification:

http://web.archive.org/web/20020603153925/srgb.com/usingsrgb.html

Please use the proposed version stripping away this copyrighted binary
profile, probably embedded by an image software at one time:

	exiftool -icc_profile"-<=" phpBB/adm/images/phpbb_logo.png

I’ve checked the resulting image and trust it is identical to the
original.

Some more background on the issue:
https://lists.debian.org/debian-devel/2014/05/msg00339.html

PHPBB3-12582
2014-05-27 18:35:44 +02:00