aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* [master] Update version to 3.2.0-a2-devTristan Darricau2015-11-231-1/+1
* Merge branch 'prep-release-3.2.0-a1'Tristan Darricau2015-11-231-1/+1
|\
| * [prep-release-3.2.0-a1] Update version to 3.2.0-a1Tristan Darricau2015-11-091-1/+1
* | Merge branch '3.1.x'Marc Alexander2015-11-121-10/+11
|\ \
| * \ Merge pull request #3910 from kinerity/ticket/14170Marc Alexander2015-11-121-10/+11
| |\ \
| | * | [ticket/14170] Revert mcp_change_poster_after @since changeKailey Truscott2015-10-131-1/+2
| | * | [ticket/14170] Fix mcp_change_poster_after eventKailey Truscott2015-09-161-11/+11
* | | | Merge branch '3.1.x'Marc Alexander2015-11-121-1/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | [ticket/14276] Adjust function get_folder_statusRichard McGirr2015-11-071-1/+1
* | | Merge branch '3.1.x'Oliver Schramm2015-11-061-12/+53
|\ \ \ | |/ /
| * | Merge pull request #3975 from prototech/ticket/11971Oliver Schramm2015-11-061-12/+53
| |\ \
| | * | [ticket/11971] Validate "Spambot countermeasures" settings before saving.Cesar G2015-10-141-12/+53
* | | | Merge pull request #3995 from CHItA/ticket/14044Tristan Darricau2015-11-033-541/+4
|\ \ \ \
| * | | | [ticket/14044] global $table_prefix in constants.phpMate Bartus2015-10-281-0/+3
| * | | | [ticket/14044] Deduplicate the installersMate Bartus2015-10-222-541/+1
* | | | | Merge branch '3.1.x'Andreas Fischer2015-11-021-2/+3
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #3983 from prototech/ticket/13831Andreas Fischer2015-11-021-2/+3
| |\ \ \ \
| | * | | | [ticket/13831] Store provided reason when deleting from Mod. Queue module.Cesar G2015-10-141-2/+3
* | | | | | Merge branch '3.1.x'Cesar G2015-10-221-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | [ticket/14249] Fix online list orderOliver Schramm2015-10-211-1/+1
* | | | | Merge branch '3.1.x'Tristan Darricau2015-10-191-0/+11
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3666 from marc1706/ticket/9252Tristan Darricau2015-10-191-0/+11
| |\ \ \ \
| | * | | | [ticket/9252] Do not try to disapprove a post that was just approvedMarc Alexander2015-05-301-0/+11
* | | | | | Merge branch '3.1.x'Marc Alexander2015-10-171-31/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/13945] Send reactivation requests to admins using notifications system.Cesar G2015-10-151-31/+6
* | | | | | Merge branch '3.1.x'Marc Alexander2015-10-151-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/12616] Remove report notifications when post is deleted/disapproved.Cesar G2015-10-141-0/+1
| | |/ / / | |/| | |
* | | | | Merge branch '3.1.x'Tristan Darricau2015-10-141-11/+20
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3900 from Zoddo/ticket/14159Tristan Darricau2015-10-141-10/+19
| |\ \ \ \
| | * | | | [ticket/14159] Hide version info on ACP if we don't have the permissionZoddo2015-09-121-10/+19
* | | | | | Merge branch '3.1.x'Tristan Darricau2015-10-141-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/9153] Allow users without u_sendpm permission to delete existing PM's.Cesar G2015-10-141-1/+1
| | |_|/ / | |/| | |
* | | | | [ticket/10572] Remove excessive new lineMarc Alexander2015-10-141-1/+0
* | | | | Merge branch '3.1.x'Tristan Darricau2015-10-1415-34/+124
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/10572] Unguarded includes in acp filesRichard McGirr2015-10-1315-36/+132
* | | | | Merge pull request #3965 from marc1706/ticket/14234Tristan Darricau2015-10-149-56/+122
|\ \ \ \ \
| * | | | | [ticket/14234] Fix event doc blocksMarc Alexander2015-10-123-3/+2
| * | | | | [ticket/14234] Get rid of undefined variablesMarc Alexander2015-10-122-13/+4
| * | | | | [ticket/14234] Fix change version and remove more referencesMarc Alexander2015-10-128-34/+83
| * | | | | [ticket/14234] Replace more references with variablesMarc Alexander2015-10-122-8/+19
| * | | | | [ticket/14234] Use replacement variables instead of references in eventsMarc Alexander2015-10-122-8/+24
* | | | | | Merge pull request #3913 from marc1706/ticket/14168Tristan Darricau2015-10-148-547/+75
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [ticket/14168] Correctly state return type of upload and upload_attachmentMarc Alexander2015-10-121-1/+1
| * | | | | [ticket/14168] Use attachment manager instead of separate classesMarc Alexander2015-10-128-57/+57
| * | | | | [ticket/14168] Fix CS issueMarc Alexander2015-10-091-1/+1
| * | | | | [ticket/14168] No longer use deprecated functions in core filesMarc Alexander2015-10-097-29/+42
| * | | | | [ticket/14168] Move phpbb_unlink() into attachment delete classMarc Alexander2015-10-091-16/+8
| * | | | | [ticket/14168] Minor coding style fixesMarc Alexander2015-10-091-1/+1
| * | | | | [ticket/14168] Unset prototype classes after useMarc Alexander2015-10-092-1/+4
| * | | | | [ticket/14168] Move function for attachment deletion into classMarc Alexander2015-10-091-315/+6