aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/13052] Remove additional parameter from check_form_key()Joas Schilling2014-09-091-17/+9
| | | | PHPBB3-13052
* Merge pull request #2925 from nickvergessen/ticket/12983Marc Alexander2014-09-071-6/+18
|\ | | | | | | Ticket/12983 UCP preferences, Display posts ordering by: input is not properly validated
| * [ticket/12983] Correctly validate sorting options in the UCPJoas Schilling2014-09-051-6/+18
| | | | | | | | PHPBB3-12983
* | Merge pull request #2918 from marc1706/ticket/13031Tristan Darricau2014-09-061-1/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13031] Only use mimetype guesser guess if it helps us * marc1706/ticket/13031: [ticket/13031] Slightly change behavior of choose_mime_type and add unit tests [ticket/13031] Guess with all mimetype guessers and pick best guess [ticket/13031] Only use mimetype guesser guess if it helps us
| * | [ticket/13031] Guess with all mimetype guessers and pick best guessMarc Alexander2014-09-051-2/+2
| | | | | | | | | | | | PHPBB3-13031
| * | [ticket/13031] Only use mimetype guesser guess if it helps usMarc Alexander2014-09-031-1/+6
| |/ | | | | | | | | | | | | | | | | | | If we already have a mimetype and the guesser's guess is the default fallback, we should keep the already existing mimetype the browser supplied. Otherwise, platforms that might not support mimetype guessers will cause us to always have the mimetype set to application/octet-stream on images. This will prevent users from uploading images. PHPBB3-13031
* | Merge pull request #2748 from carlo94it/ticket/12765Marc Alexander2014-09-051-142/+3
|\ \ | |/ |/| | | [ticket/12765] Use db_tools instead of generating queries at moment
| * [ticket/12765] Execute query directly from db toolsCarlo2014-08-101-4/+2
| | | | | | | | PHPBB3-12765
| * [ticket/12765] Use db_tools instead of generating queries at momentCarlo2014-08-101-142/+5
| | | | | | | | PHPBB3-12765
* | Merge pull request #2826 from brunoais/ticket/12928Marc Alexander2014-08-301-0/+21
|\ \ | | | | | | | | | [ticket/12928] core.mcp_reports_gather_query_before
| * | [ticket/12928] Update to RC4brunoais2014-08-091-1/+1
| | | | | | | | | | | | PHPBB3-12928
| * | [ticket/12928] core.mcp_reports_gather_query_beforebrunoais2014-08-081-0/+21
| | | | | | | | | | | | | | | | | | | | | Adding the core.mcp_reports_gather_query_before event to mcp backend. PHPBB3-12928
* | | Merge pull request #2865 from marc1706/ticket/12966Dhruv Goel2014-08-297-18/+27
|\ \ \ | | | | | | | | [ticket/12966] Sort posts by post_id in addition to sorting by post_time
| * | | [ticket/12966] Sort by post_time and post_id where applicableMarc Alexander2014-08-237-18/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change was not applied to the search as this would require a larger rewrite of the search methods. PHPBB3-12966
* | | | [ticket/13010] Specifiy correct clean_row() call in phpbb_get_avatar docblockMarc Alexander2014-08-241-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13010
* | | | Merge pull request #2894 from Nicofuma/ticket/12999Andreas Fischer2014-08-214-19/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12999] Remove @author tags * Nicofuma/ticket/12999: [ticket/12999] Remove @author tags
| * | | | [ticket/12999] Remove @author tagsTristan Darricau2014-08-194-19/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12999
* | | | | Merge pull request #2885 from Nicofuma/ticket/12990Marc Alexander2014-08-2112-86/+86
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12990] Use the full services name for the notification's types
| * | | | | [ticket/12990] Use protected instead of privateTristan Darricau2014-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12990
| * | | | | [ticket/12990] Use the full services name for the notification's typesTristan Darricau2014-08-1612-87/+87
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-12990
* | | | | [ticket/12998] Fix use of $lang in mcp_warn.phpTristan Darricau2014-08-191-2/+2
|/ / / / | | | | | | | | | | | | PHPBB3-12998
* | | | [prep-release-3.1.0-RC3] Update phpBB Version for RC4 developmentJoas Schilling2014-08-121-1/+1
| | | |
* | | | [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3Joas Schilling2014-08-111-1/+1
| | | |
* | | | Merge remote-tracking branch 'github-marc1706/ticket/12822' into ↵Nils Adermann2014-08-114-77/+84
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/12822: [ticket/12822] Fix test runs of avatar manager_test [ticket/12822] Add method for deleting avatars and use confirm_box [ticket/12822] Remove "None" option from avatar select boxes
| * | | | [ticket/12822] Add method for deleting avatars and use confirm_boxMarc Alexander2014-08-074-77/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method will take care of the actual deletion process in the avatar manager. Additionally, we'll be using a confirm box while deleting the avatar to prevent users from accidentally deleting their avatars. PHPBB3-12822
* | | | | Merge pull request #2842 from Nicofuma/ticket/11854Marc Alexander2014-08-1115-6000/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/11854] Move captchas to phpbb/ and use DI for plugins
| * | | | | [ticket/11854] Rename captchas.factory service to captcha.factoryTristan Darricau2014-08-115-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854
| * | | | | [ticket/11854] Move captcha stuff to phpbb/ and use DI for pluginsTristan Darricau2014-08-1115-6000/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11854
* | | | | | Merge pull request #2845 from rxu/ticket/12942Marc Alexander2014-08-111-1/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/12942] Add core.add_form_key core event
| * | | | | | [ticket/12942] Add core.add_form_key core eventrxu2014-08-111-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core.add_form_key core event to allow extensions modifying form key. PHPBB3-12942
* | | | | | | Merge pull request #2867 from prototech/ticket/12967Marc Alexander2014-08-111-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12967] Fix undefined variable phpbb_dispatcher error.
| * | | | | | | [ticket/12967] Fix undefined variable phpbb_dispatcher error.Cesar G2014-08-111-0/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-12967
* | | | | | | Merge pull request #2863 from rxu/ticket/12944Marc Alexander2014-08-111-1/+12
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | [ticket/12944] Add core.login_forum_box core event
| * | | | | | [ticket/12944] Add core.login_forum_box core eventrxu2014-08-111-1/+12
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core.login_forum_box core event to allow extensions performing additional actions on forum login. PHPBB3-12944
* | | | | | Merge pull request #2864 from rxu/ticket/12931Marc Alexander2014-08-101-10/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/12931] Fix general error on user registration
| * | | | | | [ticket/12931] Fix general error on user registrationrxu2014-08-101-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "Illegal use of $_SERVER" general error on user registration when $config['server_name'] is not set. PHPBB3-12931
* | | | | | | Merge pull request #2862 from marc1706/ticket/12932Joas Schilling2014-08-101-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12932] Add method for allowing override of \phpbb\datetime class * marc1706/ticket/12932: [ticket/12932] Remove set_datetime_class method from user class [ticket/12932] Fix tests and calls to create_datetime [ticket/12932] Add method for getting the datetime class and allow overriding
| * | | | | | [ticket/12932] Fix tests and calls to create_datetimeMarc Alexander2014-08-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12932
| * | | | | | [ticket/12932] Add method for getting the datetime class and allow overridingMarc Alexander2014-08-101-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An extension can now override the datetime class by overwriting the datetime.class parameter in their own yml file. PHPBB3-12932
* | | | | | Merge pull request #2730 from omniError/ticket/12831Dhruv Goel2014-08-102-16/+42
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [ticket/12831] Allow events in page_header functions to prevent the setting of HTTP headers
| * | | | | [ticket/12831] fix CSomniError2014-08-092-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12831 PHPBB3-12831
| * | | | | [ticket/12831] simplified code, upd event blockomniError2014-08-092-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12831 PHPBB3-12831
| * | | | | [ticket/12831] reimplemented headers as arrayomniError2014-08-092-29/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12831 PHPBB3-12831
| * | | | | [ticket/12831] Optn to prevent setting HTTP headersomniError2014-08-012-15/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12831 PHPBB3-12831
* | | | | | Merge pull request #2846 from rxu/ticket/12943Joas Schilling2014-08-102-3/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12943] Add core.phpbb_generate_debug_output core event * rxu/ticket/12943: [ticket/12943] Add core.phpbb_generate_debug_output core event
| * | | | | | [ticket/12943] Add core.phpbb_generate_debug_output core eventrxu2014-08-092-3/+15
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core.phpbb_generate_debug_output core event to allow extensions outputting additional debug info. PHPBB3-12943
* | | | | | Merge pull request #2852 from bantu/ticket/12938Joas Schilling2014-08-103-66/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12938] Remove the 'Download all attachments' feature. * bantu/ticket/12938: [ticket/12938] Remove functional tests for 'Download all attachments'. [ticket/12938] Remove the 'Download all attachments' feature.
| * | | | | [ticket/12938] Remove the 'Download all attachments' feature.Andreas Fischer2014-08-093-66/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12938
* | | | | | Merge pull request #2849 from bantu/ticket/12941Tristan Darricau2014-08-101-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12941] Check for Sami parse errors on Travis CI. * bantu/ticket/12941: [ticket/12941] Fix remaining Sami complaints. [ticket/12941] Check for Sami parse errors on Travis CI. [ticket/12941] Add sami.conf.php for Travis CI.
| * | | | | | [ticket/12941] Fix remaining Sami complaints.Andreas Fischer2014-08-091-0/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | PHPBB3-12941