aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12769] Properly include FAMichael Miday2015-09-171-1/+2
|
* Merge branch '3.1.x'Marc Alexander2015-09-161-0/+24
|\
| * Merge pull request #3833 from rxu/ticket/14102Marc Alexander2015-09-161-0/+24
| |\ | | | | | | | | | [ticket/14102] Add core event to the mcp_topic.php
| | * [ticket/14102] Add core event to the mcp_topic.phprxu2015-08-151-0/+24
| | | | | | | | | | | | PHPBB3-14102
* | | Merge branch '3.1.x'Tristan Darricau2015-09-161-0/+3
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/14154] Add extension composer name as tooltip
| * | [ticket/14154] Add extension composer name as tooltipZoddo2015-09-121-0/+3
| | | | | | | | | | | | PHPBB3-14154
* | | Merge pull request #3727 from marc1706/ticket/13904Tristan Darricau2015-09-162-1134/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13904] Refactor attachments functions into service * marc1706/ticket/13904: (66 commits) [ticket/13904] Use filespec's get_filesize instead of calling filesize() [ticket/13904] Set properties to protected where possible in filespec [ticket/13904] Fix tests after changes to factory [ticket/13904] Minor coding style fixes [ticket/13904] Add language entries for error messages in upload class [ticket/13904] Modify files for updated fast-image-size library [ticket/13904] Update composer.lock [ticket/13904] Improve code coverage [ticket/13904] Add unit tests for local upload type [ticket/13904] Minor coding style fixes [ticket/13904] Improve test coverage of base upload type class [ticket/13904] Improve test coverage of remote upload type [ticket/13904] Improve test coverage of form upload type [ticket/13904] Improve test coverage of filespec class [ticket/13904] Add back tests for retrieving floats [ticket/13904] Use ini_get() wrapper in file upload types [ticket/13904] Modify files for changes in ini wrapper [ticket/13904] Add bantu/ini-get-wrapper to composer.json [ticket/13904] Switch around constructor arguments [ticket/13904] Use \phpbb\php\ini class for ini_get() ...
| * | | [ticket/13904] Fix tests after changes to factoryMarc Alexander2015-09-091-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13904
| * | | [ticket/13904] Fix minor issues and move local_upload to its own classMarc Alexander2015-09-091-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13904
| * | | [ticket/13904] Move form_upload to its own class and define type classesMarc Alexander2015-09-091-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13904
| * | | [ticket/13904] Remove functions_fileupload.phpMarc Alexander2015-09-091-31/+0
| | | | | | | | | | | | | | | | PHPBB3-13904
| * | | [ticket/13904] Remove fileupload classMarc Alexander2015-09-091-641/+0
| | | | | | | | | | | | | | | | PHPBB3-13904
| * | | [ticket/13904] Get rid of useless parameters and variablesMarc Alexander2015-09-091-2/+1
| | | | | | | | | | | | | | | | PHPBB3-13904
| * | | [ticket/13904] Load upload class using factoryMarc Alexander2015-09-091-2/+3
| | | | | | | | | | | | | | | | PHPBB3-13904
| * | | [ticket/13904] Turn filespec into prototype and improve init methodsMarc Alexander2015-09-091-12/+15
| | | | | | | | | | | | | | | | PHPBB3-13904
| * | | [ticket/13904] Fix uploading for use with new filespec classMarc Alexander2015-09-092-6/+12
| | | | | | | | | | | | | | | | PHPBB3-13904
| * | | [ticket/13904] Remove filespec class from functions_uploadMarc Alexander2015-09-091-467/+1
| | | | | | | | | | | | | | | | PHPBB3-13904
* | | | Merge branch '3.1.x'Tristan Darricau2015-09-091-0/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * 3.1.x: [ticket/7362] Add alt attribute on topic icons
| * | | Merge pull request #3868 from Zoddo/ticket/7362Tristan Darricau2015-09-091-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/7362] Add alt attribute on topic icons * Zoddo/ticket/7362: [ticket/7362] Add alt attribute on topic icons
| | * | | [ticket/7362] Add alt attribute on topic iconsZoddo2015-08-301-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-7362
* | | | | Merge pull request #3870 from Zoddo/ticket/9485Tristan Darricau2015-09-097-1/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/9485] Add a "View post" link in the moderation logs * Zoddo/ticket/9485: [ticket/9485] Fix tests [ticket/9485] Add post_id to relevant $phpbb_log->add() [ticket/9485] Add a "View post" link in the moderation logs
| * | | | | [ticket/9485] Add post_id to relevant $phpbb_log->add()Zoddo2015-08-306-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9485
| * | | | | [ticket/9485] Add a "View post" link in the moderation logsZoddo2015-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9485
* | | | | | Merge pull request #3876 from VSEphpbb/ticket/14138Tristan Darricau2015-09-091-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14138] Use span tags instead of abbr * VSEphpbb/ticket/14138: [ticket/14138] Use span tags instead of abbr
| * | | | | [ticket/14138] Use span tags instead of abbrMatt Friedman2015-09-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14138
* | | | | | Merge pull request #3891 from marc1706/ticket/14150Tristan Darricau2015-09-092-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14150] Update fast-image-size to newest version * marc1706/ticket/14150: [ticket/14150] Update fast-image-size to newest version
| * | | | | | [ticket/14150] Update fast-image-size to newest versionMarc Alexander2015-09-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14150
* | | | | | | 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