aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-09-081-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | / / / / / / | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #3881 from VSEphpbb/ticket/14142Marc Alexander2015-09-081-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14142] Remove unused ignore_configs from avatar drivers
| | * | | | | | | | [ticket/14142] Remove unused ignore_configs from avatar driversMatt Friedman2015-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14142
* | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-09-071-0/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | / / / / / / / | |_|/ / / / / / / |/| | | | | | | | Conflicts: phpBB/includes/functions_messenger.php
| * | | | | | | | [ticket/14143] Flush the mail queue when writing itTristan Darricau2015-09-051-0/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14143
* | | | | | | | Merge branch '3.1.x'Tristan Darricau2015-09-011-0/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13950] Hide undefined categories [ticket/13950] Hide undefined permissions
| * | | | | | | Merge pull request #3765 from Zoddo/ticket/13950Tristan Darricau2015-09-011-0/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13950] Hide undefined permissions * Zoddo/ticket/13950: [ticket/13950] Hide undefined categories [ticket/13950] Hide undefined permissions
| | * | | | | | | [ticket/13950] Hide undefined categoriesZoddo2015-08-281-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This hides the categories added by disabled extensions PHPBB3-13950
| | * | | | | | | [ticket/13950] Hide undefined permissionsZoddo2015-08-281-0/+5
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This hides the permissions of the disabled extensions PHPBB3-13950
* | | | | | | | Merge branch '3.1.x'Tristan Darricau2015-09-011-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | / / / / / | |_|/ / / / / |/| | | | | | * 3.1.x: [ticket/14133] Comment fix for phpbb_get_user_rank()
| * | | | | | [ticket/14133] Comment fix for phpbb_get_user_rank()lavigor2015-08-311-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-14133
* | | | | | Merge branch '3.1.x'Tristan Darricau2015-08-281-9/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14106] Fix topics sorting in MCP for topics merging.
| * | | | | Merge pull request #3835 from rxu/ticket/14106Tristan Darricau2015-08-281-9/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14106] Fix topics sorting in MCP for topics merging. * rxu/ticket/14106: [ticket/14106] Fix topics sorting in MCP for topics merging.
| | * | | | | [ticket/14106] Fix topics sorting in MCP for topics merging.rxu2015-08-161-9/+0
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "bug" in the deleted code comment is non-existent now. The PR is for 3.1 only. PHPBB3-14106
* | | | | | Merge branch '3.1.x'Tristan Darricau2015-08-281-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14070] Properly pass whether config should be ignored for avatars
| * | | | | Merge pull request #3809 from marc1706/ticket/14070Tristan Darricau2015-08-281-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14070] Properly pass whether config should be ignored for avatars * marc1706/ticket/14070: [ticket/14070] Properly pass whether config should be ignored for avatars
| | * | | | | [ticket/14070] Properly pass whether config should be ignored for avatarsMarc Alexander2015-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14070
| * | | | | | [3.1.x] Update version to 3.1.7-devJoas Schilling2015-08-231-1/+1
| | | | | | |
| * | | | | | [prep-release-3.1.6] Update version to 3.1.6-RC1Joas Schilling2015-08-231-1/+1
| | | | | | |
* | | | | | | Merge pull request #3470 from Nicofuma/ticket/13645Máté Bartus2015-08-281-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/13645] Move the feeds to controllers
| * | | | | | | [ticket/13645] Move the feeds to controllersNicofuma2015-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13645
* | | | | | | | Merge pull request #3859 from Nicofuma/ticket/13897Máté Bartus2015-08-281-1/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13897] Make dependency to the filesystem optional in error handler
| * | | | | | | | [ticket/13897] Make dependency to the filesystem optional in error handlerTristan Darricau2015-08-251-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13897
* | | | | | | | | [ticket/12505] Set deprecations for constants to 3.2n-aleha2015-08-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12505
* | | | | | | | | [ticket/12505] Remove outdated media extensionsn-aleha2015-08-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update constants and data schema for new installations. Mark outdated media constants as deprecated. PHPBB3-12505
* | | | | | | | | [ticket/12505] Remove outdated media handling from acpn-aleha2015-08-241-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove outdated media handling from acp PHPBB3-12505
* | | | | | | | | [ticket/12505] Remove outdated media handing in attachmentsn-aleha2015-08-241-32/+0
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove code for handling media in RealPlayer, QuickTime, and Windows Media Player. PHPBB3-12505
* | | | | | | | Merge pull request #3652 from Elsensee/ticket/12143Tristan Darricau2015-08-2312-54/+104
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12143] Make it possible to use translated group names for non-special groups * Elsensee/ticket/12143: [ticket/12143] Fix tests after rebase [ticket/12143] Avoid no output from get_group_name() [ticket/12143] Fix those tests [ticket/12143] Add some tests [ticket/12143] Oops, fixed array index [ticket/12143] Replace group name output [ticket/12143] Add group helper class to translate groupnames [ticket/12143] Add is_set method to language service
| * | | | | | | [ticket/12143] Avoid no output from get_group_name()Oliver Schramm2015-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12143
| * | | | | | | [ticket/12143] Oops, fixed array indexOliver Schramm2015-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12143
| * | | | | | | [ticket/12143] Replace group name outputOliver Schramm2015-08-0512-54/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So now we can use translated group names for non-special groups PHPBB3-12143
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-221-1/+12
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/ucp/ucp_activate.php
| * | | | | | | Merge pull request #3823 from lavigor/ticket/14087Marc Alexander2015-08-221-1/+12
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14087] Add an event to ucp_activate.php.
| | * | | | | | | [ticket/14087] Add an event to ucp_activate.php.lavigor2015-08-091-1/+12
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | PHPBB3-14087
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-221-0/+23
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/message_parser.php
| * | | | | | | Merge pull request #3813 from rxu/ticket/14072Marc Alexander2015-08-221-0/+23
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | [ticket/14072] Add core event to the function format_display()
| | * | | | | | [ticket/14072] Add core event to the function format_display()rxu2015-08-061-0/+23
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | PHPBB3-14072
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-091-1/+15
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3784 from Senky/ticket/14043Marc Alexander2015-08-091-1/+15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14043] Add core.get_avatar_after php event
| | * | | | | | [ticket/14043] Add more parameters to the eventJakub Senko2015-08-021-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14043
| | * | | | | | [ticket/14043] Add dispatcher to globals, change @since valueJakub Senko2015-07-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14043
| | * | | | | | [ticket/14043] Add core.get_avatar_after php eventJakub Senko2015-07-211-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14043
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-091-0/+24
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/mcp/mcp_forum.php
| * | | | | | | Merge pull request #3760 from Zoddo/ticket/14014Marc Alexander2015-08-091-0/+24
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14014] Add core.mcp_forum_view_before event
| | * | | | | | | [ticket/14014] Add core.mcp_forum_view_before eventZoddo2015-07-151-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This event can be used to get some data in order to execute other actions. PHPBB3-14014
* | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-081-0/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #3757 from Zoddo/ticket/14006Marc Alexander2015-08-081-0/+10
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | [ticket/14006] Add core.ucp_register_agreement event
| | * | | | | | | [ticket/14006] Add core.ucp_register_agreement eventZoddo2015-07-121-0/+10
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It allows to execute code before the agreements are displayed. PHPBB3-14006
* | | | | | | | [ticket/14074] Fix mark notifications as read in the ucpTristan Darricau2015-08-071-1/+1
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | PHPBB3-14074
* | | | | | | Merge pull request #3514 from CHItA/ticket/13740Tristan Darricau2015-07-271-30/+47
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13740] Refactoring installer * CHItA/ticket/13740: (75 commits) [ticket/13740] Reduce number of references in nav provider [ticket/13740] Move handle_language_select calls to the controllers [ticket/13740] Fix infinite config.php check loop [ticket/13740] Move default data settings out of constructors [ticket/13740] Deduplicate container builder's checks [ticket/13740] Use JSON for installer config [ticket/13740] Fix comment [ticket/13740] Use language service in console application [ticket/13740] Fix CS in compatibilty_globals.php [ticket/13740] Fix message element creation in JS [ticket/13740] Replace more spaces with tabs [ticket/13740] Fix CS [ticket/13740] Filter basic directory change attempts in lang change [ticket/13740] Use tabs instead of spaces in JS file [ticket/13740] Add success message when install finished [ticket/13740] Fix $script_path in obtain_data [ticket/13740] Fix is_phpbb_installed() method [ticket/13740] Login admin when install finished [ticket/13740] Enhance server output buffer bypass [ticket/13740] Secure installer config against corrupted config data ...