aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14168] Move function for attachment deletion into classMarc Alexander2015-10-093-315/+412
| | | | PHPBB3-14168
* [ticket/14168] Use attachment upload class in message_parserMarc Alexander2015-10-092-21/+7
| | | | PHPBB3-14168
* [ticket/14168] Further split up attachment upload classMarc Alexander2015-10-091-61/+94
| | | | PHPBB3-14168
* [ticket/14168] Further split up attachment upload classMarc Alexander2015-10-091-52/+78
| | | | PHPBB3-14168
* [ticket/14168] Split thumbnail creation to separate methodMarc Alexander2015-10-091-0/+15
| | | | PHPBB3-14168
* [ticket/14168] Use language class and fix incorrect docblockMarc Alexander2015-10-091-6/+6
| | | | PHPBB3-14168
* [ticket/14168] Add attachment upload classMarc Alexander2015-10-093-167/+285
| | | | PHPBB3-14168
* [ticket/14225] Inject the loader resolver when using the delegating loaderTristan Darricau2015-10-081-0/+1
| | | | PHPBB3-14225
* 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'Marc Alexander2015-10-081-0/+43
|\ \ \ | |/ /
| * | Merge pull request #3844 from rxu/ticket/14113Marc Alexander2015-10-081-0/+43
| |\ \ | | | | | | | | | | | | [ticket/14113] Add core events for customizing members search
| | * | [ticket/14113] Add core events for customizing members searchrxu2015-10-081-0/+43
| | |/ | | | | | | | | | | | | | | | Add core events to the memberlist.php for customizing members search. PHPBB3-14113
* | | Merge branch '3.1.x'Tristan Darricau2015-10-082-0/+3
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/14219] Add email to inactive user listing
| * | Merge pull request #3951 from RMcGirr83/ticket_14219Tristan Darricau2015-10-082-0/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [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-082-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | in ACP. May help in spotting spam accounts quickly PHPBB3-14219
* | | | Merge branch '3.1.x'Tristan Darricau2015-10-083-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 3.1.x: [ticket/13934] Add enctype clause for profile fields
| * | | Merge pull request #3733 from javiexin/ticket/13934Tristan Darricau2015-10-083-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13934] Add enctype clause for profile fields * javiexin/ticket/13934: [ticket/13934] Add enctype clause for profile fields
| | * | | [ticket/13934] Add enctype clause for profile fieldsjaviexin2015-06-303-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a template variable (the same) in all places where profile fields may need an enctype clause in the corresponding forms. PHPBB3-13934
* | | | | 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
* | | | | Merge branch '3.1.x'Marc Alexander2015-10-081-3/+51
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3824 from rxu/ticket/14088Marc Alexander2015-10-081-3/+51
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14088] Add more core events to the search.php
| | * | | | [ticket/14088] Add more core events to the search.phprxu2015-08-111-3/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add more vars to the core.search_get_topic_data event. PHPBB3-14088
* | | | | | Merge pull request #3948 from Nicofuma/ticket/14220Máté Bartus2015-10-088-202/+464
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/14220] Move route loading to services
| * | | | | | [ticket/14220] Move route loading to servicesTristan Darricau2015-10-088-202/+464
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14220
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-10-082-0/+32
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | | | | | | | Conflicts: phpBB/styles/prosilver/template/viewforum_body.html phpBB/styles/subsilver2/template/viewforum_body.html
| * | | | | Merge pull request #3820 from rxu/ticket/14080Marc Alexander2015-10-083-0/+40
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | [ticket/14080] Add template events around the topic row in viewforum_body.html
| | * | | | [ticket/14080] Add template events around the topic row in viewforum_body.htmlrxu2015-08-093-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14080
* | | | | | Merge pull request #3949 from hanakin/ticket/14221Marc Alexander2015-10-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14221]Fix the header
| * | | | | | [ticket/14221]Fix the headerMichael Miday2015-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14221
* | | | | | | [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-074-4/+14
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3615 from rxu/ticket/13846Marc Alexander2015-10-074-4/+14
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13846] Fix softdelete feature workflow in viewtopic
| | * | | | | | [ticket/13846] Fix MCP to disallow softdeleted posts deletion if not permitted.rxu2015-07-302-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13846
| | * | | | | | [ticket/13846] Fix softdelete feature workflow in viewtopicrxu2015-05-172-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: - For permanent deletion of softdeleted post, disapprove mode has been changed to delete mode; - If post delete and softdelete are allowed, delete button triggers softdelete mode; - If a user can't permanently delete posts but can restore softdeleted posts, delete button won't be displayed for softdeleted posts. Subsilver2 is unaffected. PHPBB3-13846
* | | | | | | | Merge pull request #3871 from Zoddo/ticket/10165Marc Alexander2015-10-073-0/+41
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10165] Add a "Send test email" feature
| * | | | | | | | [ticket/10165] Add more information when sending the test emailZoddo2015-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10165
| * | | | | | | | [ticket/10165] Add a "Send test email" featureZoddo2015-09-093-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10165
* | | | | | | | | Merge pull request #3857 from Nicofuma/ticket/14124Marc Alexander2015-10-079-4/+111
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14124] Automatically translate exceptions in CLI
| * | | | | | | | | [ticket/14124] CSTristan Darricau2015-08-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14124