aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Tristan Darricau2015-10-141-1/+1
|\ | | | | | | | | * 3.1.x: [ticket/9153] Allow users without u_sendpm permission to delete existing PM's.
| * [ticket/9153] Allow users without u_sendpm permission to delete existing PM's.Cesar G2015-10-141-1/+1
| | | | | | | | | | | | | | | | | | The u_sendpm check in ucp_pm.php is merely for the purpose of displaying the error message within the UCP template. Otherwise it could be removed as compose_pm() will check the appropriate permission pertaining to the attempted action. PHPBB3-9153
* | [ticket/10572] Remove excessive new lineMarc Alexander2015-10-141-1/+0
| | | | | | | | PHPBB3-10572
* | Merge branch '3.1.x'Tristan Darricau2015-10-1415-34/+124
|\ \ | |/ | | | | | | * 3.1.x: [ticket/10572] Unguarded includes in acp files
| * [ticket/10572] Unguarded includes in acp filesRichard McGirr2015-10-1315-36/+132
| | | | | | | | PHPBB3-10572
* | Merge pull request #3965 from marc1706/ticket/14234Tristan Darricau2015-10-149-56/+122
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14234] Use replacement variables instead of references in events * marc1706/ticket/14234: [ticket/14234] Fix event doc blocks [ticket/14234] Get rid of undefined variables [ticket/14234] Fix change version and remove more references [ticket/14234] Replace more references with variables [ticket/14234] Use replacement variables instead of references in events
| * | [ticket/14234] Fix event doc blocksMarc Alexander2015-10-123-3/+2
| | | | | | | | | | | | PHPBB3-14234
| * | [ticket/14234] Get rid of undefined variablesMarc Alexander2015-10-122-13/+4
| | | | | | | | | | | | PHPBB3-14234
| * | [ticket/14234] Fix change version and remove more referencesMarc Alexander2015-10-128-34/+83
| | | | | | | | | | | | PHPBB3-14234
| * | [ticket/14234] Replace more references with variablesMarc Alexander2015-10-122-8/+19
| | | | | | | | | | | | PHPBB3-14234
| * | [ticket/14234] Use replacement variables instead of references in eventsMarc Alexander2015-10-122-8/+24
| | | | | | | | | | | | PHPBB3-14234
* | | Merge pull request #3913 from marc1706/ticket/14168Tristan Darricau2015-10-148-547/+75
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14168] Refactor attachment management functions into classes * marc1706/ticket/14168: (36 commits) [ticket/14168] Correctly state return type of upload and upload_attachment [ticket/14168] Use attachment manager instead of separate classes [ticket/14168] Fix docblock in manager [ticket/14168] Add more test cases for attachment manager [ticket/14168] Add new test method and more tests [ticket/14168] Fix tabs in manager and add test file [ticket/14168] Fix tests after rebase [ticket/14168] Add attachment manager service [ticket/14168] Use correct docblock [ticket/14168] Add services_attachment.yml to services.yml [ticket/14168] Minor coding style fixes [ticket/14168] Move attachment service definitions to services_attachment [ticket/14168] Improve code coverage in upload class [ticket/14168] Move image check and don't use trigger_error() [ticket/14168] Add tests for init_error() during upload [ticket/14168] Add basic test file for attachments upload [ticket/14168] Fix CS issue [ticket/14168] No longer use deprecated functions in core files [ticket/14168] Move phpbb_unlink() into attachment delete class [ticket/14168] Reset sequence before tests in delete tests ...
| * | [ticket/14168] Correctly state return type of upload and upload_attachmentMarc Alexander2015-10-121-1/+1
| | | | | | | | | | | | PHPBB3-14168
| * | [ticket/14168] Use attachment manager instead of separate classesMarc Alexander2015-10-128-57/+57
| | | | | | | | | | | | PHPBB3-14168
| * | [ticket/14168] Fix CS issueMarc Alexander2015-10-091-1/+1
| | | | | | | | | | | | PHPBB3-14168
| * | [ticket/14168] No longer use deprecated functions in core filesMarc Alexander2015-10-097-29/+42
| | | | | | | | | | | | PHPBB3-14168
| * | [ticket/14168] Move phpbb_unlink() into attachment delete classMarc Alexander2015-10-091-16/+8
| | | | | | | | | | | | PHPBB3-14168
| * | [ticket/14168] Minor coding style fixesMarc Alexander2015-10-091-1/+1
| | | | | | | | | | | | PHPBB3-14168
| * | [ticket/14168] Unset prototype classes after useMarc Alexander2015-10-092-1/+4
| | | | | | | | | | | | PHPBB3-14168
| * | [ticket/14168] Move function for attachment deletion into classMarc Alexander2015-10-091-315/+6
| | | | | | | | | | | | PHPBB3-14168
| * | [ticket/14168] Use attachment upload class in message_parserMarc Alexander2015-10-091-20/+7
| | | | | | | | | | | | PHPBB3-14168
| * | [ticket/14168] Add attachment upload classMarc Alexander2015-10-091-167/+9
| | | | | | | | | | | | PHPBB3-14168
* | | Merge remote-tracking branch 'upstream/3.1.x'Tristan Darricau2015-10-121-1/+17
|\ \ \ | | |/ | |/| | | | | | | * upstream/3.1.x: [ticket/14188] Add core.acp_styles_action_before event
| * | Merge pull request #3922 from Senky/ticket/14188Tristan Darricau2015-10-121-1/+17
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14188] Add core.acp_styles_action_before event * Senky/ticket/14188: [ticket/14188] Add core.acp_styles_action_before event
| | * | [ticket/14188] Add core.acp_styles_action_before eventJakub Senko2015-09-231-1/+17
| | | | | | | | | | | | | | | | PHPBB3-14188
* | | | Merge branch '3.1.x'Tristan Darricau2015-10-121-0/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14212] Fix version number [ticket/14212] Adding event after users have been removed to a group
| * | | Merge pull request #3944 from Wardormeur/ticket/14212Tristan Darricau2015-10-121-0/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14212] Adding event after users have been removed to a group * Wardormeur/ticket/14212: [ticket/14212] Fix version number [ticket/14212] Adding event after users have been removed to a group
| | * | | [ticket/14212] Fix version numberWardormeur2015-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for core.group_delete_user_after event PHPBB-14212
| | * | | [ticket/14212] Adding event after users have been removed to a groupWardormeur2015-10-041-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea is to be able to map with others CMS by exposing most commons user configuration & changes. Difference between the event before and after group belonging removal is that users belongs to multiple groups, so that the belonging into a group also depends on the others groups (and not only the deleted one), which is not reflected before as the user is not yet deleted PHPBB-14212
* | | | | Merge branch '3.1.x'Tristan Darricau2015-10-121-7/+12
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/13591] Change SQL query into array to allow
| * | | | Merge pull request #3946 from RMcGirr83/ticket_13591Tristan Darricau2015-10-121-7/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13591] Change SQL query into array to allow * RMcGirr83/ticket_13591: [ticket/13591] Change SQL query into array to allow
| | * | | | [ticket/13591] Change SQL query into array to allowRMcGirr832015-10-081-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extension authors to modify SQL query PHPBB3-13591
* | | | | | Merge branch '3.1.x'Tristan Darricau2015-10-121-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14200] Allow hidden users to see himself on viewonline
| * | | | | Merge pull request #3957 from Zoddo/ticket/14200Tristan Darricau2015-10-121-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14200] Allow hidden users to see himself on viewonline * Zoddo/ticket/14200: [ticket/14200] Allow hidden users to see himself on viewonline
| | * | | | | [ticket/14200] Allow hidden users to see himself on viewonlineZoddo2015-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14200
* | | | | | | [ticket/13993] Do not parse signatures as posts when editing them.Cesar G2015-10-113-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation of PHPBB3-12516 changed the manual use of the message parser to using generate_text_for_storage(). The function does not support parse_message::parse()'s mode parameter, thus all the error checks on the sig are invalid. PHPBB3-13993
* | | | | | | 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