aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2505 from bantu/ticket/12582-ascraeusJoas Schilling2014-05-282-0/+26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | [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.
| * Merge branch 'ticket/12582' into ticket/12582-ascraeusAndreas Fischer2014-05-271-1/+2
| |\ | | | | | | | | | | | | * ticket/12582: [ticket/12582] Fix coding style.
| | * [ticket/12582] Fix coding style.Andreas Fischer2014-05-271-1/+2
| | | | | | | | | | | | PHPBB3-12582
| * | Merge branch 'ticket/12582' into ticket/12582-ascraeusAndreas Fischer2014-05-271-1/+0
| |\ \ | | |/ | | | | | | | | | * ticket/12582: [ticket/12582] Remove set -e due to exiftool not liking 0 byte files.
| | * [ticket/12582] Remove set -e due to exiftool not liking 0 byte files.Andreas Fischer2014-05-271-1/+0
| | | | | | | | | | | | PHPBB3-12582
| * | Merge branch 'ticket/12582' into ticket/12582-ascraeusAndreas Fischer2014-05-272-0/+26
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * [ticket/12582] Strip away copyrighted ICC profileDavid Prévot2014-05-271-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * [ticket/12582] Change strip_icc_profiles.sh to only take a single file.Andreas Fischer2014-05-271-19/+12
| | | | | | | | | | | | PHPBB3-12582
| | * [ticket/12582] Overwrite inplace instead of creating _original files.Andreas Fischer2014-05-271-1/+1
| | | | | | | | | | | | PHPBB3-12582
| | * [ticket/12582] Add script for strippping ICC profiles from images.Andreas Fischer2014-05-271-0/+33
| | | | | | | | | | | | PHPBB3-12582
* | | Merge pull request #2426 from Nicofuma/ticket/12174Joas Schilling2014-05-282-11/+47
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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
| * | | [ticket/12174] Coding styleTristan Darricau2014-05-101-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12174
| * | | [ticket/12174] Remove $update_topic_attachments_flagTristan Darricau2014-05-091-4/+1
| | | | | | | | | | | | | | | | PHPBB3-12174
| * | | [ticket/12174] Don't update the flag for a post without attachmentTristan Darricau2014-05-091-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12174
| * | | [ticket/12174] Update the conditionsTristan Darricau2014-05-091-10/+7
| | | | | | | | | | | | | | | | PHPBB3-12174
| * | | [ticket/12174] Remove inline assignmentTristan Darricau2014-05-091-1/+2
| | | | | | | | | | | | | | | | PHPBB3-12174
| * | | [ticket/12174] Update sql queryTristan Darricau2014-05-091-9/+10
| | | | | | | | | | | | | | | | PHPBB3-12174
| * | | [ticket/12174] Revert the changes on $topic_update_arrayTristan Darricau2014-05-081-4/+4
| | | | | | | | | | | | | | | | PHPBB3-12174
| * | | [ticket/12174] CorrectionsTristan Darricau2014-05-081-21/+10
| | | | | | | | | | | | | | | | PHPBB3-12174
| * | | [ticket/12174] Update topic_attachment flag when a post is soft-deletedTristan Darricau2014-05-082-11/+62
| | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12174 PHPBB3-12174
* | | | [ticket/12594] Replace phpBB Group with phpBB LimitedYuriy Rusko2014-05-2819-37/+50
| | | | | | | | | | | | | | | | PHPBB3-12594
* | | | Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594Yuriy Rusko2014-05-289-12/+75
|\ \ \ \
| * \ \ \ Merge pull request #2455 from Nicofuma/ticket/12509Joas Schilling2014-05-286-11/+57
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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
| | * | | | [ticket/12509] Add example in doc blockTristan Darricau2014-05-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12509
| | * | | | [ticket/12509] Add missing ',' in arraysTristan Darricau2014-05-265-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12509
| | * | | | [ticket/12509] Update calls to set_custom_style in forgotten placesTristan Darricau2014-05-143-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12509
| | * | | | [ticket/12509] Fix path in adm/index.phpTristan Darricau2014-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12509
| | * | | | [ticket/12509] Fix typo in adm/index.phpTristan Darricau2014-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12509
| | * | | | [ticket/12509] Fix doc blockTristan Darricau2014-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12509
| | * | | | [ticket/12509] Fix the call to set_custom_file in adm/index and messengerTristan Darricau2014-05-133-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12509
| | * | | | [ticket/12509] Update acp custom_style setterTristan Darricau2014-05-131-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12509
| | * | | | [ticket/12509] Add an option to set the path of custom file for extensionsTristan Darricau2014-05-132-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12509 PHPBB3-12509
| * | | | | Merge pull request #2453 from Nicofuma/ticket/12536Joas Schilling2014-05-281-1/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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
| | * | | | | [ticket/12536] Restore missing @throwsTristan Darricau2014-05-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12536
| | * | | | | [ticket/12536] Use stable values when unstable are unavailableTristan Darricau2014-05-151-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12536
| | * | | | | [ticket/12536] Update doc blockTristan Darricau2014-05-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12536
| | * | | | | [ticket/12536] Return empty array if stability unavailableTristan Darricau2014-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12536
| | * | | | | [ticket/12536] Get Versions Should Not Require Both Stable and UnstableTristan Darricau2014-05-121-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12536 PHPBB3-12536
| * | | | | | Merge pull request #2502 from tmbackoff/ticket/12596Dhruv Goel2014-05-282-0/+14
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | [ticket/12596] Add template event acp_group_options_before/after
| | * | | | | [ticket/12596] Add template event acp_group_options_before/afterTabitha Backoff2014-05-272-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add template events to the group settings page to allow extensions to add additional options for groups. PHPBB3-12596
* | | | | | | Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594Yuriy Rusko2014-05-2735-2433/+404
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/docs/hook_system.html
| * | | | | | Merge pull request #2469 from prototech/ticket/12155Andreas Fischer2014-05-2728-316/+293
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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. ...
| | * | | | | | [ticket/12155] Remove use of !important and move reddish color back to .buttonCesar G2014-05-271-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12155
| | * | | | | | [ticket/12155] Reposition the button icons to the left side while we're at it.Cesar G2014-05-271-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12155
| | * | | | | | [ticket/12155] Get rid of line-height value causing alignment issues in FF.Cesar G2014-05-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12155
| | * | | | | | [ticket/12155] Get rid of the <span> where possible and fix buttons in Safari.Cesar G2014-05-276-58/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12155
| | * | | | | | [ticket/12155] Fix misplaced semicolon and ensure that value comparison works.Cesar G2014-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12155
| | * | | | | | [ticket/12155] Combine the post and topic/PM button icons into a single spriteCesar G2014-05-275-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12155
| | * | | | | | [ticket/12155] Move icon class directly to <a> and use <span> consistently.Cesar G2014-05-2710-101/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12155
| | * | | | | | [ticket/12155] Remove star hack from padding-right property of .button.Cesar G2014-05-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was in place for IE7 due to the use of :after for inserting the button icon. IE7 does not support :after, so the hack removed the extra padding that made room for the icon. We no longer use :after for the icon, so this is no longer an issue... not to mention that IE7 is no longer supported. PHPBB3-12155