aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14395] Move call to phpbb_add_quickmod_optionLaxSlash2016-01-071-8/+8
| | | | | | | | | | | Moved the call to function phpbb_add_quickmod_option to being under the core event core.viewtopic_assign_template_vars_before so as to enable the modification of elements in the BEFORE they are assigned to the template, so that removed elements don't show up in a non-functional state. Allows the user to perform additional permissions checks on the items within the array. PHPBB3-14395
* Merge pull request #4079 from rxu/ticket/14356Marc Alexander2016-01-073-2/+38
|\ | | | | | | [ticket/14356] Add template events to viewtopic around back2top link
| * [ticket/14356] Add template events to viewtopic around back2top linkrxu2015-12-173-2/+38
| | | | | | | | PHPBB3-14356
* | Merge pull request #4109 from marc1706/ticket/14343Marc Alexander2016-01-061-1/+1
|\ \ | | | | | | | | | [ticket/14343] Added missing $phpbb_dispatcher
| * | [ticket/14343] Added missing $phpbb_dispatcherkasimi2016-01-061-1/+1
| | | | | | | | | | | | PHPBB3-14343
* | | Merge pull request #4105 from marc1706/ticket/14387Marc Alexander2016-01-066-19/+38
|\ \ \ | | | | | | | | | | | | [ticket/14387] Allow extending avatars by extensions in ACP
| * | | [ticket/14387] Fix avatar tests after adding get_config_name methodMarc Alexander2016-01-021-1/+4
| | | | | | | | | | | | | | | | PHPBB3-14387
| * | | [ticket/14387] Extend avatar-driver by extension in ACP not possiblejaviexin2016-01-023-30/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create two driver methods to provide the driver config name and the driver ACP template name, and use them directly when required. Default driver config name and template name are the same as now. But new drivers are able to override the config name and template name with their own, including @vendor_extension. Simplified manager interface by reducing unneeded methods. PHPBB3-14387
| * | | [ticket/14387] Extend avatar-driver by extension in ACP not possiblejaviexin2016-01-025-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create two driver methods to provide the driver config name and the driver ACP template name, and use them within the manager method. Default driver config name and template name are the same as now. But new drivers are able to override the config name and template name with their own, including @vendor_extension. PHPBB3-14387
| * | | [ticket/14387] Extend avatar-driver by extension in ACP not possiblejaviexin2016-01-023-1/+16
| |/ / | | | | | | | | | | | | | | | | | | | | | Create a driver method to provide the driver config name, and use it within the manager method. Default driver config name is the same as now. But new drivers are able to override the config name with their own. PHPBB3-14387
* | | Merge pull request #4104 from ErnadoO/ticket/14386Marc Alexander2016-01-061-1/+1
|\ \ \ | |/ / |/| | | | | [ticket/14386] Fix for open_basedir restriction in effect with remote upload avatar
| * | [ticket/14386] Use of sys_get_temp_dir()Erwan Nader2016-01-031-1/+1
|/ / | | | | | | PHPBB3-14386
* | Merge pull request #4100 from marc1706/ticket/14303Marc Alexander2015-12-261-1/+1
|\ \ | | | | | | | | | [ticket/14303] Use UTF8 quotes in app.php lang file
| * | [ticket/14303] Use UTF8 quotes in app.php lang filephpBB EspaƱa2015-12-261-1/+1
|/ / | | | | | | PHPBB3-14303
* | Merge pull request #4084 from exussum12/ticket/14046Marc Alexander2015-12-232-10/+9
|\ \ | | | | | | | | | [ticket/14046] Jabber message incorrect
| * | [ticket/14046] Jabber message incorrectScott Dutton2015-12-162-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | When making a Jabber message, the page says the message has been sent when loading the page for the first time, This message should only be shown after the message has actually been sent PHPBB3-14046
* | | Merge pull request #4093 from VSEphpbb/ticket/14374Marc Alexander2015-12-225-5/+5
|\ \ \ | | | | | | | | | | | | [ticket/14374] Update dynamic fallback jquery CDN script tag
| * | | [ticket/14374] Update dynamic fallback jquery CDN script tagMatt Friedman2015-12-225-5/+5
|/ / / | | | | | | | | | PHPBB3-14374
* | | Merge branch 'prep-release-3.1.7' into 3.1.xJoas Schilling2015-12-192-2/+33
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| * | | [prep-release-3.1.7] Add migration to update the versionJoas Schilling2015-12-191-0/+31
| | | |
| * | | [prep-release-3.1.7] Increase version to 3.1.7Joas Schilling2015-12-193-4/+4
| | | |
* | | | Merge pull request #4078 from VSEphpbb/ticket/14353Marc Alexander2015-12-131-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14353] Complete [list] bbcode documentation/examples
| * | | | [ticket/14353] Complete [list] bbcode documentation/examplesMatt Friedman2015-12-111-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14353
* | | | | [3.1.x] Update version to 3.1.8-devJoas Schilling2015-12-123-3/+3
| | | | |
* | | | | Merge branch 'prep-release-3.1.7' into 3.1.xJoas Schilling2015-12-128-8/+148
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | |
| * | | [prep-release-3.1.7] Add changelog for 3.1.7-RC1Joas Schilling2015-12-121-0/+108
| | | |
| * | | [prep-release-3.1.7] Add migration for 3.1.7-RC1Joas Schilling2015-12-121-0/+32
| | | |
| * | | [prep-release-3.1.7] Update version to 3.1.7-RC1Joas Schilling2015-12-126-8/+8
|/ / /
* | | Merge pull request #4018 from marc1706/ticket/14271Tristan Darricau2015-12-081-4/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14271] Update sample config * marc1706/ticket/14271: [ticket/14271] Properly use try_files in nginx sample config [ticket/14271] Improve try_files and use split path info [ticket/14271] Update sample config
| * | | [ticket/14271] Properly use try_files in nginx sample configMarc Alexander2015-11-101-6/+4
| | | | | | | | | | | | | | | | PHPBB3-14271
| * | | [ticket/14271] Improve try_files and use split path infoMarc Alexander2015-11-091-2/+4
| | | | | | | | | | | | | | | | PHPBB3-14271
| * | | [ticket/14271] Update sample configMarc Alexander2015-11-051-3/+12
| | | | | | | | | | | | | | | | PHPBB3-14271
* | | | Merge pull request #4071 from marc1706/ticket/14213Tristan Darricau2015-12-081-1/+21
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14213] Adding event after users have been added to a group * marc1706/ticket/14213: [ticket/14213] Add pending to core.group_add_user_after [ticket/14213] Mv event group_add_user_after after cache cleaning [ticket/14213] Fix version number [ticket/14213] Adding missing reference to event dispatcher [ticket/14213] Adding event after users have been added to a group
| * | | [ticket/14213] Add pending to core.group_add_user_afterMarc Alexander2015-12-081-1/+8
| | | | | | | | | | | | | | | | PHPBB3-14213
| * | | [ticket/14213] Mv event group_add_user_after after cache cleaningWardormeur2015-12-071-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | In order to match with the rest of the event and to have appropriate info state PHPBB3-14213
| * | | [ticket/14213] Fix version numberWardormeur2015-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | for core.group_add_user_after event PHPBB3-14213
| * | | [ticket/14213] Adding missing reference to event dispatcherWardormeur2015-12-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Required to dispatch event, wasn't included into global PHPBB3-14213
| * | | [ticket/14213] Adding event after users have been added to a groupWardormeur2015-12-071-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Allow mapping with others CMS by exposing user configuration & changes PHPBB3-14213
* | | | Merge pull request #4008 from Zoddo/ticket/14261Tristan Darricau2015-12-073-45/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14261] Move the update of session informations to page_footer() * Zoddo/ticket/14261: [ticket/14261] Fix tests by removing old code. [ticket/14261] Move the update of session informations to page_footer()
| * | | | [ticket/14261] Fix tests by removing old code.Zoddo2015-10-281-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will obselete GH-4007 PHPBB3-14261 PHPBB3-13202
| * | | | [ticket/14261] Move the update of session informations to page_footer()Zoddo2015-10-273-45/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the unique way to disable the update of session_page is to pass "false" to the parameter of session_begin(). This method is directly called in app.php, so pages served from the routing system can't disable the update of session informations. By moving the update to page_footer, we can allow controllers to tell to the session manager that we don't want to update the session infos. PHPBB3-14261
* | | | | Merge pull request #4069 from marc1706/ticket/14346Tristan Darricau2015-12-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14346] Do not turn version red if update status is unknown * marc1706/ticket/14346: [ticket/14346] Do not turn version red if update status is unknown
| * | | | | [ticket/14346] Do not turn version red if update status is unknownMarc Alexander2015-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14346
* | | | | | Merge pull request #4063 from marc1706/ticket/14339Tristan Darricau2015-12-073-3/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14339] Properly state PHP version support * marc1706/ticket/14339: [ticket/14339] Properly state PHP version support
| * | | | | [ticket/14339] Properly state PHP version supportMarc Alexander2015-12-053-3/+3
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-14339
* | | | | Merge pull request #4066 from kasimi/ticket/14343Tristan Darricau2015-12-071-0/+16
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | [ticket/14343] Add event when locking/unlocking posts/topics * kasimi/ticket/14343: [ticket/14343] Add event when locking/unlocking posts/topics
| * | | | [ticket/14343] Add event when locking/unlocking posts/topicskasimi2015-12-061-0/+16
|/ / / / | | | | | | | | | | | | PHPBB3-14343
* | | | Merge pull request #4057 from marc1706/ticket/14334Tristan Darricau2015-12-051-6/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14334] Use phpbb_get_avatar() in user_loader * marc1706/ticket/14334: [ticket/14334] Use phpbb_get_avatar() in user_loader
| * | | | [ticket/14334] Use phpbb_get_avatar() in user_loaderMarc Alexander2015-12-031-6/+1
|/ / / / | | | | | | | | | | | | PHPBB3-14334
* | | | Merge pull request #4030 from RMcGirr83/ticket_14283Marc Alexander2015-11-264-3/+27
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14283] Add a Manage Group link on a group page