aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2729 from Nicofuma/ticket/12847Joas Schilling2014-08-071-0/+12
|\ | | | | | | | | | | | | [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-131-0/+12
| | | | | | | | PHPBB3-12847
* | Merge pull request #2477 from n-aleha/ticket/12557ascraeusJoas Schilling2014-08-077-14/+23
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-072-5/+5
| | | | | | | | | | | | PHPBB3-12557
| * | [ticket/12557] Fix pass by reference doc blocksn-aleha2014-08-071-5/+5
| | | | | | | | | | | | 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-031-2/+2
| | | | | | | | | | | | PHPBB3-12557
| * | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-031-1/+0
| | | | | | | | | | | | | | | | | | More corrections. PHPBB3-12557
| * | [ticket/12557] Fix doc block errors found by Sami pt1n-aleha2014-08-031-0/+2
| | | | | | | | | | | | PHPBB3-12557
| * | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-032-3/+3
| | | | | | | | | | | | | | | | | | More corrections. PHPBB3-12557
| * | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-033-6/+13
| | | | | | | | | | | | PHPBB3-12557
* | | Merge remote-tracking branch 'github-marc1706/ticket/11148' into ↵Nils Adermann2014-08-073-38/+47
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Always use the output of the mimetype guesser in get_mimetypeMarc Alexander2014-06-231-6/+1
| | | | | | | | | | | | | | | | PHPBB3-11148
| * | | [ticket/11148] Get rid of extra line in mimetype guesser setter doc blockMarc Alexander2014-06-231-2/+1
| | | | | | | | | | | | | | | | PHPBB3-11148
| * | | [ticket/11148] Add missing parts to docblock of get_mimetype() methodMarc Alexander2014-06-231-0/+2
| | | | | | | | | | | | | | | | PHPBB3-11148
| * | | [ticket/11148] Default to application/octet-stream if no mimetype givenMarc Alexander2014-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This should prevent us from having an empty mimetype while uploading a file using local_upload(). PHPBB3-11148
| * | | [ticket/11148] Pass mimetype guesser to upload_attachment() functionMarc Alexander2014-06-232-3/+23
| | | | | | | | | | | | | | | | PHPBB3-11148
| * | | [ticket/11148] Add mimetype guesser to filespec and fileupload classMarc Alexander2014-06-231-32/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mimetype guesser will be used to get the mimetype of uploaded files. Until now, this was only used for files uploaded with plupload. If a file doesn't have a mimetype supplied, we will now try to get the correct mimetype. PHPBB3-11148
* | | | Merge pull request #2717 from Nicofuma/ticket/12836Joas Schilling2014-08-071-6/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12836] Add event core.functions.redirect * Nicofuma/ticket/12836: [ticket/12836] Add event core.functions.redirect
| * | | | [ticket/12836] Add event core.functions.redirectTristan Darricau2014-08-041-6/+17
| | | | | | | | | | | | | | | | | | | | PHPBB3-12836
* | | | | Merge pull request #2799 from nickvergessen/ticket/12901Marc Alexander2014-08-061-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Ticket/12901 Wrong type hint in show_available_child_styles() doc block
| * | | | | [ticket/12901] Fix another wrong type hint for $levelJoas Schilling2014-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12901
| * | | | | [ticket/12901] Fix type hinting of style $leveljeroendedauw2014-08-031-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-12901
* | | | | Merge pull request #2807 from nickvergessen/ticket/12875Marc Alexander2014-08-061-4/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12875] Find language files in the default and english language
| * | | | | [ticket/12875] Find language files in the default and english language ...Joas Schilling2014-08-061-4/+30
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | ... when looking for info_xcp_ files. PHPBB3-12875
* | | | | [ticket/12913] Add more parameters to core.submit_post_end eventrxu2014-08-061-4/+23
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As @event core.modify_submit_post_data can modify any of the function submit_post parameters, they may be needed to perform actions directly after a post or topic has been submitted in @event core.submit_post_end (includes/functions_posting.php). PHPBB3-12913
* | | | Merge pull request #2782 from marc1706/ticket/12895Joas Schilling2014-08-021-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12895] Rename user style setting to resolve conflict with style param * marc1706/ticket/12895: [ticket/12895] Rename user style setting to resolve conflict with style param
| * | | | [ticket/12895] Rename user style setting to resolve conflict with style paramMarc Alexander2014-07-291-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The style URL parameter, i.e. style=1, will conflict with the user's style setting due to it also being named style. This patch with solve this conflict. PHPBB3-12895
* | | | | Merge branch 'ticket/JeroenDeDauw/12902' into develop-ascraeusJoas Schilling2014-08-021-1/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/JeroenDeDauw/12902: [ticket/12902] Remove duplicate entry in switch statement
| * | | | | [ticket/12902] Remove duplicate entry in switch statementjeroendedauw2014-08-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12902
* | | | | | Merge remote-tracking branch 'brunoais/ticket/12801' into develop-ascraeusMarc Alexander2014-08-011-2/+16
|\ \ \ \ \ \
| * | | | | | [ticket/12801] Changed name change @since as requestedbrunoais2014-08-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed name to core.load_drafts_draft_list_result as requested Changed @since to 3.1.0-RC3 because RC2 is already out. PHPBB3-12801
| * | | | | | [ticket/12801] missing $phpbb_dispatcher as a globalbrunoais2014-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12801
| * | | | | | [ticket/12801] Add core.functions_posting.load_drafts_draft_list_resultsbrunoais2014-07-061-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding event core.functions_posting.load_drafts_draft_list_results PHPBB3-12801
| * | | | | | [ticket/12801] Add topic_poster to load_drafts' topics querybrunoais2014-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12801
* | | | | | | Merge remote-tracking branch 'brunoais/ticket/12800' into develop-ascraeusMarc Alexander2014-08-011-1/+14
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | [ticket/12880] Changed name change @since as requestedbrunoais2014-08-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed name to core.display_user_activity_modify_actives as requested Changed @since to 3.1.0-RC3 because RC2 is already out. PHPBB3-12880
| * | | | | | [ticket/12800] removed superfulous tab characterbrunoais2014-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12800
| * | | | | | [ticket/12800] Missing $phpbb_dispatcher as a globalbrunoais2014-07-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12800
| * | | | | | [ticket/12800] core.functions_display.display_user_activity.actives_afterbrunoais2014-07-031-0/+12
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding core.functions_display.display_user_activity.actives_after PHPBB3-12800
* | | | | | Merge branch 'ticket/11480' into ticket/11480-ascraeusTristan Darricau2014-07-301-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11480: [ticket/11480] Move the test into get_folder() [ticket/11480] Fix the double spaces in phpbb_functional_test_case [ticket/11480] Fix typos [ticket/11480] Add functionnal test [ticket/11480] PM : "Unknown folder" returned when inbox folder is full Conflicts: tests/test_framework/phpbb_functional_test_case.php
| * | | | | | [ticket/11480] Move the test into get_folder()Tristan Darricau2014-07-302-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11480
| * | | | | | [ticket/11480] PM : "Unknown folder" returned when inbox folder is fullNicofuma2014-04-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-11480 PHPBB3-11480
* | | | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-07-301-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12492] Add support of special chars
| * | | | | | Merge pull request #2425 from Zoddo/ticket/12492Joas Schilling2014-07-301-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12492] Add support of special chars * Zoddo/ticket/12492: [ticket/12492] Add support of special chars
| | * | | | | | [ticket/12492] Add support of special charsSkouat2014-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support of special chars during db test in the installation PHPBB3-12492
* | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/12891' into develop-ascraeusMarc Alexander2014-07-281-43/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/12891] Replace template loops with 1 loop to reduce generation timeJoas Schilling2014-07-251-43/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12891
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 12:13:06 +0000