aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | [ticket/12838] Allow for extra columns in cache obtain_ranks()PayBas2014-07-101-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12838
| * | | | | | | | | | | [ticket/12838] Add raw row-data to acp_ranks core eventPayBas2014-07-101-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12838
| * | | | | | | | | | | [ticket/12838] Simplify special rank template conditionalPayBas2014-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12838
| * | | | | | | | | | | [ticket/12838] Add core events to acp_ranks.phpPayBas2014-07-101-5/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12838
| * | | | | | | | | | | [ticket/12838] Update events.mdPayBas2014-07-101-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12838
| * | | | | | | | | | | [ticket/12838] Add _before versionsPayBas2014-07-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12838
| * | | | | | | | | | | [ticket/12838] Add template events to acp_ranks.htmlPayBas2014-07-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12838
* | | | | | | | | | | | Merge pull request #2813 from naderman/ticket/12920Joas Schilling2014-08-073-22/+63
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12920] Add composer.json to phpBB/phpbb and fix the one in phpBB/ * naderman/ticket/12920: [ticket/12920] Add missing comma [ticket/12920] Update composer.lock file after update nothing [ticket/12920] Fix sh syntax error in post-update-cmd script [ticket/12920] Remove incorrect @ from self.version reference in composer.json [ticket/12920] Output warning message about vendor cleaning target [ticket/12920] Turn phpBB composer.json into publishable full version [ticket/12920] Add require for minimum php version [ticket/12920] Add composer.json for phpbb/phpbb-core library
| * | | | | | | | | | | [ticket/12920] Add missing commaNils Adermann2014-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12920
| * | | | | | | | | | | [ticket/12920] Update composer.lock file after update nothingNils Adermann2014-08-071-19/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12920
| * | | | | | | | | | | [ticket/12920] Fix sh syntax error in post-update-cmd scriptNils Adermann2014-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12920
| * | | | | | | | | | | [ticket/12920] Remove incorrect @ from self.version reference in composer.jsonNils Adermann2014-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12920
| * | | | | | | | | | | [ticket/12920] Output warning message about vendor cleaning targetNils Adermann2014-08-071-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12920
| * | | | | | | | | | | [ticket/12920] Turn phpBB composer.json into publishable full versionNils Adermann2014-08-071-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12920
| * | | | | | | | | | | [ticket/12920] Add require for minimum php versionNils Adermann2014-08-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12920
| * | | | | | | | | | | [ticket/12920] Add composer.json for phpbb/phpbb-core libraryNils Adermann2014-08-071-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12920
* | | | | | | | | | | | Merge pull request #2811 from bantu/ticket/12918Joas Schilling2014-08-071-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12918] Load class fileupload in fileupload_remote_test.php. * bantu/ticket/12918: [ticket/12918] Load class fileupload in fileupload_remote_test.php.
| * | | | | | | | | | | | [ticket/12918] Load class fileupload in fileupload_remote_test.php.Andreas Fischer2014-08-071-0/+2
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12918
* | | | | | | | | | | | Merge pull request #2763 from brunoais/ticket/12877Marc Alexander2014-08-071-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | [ticket/12877] core.mcp_mcp_front_reports_listing_query_before
| * | | | | | | | | | | [ticket/12877] core.mcp_mcp_front_reports_listing_query_beforebrunoais2014-07-231-0/+12
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding core.mcp_mcp_front_reports_listing_query_before PHPBB3-12877
* | | | | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-08-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus:
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #2808 from nickvergessen/ticket/12917Andreas Fischer2014-08-071-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12917] Check commit message and image ICC profile on 5.3.3 * nickvergessen/ticket/12917: [ticket/12917] Check commit message and image ICC profile on 5.3.3
* | \ \ \ \ \ \ \ \ \ \ \ Merge pull request #2809 from nickvergessen/ticket/12917-ascAndreas Fischer2014-08-073-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ticket/12917 asc * nickvergessen/ticket/12917-asc: [ticket/12917] Check commit message and image ICC profile on 5.3.3
| * | | | | | | | | | | | Merge branch 'ticket/12917' into ticket/12917-ascJoas Schilling2014-08-073-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / / / | | | _ / / / / / / / / / | | | / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/12917: [ticket/12917] Check commit message and image ICC profile on 5.3.3 Conflicts: .travis.yml
| * | | | | | | | | | | [ticket/12917] Check commit message and image ICC profile on 5.3.3Joas Schilling2014-08-071-3/+3
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12917
* | | | | | | | | | | Merge pull request #2729 from Nicofuma/ticket/12847Joas Schilling2014-08-079-2/+96
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12847] Allow the extensions to say if they can be enabled * Nicofuma/ticket/12847: [ticket/12847] Allow the extensions to say if they can be enabled
| * | | | | | | | | | | [ticket/12847] Allow the extensions to say if they can be enabledTristan Darricau2014-07-139-2/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12847
* | | | | | | | | | | | Merge pull request #2477 from n-aleha/ticket/12557ascraeusJoas Schilling2014-08-0754-74/+148
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12557] Fix doc block errors found by Sami for ascraeus * n-aleha/ticket/12557ascraeus: [ticket/12557] Fix load active module description [ticket/12557] Fix php file description [ticket/12557] Fix post data description for notifications [ticket/12557] Fix pass by reference doc blocks [ticket/12557] Fix doc block in extension base class [ticket/12557] Fix doc block in mimetype guesser [ticket/12557] Fix var $preserve_cr description [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Template fixes [ticket/12557] Search, cron and profilefields fixes [ticket/12557] Notification fixes [ticket/12557] Fix doc block errors found by Sami pt1 [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami
| * | | | | | | | | | | | [ticket/12557] Fix load active module descriptionn-aleha2014-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | | | | | | | | [ticket/12557] Fix php file descriptionn-aleha2014-08-0720-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | | | | | | | | [ticket/12557] Fix post data description for notificationsn-aleha2014-08-078-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | | | | | | | | [ticket/12557] Fix pass by reference doc blocksn-aleha2014-08-072-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | | | | | | | | [ticket/12557] Fix doc block in extension base classn-aleha2014-08-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | | | | | | | | [ticket/12557] Fix doc block in mimetype guessern-aleha2014-08-031-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | | | | | | | | [ticket/12557] Fix var $preserve_cr descriptionn-aleha2014-08-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | | | | | | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-033-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | | | | | | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-035-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More corrections. PHPBB3-12557
| * | | | | | | | | | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More corrections. PHPBB3-12557
| * | | | | | | | | | | | [ticket/12557] Template fixesn-aleha2014-08-034-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | | | | | | | | [ticket/12557] Search, cron and profilefields fixesn-aleha2014-08-037-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | | | | | | | | [ticket/12557] Notification fixesn-aleha2014-08-0314-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | | | | | | | | [ticket/12557] Fix doc block errors found by Sami pt1n-aleha2014-08-038-19/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
| * | | | | | | | | | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-033-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More corrections. PHPBB3-12557
| * | | | | | | | | | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-036-17/+41
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12557
* | | | | | | | | | | | Merge pull request #2644 from Nicofuma/ticket/12051Joas Schilling2014-08-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12051] Optimise Composer Autoloader on Build * Nicofuma/ticket/12051: [ticket/12051] Optimise Composer Autoloader on Build
| * | | | | | | | | | | | [ticket/12051] Optimise Composer Autoloader on BuildTristan Darricau2014-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12051
* | | | | | | | | | | | | Merge remote-tracking branch 'github-marc1706/ticket/11148' into ↵Nils Adermann2014-08-079-44/+134
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/11148: [ticket/11148] Remove unneeded variable mimetype and use type octet-stream [ticket/11148] Change expected output with disallowed content in test [ticket/11148] Always use the output of the mimetype guesser in get_mimetype [ticket/11148] Get rid of extra line in mimetype guesser setter doc block [ticket/11148] Add missing parts to docblock of get_mimetype() method [ticket/11148] Default to application/octet-stream if no mimetype given [ticket/11148] Use mimetype guesser for uploaded avatars [ticket/11148] Pass mimetype guesser to upload_attachment() function [ticket/11148] Add mimetype guesser to filespec and fileupload class
| * | | | | | | | | | | | | [ticket/11148] Remove unneeded variable mimetype and use type octet-streamMarc Alexander2014-06-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variable $mimetype is not used in the method local_upload() afterwards so it shouldn't be assigned. The correct default mimetype should be application/octet-stream and not application/octetstream according to RFC 2046. PHPBB3-11148
| * | | | | | | | | | | | | [ticket/11148] Change expected output with disallowed content in testMarc Alexander2014-06-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11148
| * | | | | | | | | | | | | [ticket/11148] Always use the output of the mimetype guesser in get_mimetypeMarc Alexander2014-06-231-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11148