aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-05-280-0/+0
|\ | | | | | | * develop-olympus:
| * Merge pull request #2282 from bantu/ticket/12384Joas Schilling2014-05-281-4/+0
| |\ | | | | | | | | | | | | | | | | | | [ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL. * bantu/ticket/12384: [ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL.
* | \ Merge pull request #2292 from bantu/ticket/12384-ascraeusJoas Schilling2014-05-281-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL. * bantu/ticket/12384-ascraeus: [ticket/12384] Use mysqli on hhvm in ascraeus. Keep explicit matrix though. [ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL.
| * | | [ticket/12384] Use mysqli on hhvm in ascraeus. Keep explicit matrix though.Andreas Fischer2014-05-271-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12384
| * | | Merge branch 'ticket/12384' into ticket/12384-ascraeusAndreas Fischer2014-05-270-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | * ticket/12384: [ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL.
| | * | [ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL.Andreas Fischer2014-04-121-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | HHVM MySQLi has been fixed and works for us now. PHPBB3-12384
* | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-05-280-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | * develop-olympus:
| * | | Merge pull request #2498 from bantu/ticket/12582Joas Schilling2014-05-283-0/+28
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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.
* | \ \ \ Merge pull request #2505 from bantu/ticket/12582-ascraeusJoas Schilling2014-05-286-0/+56
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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.
| * | | | | [ticket/12582] Use the correct script name.Andreas Fischer2014-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12582
| * | | | | 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-276-0/+56
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-272-21/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12582
| | * | | | [ticket/12582] Run strip_icc_profiles.sh on Travis CI.Andreas Fischer2014-05-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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-284-11/+172
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] Add testsTristan Darricau2014-05-282-0/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12174
| * | | | | | [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
* | | | | | | Merge pull request #2507 from Marshalrusty/ticket/12594Andreas Fischer2014-05-28947-3773/+6758
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | [ticket/12594] Replace phpBB Group with phpBB LimitedYuriy Rusko2014-05-2823-53/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12594
| * | | | | | | Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594Yuriy Rusko2014-05-2810-12/+85
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | 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-282-1/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] Add test cases with empty versions listTristan Darricau2014-05-151-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 01:26:17 +0000