aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | [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
* | | | | | | | | | | Merge pull request #2769 from rxu/ticket/12884Joas Schilling2014-07-271-1/+15
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12884] Add core event to the function upload_attachment() * rxu/ticket/12884: [ticket/12884] Add core event to the function upload_attachment()
| * | | | | | | | | | | [ticket/12884] Add core event to the function upload_attachment()rxu2014-07-231-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core event to the function upload_attachment() in functions_posting.php to provide ability for extensions to perform additional actions on uploaded files, like resizing etc. PHPBB3-12884
* | | | | | | | | | | | Merge branch 'ticket/forumhulp/12896' into develop-ascraeusJoas Schilling2014-07-271-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/forumhulp/12896: [ticket/12896] Add php event for admin notices
| * | | | | | | | | | | | [ticket/12896] Add php event for admin noticesForumhulp.com2014-07-271-1/+9
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12896
* | | | | | | | | | | | [ticket/12887] Fix Typo: offest -> offsetAndreas Fischer2014-07-231-7/+7
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12887
* | | | | | | | | | | [ticket/12871] Add PHPBB_DISPLAY_LOAD_TIME const to config.php on installationrxu2014-07-191-0/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make it consistent with another config.php constants, PHPBB_DISPLAY_LOAD_TIME is to be put in config.php during installation as well. PHPBB3-12871
* | | | | | | | | | Merge pull request #2709 from rxu/ticket/12828Joas Schilling2014-07-161-3/+21
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12828] Add ucp_prefs.php common core event * rxu/ticket/12828: [ticket/12828] Add ucp_prefs.php common core event
| * | | | | | | | | | [ticket/12828] Add ucp_prefs.php common core eventrxu2014-07-131-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add common core event at the bottom of the includes/ucp/ucp_prefs.php to allow additional actions (like template variable assignments etc.) before the page load. PHPBB3-12828
* | | | | | | | | | | [ticket/12854] Don't show contact page link if board emails are disabledOliver Schramm2014-07-151-2/+2
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12854
* | | | | | | | | | [prep-release-3.1.0-RC2] Update phpBB Version for RC3 developmentJoas Schilling2014-07-111-1/+1
| | | | | | | | | |
* | | | | | | | | | [prep-release-3.1.0-RC2] Update version to 3.1.0-RC2Joas Schilling2014-07-111-1/+1
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | Merge pull request #2701 from Nicofuma/ticket/12818Andreas Fischer2014-07-111-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12818] Deleting a log entry in MCP produces a General error * Nicofuma/ticket/12818: [ticket/12818] Use assertGreaterThanOrEqual in the tests [ticket/12818] Don't use the id for i= [ticket/12818] Add tests [ticket/12818] Fix the conditions in the call to $log->delete() in mcp_logs
| * | | | | | | | | [ticket/12818] Fix the conditions in the call to $log->delete() in mcp_logsTristan Darricau2014-07-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12818
* | | | | | | | | | Merge pull request #2671 from Nicofuma/ticket/12775Andreas Fischer2014-07-113-346/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12775] Replace functions_container with a container_builder class. * Nicofuma/ticket/12775: (34 commits) [ticket/12775] Set dbal.conn.driver as synthetic during installation [ticket/12775] Add the definition of dbal.conn in fixtures/config/services.yml [ticket/12775] Inject the connection when created in the container [ticket/12775] Extract the vars later in install/install_update.php [ticket/12775] Rename config_php_handler to config_php_file container_builder [ticket/12775] Set defined_vars as a property of config_php_file [ticket/12775] Fix doc blocks in the container builder [ticket/12775] Remove useless includes of config.php [ticket/12775] Move phpbb_convert_30_dbms_to_31 into the config file class [ticket/12775] Fix comments [ticket/12775] Update doc blocks [ticket/12775] Fix container_builder [ticket/12775] Rename config_php to config_php_file [ticket/12775] Renamed to \phpbb\di\container_builder [ticket/12775] Remove the last include of functions_container [ticket/12775] Fix unit tests [ticket/12775] Add tests for \phpbb\config_php [ticket/12775] Add tests for the container factory [ticket/12775] Use a field instead of a local var in load_config_var() [ticket/12775] Update container and config in install/ ...
| * | | | | | | | | | [ticket/12775] Remove useless includes of config.phpTristan Darricau2014-07-071-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12775
| * | | | | | | | | | [ticket/12775] Move phpbb_convert_30_dbms_to_31 into the config file classTristan Darricau2014-07-072-48/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12775
| * | | | | | | | | | [ticket/12775] Add tests for the container factoryTristan Darricau2014-07-071-291/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12775
| * | | | | | | | | | [ticket/12775] Update phpBB/install/database_update.phpTristan Darricau2014-07-071-296/+290
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12775
* | | | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusTristan Darricau2014-07-101-0/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | | * develop-olympus: [ticket/12695] Add viewtopic language file for parse_attachments in mcp_post