aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x'Tristan Darricau2015-09-011-0/+10
|\
| * Merge pull request #3765 from Zoddo/ticket/13950Tristan Darricau2015-09-011-0/+10
| |\
| | * [ticket/13950] Hide undefined categoriesZoddo2015-08-281-0/+5
| | * [ticket/13950] Hide undefined permissionsZoddo2015-08-281-0/+5
* | | Merge branch '3.1.x'Tristan Darricau2015-09-011-1/+1
|\ \ \ | |/ /
| * | [ticket/14133] Comment fix for phpbb_get_user_rank()lavigor2015-08-311-1/+1
| |/
* | Merge branch '3.1.x'Tristan Darricau2015-08-281-9/+0
|\ \ | |/
| * Merge pull request #3835 from rxu/ticket/14106Tristan Darricau2015-08-281-9/+0
| |\
| | * [ticket/14106] Fix topics sorting in MCP for topics merging.rxu2015-08-161-9/+0
* | | Merge branch '3.1.x'Tristan Darricau2015-08-281-1/+1
|\ \ \ | |/ /
| * | Merge pull request #3809 from marc1706/ticket/14070Tristan Darricau2015-08-281-1/+1
| |\ \
| | * | [ticket/14070] Properly pass whether config should be ignored for avatarsMarc Alexander2015-08-051-1/+1
| * | | [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 controllersNicofuma2015-08-231-1/+1
* | | | | Merge pull request #3859 from Nicofuma/ticket/13897Máté Bartus2015-08-281-1/+9
|\ \ \ \ \
| * | | | | [ticket/13897] Make dependency to the filesystem optional in error handlerTristan Darricau2015-08-251-1/+9
* | | | | | [ticket/12505] Set deprecations for constants to 3.2n-aleha2015-08-241-3/+3
* | | | | | [ticket/12505] Remove outdated media extensionsn-aleha2015-08-241-3/+3
* | | | | | [ticket/12505] Remove outdated media handling from acpn-aleha2015-08-241-6/+0
* | | | | | [ticket/12505] Remove outdated media handing in attachmentsn-aleha2015-08-241-32/+0
|/ / / / /
* | | | | Merge pull request #3652 from Elsensee/ticket/12143Tristan Darricau2015-08-2312-54/+104
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ticket/12143] Avoid no output from get_group_name()Oliver Schramm2015-08-051-1/+1
| * | | | [ticket/12143] Oops, fixed array indexOliver Schramm2015-08-051-1/+1
| * | | | [ticket/12143] Replace group name outputOliver Schramm2015-08-0512-54/+104
* | | | | Merge branch '3.1.x'Marc Alexander2015-08-221-1/+12
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #3823 from lavigor/ticket/14087Marc Alexander2015-08-221-1/+12
| |\ \ \ \
| | * | | | [ticket/14087] Add an event to ucp_activate.php.lavigor2015-08-091-1/+12
| | | |_|/ | | |/| |
* | | | | Merge branch '3.1.x'Marc Alexander2015-08-221-0/+23
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3813 from rxu/ticket/14072Marc Alexander2015-08-221-0/+23
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [ticket/14072] Add core event to the function format_display()rxu2015-08-061-0/+23
| | | |/ | | |/|
* | | | 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 more parameters to the eventJakub Senko2015-08-021-2/+6
| | * | | [ticket/14043] Add dispatcher to globals, change @since valueJakub Senko2015-07-221-2/+2
| | * | | [ticket/14043] Add core.get_avatar_after php eventJakub Senko2015-07-211-1/+11
* | | | | Merge branch '3.1.x'Marc Alexander2015-08-091-0/+24
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3760 from Zoddo/ticket/14014Marc Alexander2015-08-091-0/+24
| |\ \ \ \
| | * | | | [ticket/14014] Add core.mcp_forum_view_before eventZoddo2015-07-151-0/+24
* | | | | | 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 eventZoddo2015-07-121-0/+10
| | |/ / /
* | | | | [ticket/14074] Fix mark notifications as read in the ucpTristan Darricau2015-08-071-1/+1
| |_|_|/ |/| | |
* | | | Merge pull request #3514 from CHItA/ticket/13740Tristan Darricau2015-07-271-30/+47
|\ \ \ \
| * | | | [ticket/13740] Fix CS in compatibilty_globals.phpMate Bartus2015-07-241-1/+1
| * | | | [ticket/13740] Fix CS and extend phpbb extensionsCHItA2015-07-081-10/+10
| * | | | [ticket/13740] Core file workaroundsMateBartus2015-07-081-41/+58
* | | | | Merge pull request #3781 from Elsensee/ticket/8708-2Tristan Darricau2015-07-223-10/+8
|\ \ \ \ \
| * | | | | [ticket/8708] Apply permission 'f_announce_global'Oliver Schramm2015-07-193-10/+8