aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'phpbb-security/prep-release-3.1.12' into prep-r...Marc Alexander2018-01-076-4/+83
|\
| * [prep-release-3.1.12] Update changelog for 3.1.12Marc Alexander2017-12-311-0/+44
| * [prep-release-3.1.12] Add migration for 3.1.12Marc Alexander2017-12-311-0/+36
| * Merge pull request #40 from phpbb/ticket/security/211Marc Alexander2017-12-314-5/+23
| |\
| | * [ticket/security/211] Allow make_clickable() again after change to regexMarc Alexander2017-08-032-2/+1
| * | [prep-release-3.1.12] Update version numbers to 3.1.12Marc Alexander2017-12-312-2/+2
| * | [prep-release-3.1.12] Update version numbers to 3.1.12Marc Alexander2017-12-313-5/+5
| * | [ticket/15303] Correctly refer to $memcached and not $memcacheabyssmedia2017-12-311-1/+1
* | | Merge branch 'ticket/security/211' into ticket/security/211-rheaMarc Alexander2018-01-015-6/+25
|\ \ \ | | |/ | |/|
| * | [ticket/security/211] Do not match javascript URIs with URL regexesMarc Alexander2017-07-262-3/+3
| * | [ticket/security/211] Only run make_clickable() on URL type profile fieldsMarc Alexander2017-07-232-1/+15
| * | [ticket/security/211] Make sure website URL only uses http & https schemesMarc Alexander2017-07-223-2/+7
* | | [3.2.x] Update version number to 3.2.3-devMarc Alexander2017-12-282-2/+2
* | | [prep-release-3.2.2] Update changelog for 3.2.2-RC1Marc Alexander2017-12-281-0/+132
* | | [prep-release-3.2.2] Add migration for 3.2.2-RC1Marc Alexander2017-12-282-0/+41
* | | [prep-release-3.2.2] Update version to 3.2.2Marc Alexander2017-12-282-3/+3
* | | [prep-release-3.2.2] Update version to 3.2.2-RC1Marc Alexander2017-12-283-3/+3
* | | [ticket/15179] Update dependencies for 3.2.xMarc Alexander2017-12-281-102/+103
* | | Merge pull request #4971 from Elsensee/ticket/15339Marc Alexander2017-12-2810-141/+221
|\ \ \
| * | | [ticket/15339] Fix testsOliver Schramm2017-12-241-1/+1
| * | | [ticket/15339] Free sql results in migration module toolOliver Schramm2017-11-171-2/+4
| * | | [ticket/15339] Allow a module to have multiple parentsOliver Schramm2017-11-173-123/+136
| * | | [ticket/15339] Use manual method when adding modulesOliver Schramm2017-09-229-18/+83
* | | | Merge pull request #5045 from senky/ticket/15454Marc Alexander2017-12-281-2/+30
|\ \ \ \
| * | | | [ticket/15454] Add post template data to eventMarc Alexander2017-12-281-0/+2
| * | | | [ticket/15454] Add core.mcp_queue_approve_details_templateJakub Senko2017-11-131-2/+28
* | | | | Merge pull request #5044 from hubaishan/ticket/15453Marc Alexander2017-12-281-2/+15
|\ \ \ \ \
| * | | | | [ticket/15453] Add core event after language deleted in acp_language.phphubaishan2017-12-271-2/+15
| |/ / / /
* | | | | Merge pull request #5063 from vinny/ticket/15485Marc Alexander2017-12-282-1/+33
|\ \ \ \ \
| * | | | | [ticket/15485] Add missing separation below event titleMarc Alexander2017-12-271-0/+1
| * | | | | [ticket/15485] Add template event for forum imagesvinny2017-12-182-1/+32
* | | | | | Merge pull request #5040 from kasimi/ticket/15446Marc Alexander2017-12-271-0/+26
|\ \ \ \ \ \
| * | | | | | [ticket/15446] Add event core.acp_profile_actionkasimi2017-11-081-0/+26
* | | | | | | Merge pull request #5041 from kasimi/ticket/15447Marc Alexander2017-12-271-2/+21
|\ \ \ \ \ \ \
| * | | | | | | [ticket/15447] Add event core.acp_profile_modify_profile_rowkasimi2017-11-081-2/+21
| |/ / / / / /
* | | | | | | Merge pull request #5042 from kinerity/ticket/15451Marc Alexander2017-12-272-0/+18
|\ \ \ \ \ \ \
| * | | | | | | [ticket/15451] Add template event mcp_topic_postrow_attachments_before/afterKailey Truscott2017-11-132-0/+18
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #5043 from kinerity/ticket/15452Marc Alexander2017-12-272-0/+8
|\ \ \ \ \ \ \
| * | | | | | | [ticket/15452] Add template event mcp_topic_postrow_post_beforeKailey Truscott2017-11-132-0/+8
| |/ / / / / /
* | | | | | | Merge pull request #5055 from dsinn/ticket/15471Marc Alexander2017-12-274-6/+49
|\ \ \ \ \ \ \
| * | | | | | | [ticket/15471] Fix event documentation for core.prune_forums_settings_confirmDaniel Sinn2017-12-181-1/+1
| * | | | | | | [ticket/15471] Add core events to ACP when pruning a forumDaniel Sinn2017-11-304-6/+49
* | | | | | | | Merge pull request #5064 from rxu/ticket/15486Marc Alexander2017-12-271-6/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/15486] Add core event to the user_add() to modify notifications datarxu2017-12-191-6/+19
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #5061 from marc1706/ticket/15322Derky2017-12-276-16/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/15322] Adjust language variables as suggestedMarc Alexander2017-12-271-2/+2
| * | | | | | | | [ticket/15322] Adjust email language and move force sender settingMarc Alexander2017-12-162-3/+3
| * | | | | | | | [ticket/15322] Try to make new email setting more readableMarc Alexander2017-12-136-9/+9
| * | | | | | | | [ticket/15322] Add config setting for -f parameter & remove mail function nameMarc Alexander2017-12-116-14/+45
| * | | | | | | | [ticket/15322] Fix bug wrong return in emailskitsiosk2017-12-091-1/+1