aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developNils Adermann2014-08-079-44/+134
|\ | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [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
| * 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
| | * [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] Use mimetype guesser for uploaded avatarsMarc Alexander2014-06-233-3/+45
| | | | | | | | | | | | PHPBB3-11148
| | * [ticket/11148] Pass mimetype guesser to upload_attachment() functionMarc Alexander2014-06-233-3/+25
| | | | | | | | | | | | PHPBB3-11148
| | * [ticket/11148] Add mimetype guesser to filespec and fileupload classMarc Alexander2014-06-232-33/+64
| | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'develop-ascraeus' into developJoas Schilling2014-08-071-6/+17
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [ticket/12836] Add event core.functions.redirect
| * | 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 branch 'develop-ascraeus' into developMarc Alexander2014-08-061-2/+2
|\ \ \ \ | |/ / /
| * | | 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 branch 'develop-ascraeus' into developMarc Alexander2014-08-061-4/+30
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-061-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12912] Undefined index when adding logs from extensions
| * | | | | Merge pull request #2798 from tmbackoff/ticket/12912Joas Schilling2014-08-061-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12912] Undefined index when adding logs from extensions * tmbackoff/ticket/12912: [ticket/12912] Undefined index when adding logs from extensions
| | * | | | | [ticket/12912] Undefined index when adding logs from extensionsTabitha Backoff2014-08-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add isset() to forum_id and topic_id. PHPBB3-12912
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-061-0/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12910] Set get_name for Google+ fields
| * | | | | | Merge pull request #2795 from Dragooon/ticket/12910Joas Schilling2014-08-061-0/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12910] Set get_name for Google+ fields * Dragooon/ticket/12910: [ticket/12910] Set get_name for Google+ fields
| | * | | | | | [ticket/12910] Set get_name for Google+ fieldsShitiz Garg2014-08-031-0/+8
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | PHPBB3-12910
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-061-4/+23
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12913] Add more parameters to core.submit_post_end event
| * | | | | | Merge pull request #2806 from rxu/ticket/12913Joas Schilling2014-08-061-4/+23
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12913] Add more parameters to core.submit_post_end event * rxu/ticket/12913: [ticket/12913] Add more parameters to core.submit_post_end event
| | * | | | | [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 branch 'develop-ascraeus' into developAndreas Fischer2014-08-032-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12906] Add rel="help" to FAQ link
| * | | | | Merge pull request #2796 from bantu/ticket/12906Andreas Fischer2014-08-032-2/+2
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12906] Add rel="help" to FAQ link * bantu/ticket/12906: [ticket/12906] Add rel="help" to FAQ link
| | * | | | [ticket/12906] Add rel="help" to FAQ linkLouis77772014-08-032-2/+2
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-12906
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-031-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12909] Use correct lang vars in cli extension enable
| * | | | Merge pull request #2793 from n-aleha/ticket/12909Andreas Fischer2014-08-031-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12909] Use correct lang vars in cli extension enable * n-aleha/ticket/12909: [ticket/12909] Use correct lang vars in cli extension enable
| | * | | | [ticket/12909] Use correct lang vars in cli extension enablen-aleha2014-08-031-2/+2
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-12909
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-031-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12908] Fix operator typo in increment.php
| * | | | Merge pull request #2792 from n-aleha/ticket/12908Andreas Fischer2014-08-031-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | [ticket/12908] Fix operator typo in increment.php * n-aleha/ticket/12908: [ticket/12908] Fix operator typo in increment.php
| | * | | [ticket/12908] Fix operator typo in increment.phpn-aleha2014-08-031-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-12908
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-023-9/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/12895] Rename user style setting to resolve conflict with style param
| * | | Merge pull request #2782 from marc1706/ticket/12895Joas Schilling2014-08-023-9/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-293-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'develop-ascraeus' into developJoas Schilling2014-08-021-1/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12902] Remove duplicate entry in switch statement
| * | | | 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 branch 'develop-ascraeus' into developMarc Alexander2014-08-011-2/+16
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-21 12:55:43 +0000