aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Marc Alexander2015-10-112-4/+4
|\
| * Merge pull request #3864 from Zoddo/ticket/8920Marc Alexander2015-10-112-4/+4
| |\ | | | | | | | | | [ticket/8920] Add a MCP PM reports view permission
| | * [ticket/8920] Add a MCP PM reports view permissionZoddo2015-08-302-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Anybody who has the permission to read reports in one forum can read PM reports. Solving this problem by adding a new permission to read PM reports. PHPBB3-8920
* | | Merge pull request #3896 from Zoddo/ticket/14157Marc Alexander2015-10-102-3/+13
|\ \ \ | | | | | | | | | | | | [ticket/14157] Allow to set the alt/title attribute on post icons
| * | | [ticket/14157] Allow to set the alt/title attribute on post iconsZoddo2015-10-102-3/+13
| | | | | | | | | | | | | | | | PHPBB3-14157
* | | | Merge branch '3.1.x'Marc Alexander2015-10-091-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #3934 from Zoddo/ticket/14181Marc Alexander2015-10-091-1/+1
| |\ \ \ | | | | | | | | | | | | | | | [ticket/14181] Fix empty denial reason if the reason isn't translated
| | * | | [ticket/14181] Fix empty denial reason if the reason isn't translatedHB2015-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14181
* | | | | Merge branch '3.1.x'Marc Alexander2015-10-081-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/14073] Fix trailing whitespacesrxu2015-10-081-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14073
* | | | | Merge branch '3.1.x'Marc Alexander2015-10-081-2/+176
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3814 from rxu/ticket/14073Marc Alexander2015-10-081-2/+176
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14073] Add several core events to the functions_admin.php
| | * | | | [ticket/14073] Add several core events to the functions_admin.phprxu2015-10-081-2/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core events to the functions move_posts(), delete_posts(), delete_attachments(). PHPBB3-14073
* | | | | | Merge branch '3.1.x'Tristan Darricau2015-10-081-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14219] Add email to inactive user listing
| * | | | | Merge pull request #3951 from RMcGirr83/ticket_14219Tristan Darricau2015-10-081-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14219] Add email to inactive user listing * RMcGirr83/ticket_14219: [ticket/14219] Add email to inactive user listing
| | * | | | | [ticket/14219] Add email to inactive user listingRichard McGirr2015-10-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in ACP. May help in spotting spam accounts quickly PHPBB3-14219
* | | | | | | Merge branch '3.1.x'Tristan Darricau2015-10-081-9/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13960] Profile field validation breaks ACP
| * | | | | | Merge pull request #3724 from javiexin/ticket/13960Tristan Darricau2015-10-081-9/+6
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13960] Profile field validation breaks ACP * javiexin/ticket/13960: [ticket/13960] Profile field validation breaks ACP
| | * | | | | [ticket/13960] Profile field validation breaks ACPjaviexin2015-06-231-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure new step is calculated only if no error has been identified during validation. Also, cleanup redundant code in acp_profile.php. PHPBB3-13960
* | | | | | | [ticket/14222] Use request class instead of request_var in acp_usersMarc Alexander2015-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14222
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-10-072-6/+22
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_users.php
| * | | | | | Merge pull request #3440 from CHItA/ticket/13636Marc Alexander2015-10-072-6/+22
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13636] Deleting inactive user in acp_users gives unexpected link
| | * | | | | | [ticket/13636] Fix coding styleMateBartus2015-04-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13636
| | * | | | | | [ticket/13636] Deleting inactive user in acp_users gives unexpected linkMateBartus2015-02-242-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change "referer" to "redirect" in variable names and GET params as well. PHPBB3-13636
| | * | | | | | [ticket/13636] Deleting inactive user in acp_users gives unexpected linkMateBartus2015-02-242-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Success message did not provide the expected "previous page" link (acp_inactive was expected, but the link took users to acp_users) if the acp_users module was accessed by navigating from the inactive user list to acp_users and then deleting inactive user. PHPBB3-13636
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-10-071-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3615 from rxu/ticket/13846Marc Alexander2015-10-071-0/+1
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | [ticket/13846] Fix softdelete feature workflow in viewtopic
| | * | | | | | [ticket/13846] Fix MCP to disallow softdeleted posts deletion if not permitted.rxu2015-07-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13846
* | | | | | | | Merge pull request #3871 from Zoddo/ticket/10165Marc Alexander2015-10-071-0/+29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10165] Add a "Send test email" feature
| * | | | | | | | [ticket/10165] Add a "Send test email" featureZoddo2015-09-091-0/+29
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | PHPBB3-10165
* | | | | | | | [ticket/14205] Bump PHP requirement to PHP 5.4Tristan Darricau2015-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14205
* | | | | | | | Merge branch '3.1.x'Andreas Fischer2015-09-221-2/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14186] Do correct string concatenation in phpbb_mcp_sorting()
| * | | | | | | [ticket/14186] Do correct string concatenation in phpbb_mcp_sorting()Marc Alexander2015-09-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14186
* | | | | | | | [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