aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'phpbb-security/prep-release-3.1.12' into prep-r...Marc Alexander2018-01-073-2/+37
|\
| * [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-311-1/+14
| |\
| | * [ticket/security/211] Allow make_clickable() again after change to regexMarc Alexander2017-08-032-2/+1
| * | [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-012-2/+16
|\ \ \ | | |/ | |/|
| * | [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-221-1/+1
* | | [prep-release-3.2.2] Add migration for 3.2.2-RC1Marc Alexander2017-12-282-0/+41
* | | 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 #5061 from marc1706/ticket/15322Derky2017-12-271-0/+37
|\ \ \ \
| * | | | [ticket/15322] Try to make new email setting more readableMarc Alexander2017-12-131-3/+3
| * | | | [ticket/15322] Add config setting for -f parameter & remove mail function nameMarc Alexander2017-12-111-0/+37
* | | | | Merge pull request #5037 from hubaishan/ticket/14857Marc Alexander2017-12-271-0/+6
|\ \ \ \ \
| * | | | | [ticket/14857] Throw `S` from dateformat for non English languageshubaishan2017-12-241-0/+6
* | | | | | Merge pull request #5038 from JoshyPHP/ticket/15444Marc Alexander2017-12-271-0/+75
|\ \ \ \ \ \
| * | | | | | [ticket/15444] Add a migration to merge duplicate BBCodesJoshyPHP2017-12-101-0/+75
* | | | | | | Merge pull request #5053 from JoshyPHP/ticket/15468Marc Alexander2017-12-271-0/+180
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | [ticket/15468] Add a service to merge duplicate BBCodesJoshyPHP2017-12-101-0/+180
* | | | | | | Merge pull request #5046 from JoshyPHP/ticket/15457Marc Alexander2017-12-272-6/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | [ticket/15457] Updated s9e/text-formatter dependencyJoshyPHP2017-12-102-6/+5
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4868 from javiexin/ticket/15266Marc Alexander2017-12-271-52/+74
|\ \ \ \ \ \
| * | | | | | [ticket/15266] Update since, add changed, and use empty where applicableMarc Alexander2017-12-271-3/+7
| * | | | | | [ticket/15266] Expand functionality of content_visibilityjaviexin2017-12-271-0/+36
| * | | | | | [ticket/15266] Fix events in content_visibilityjaviexin2017-07-101-8/+8
| * | | | | | [ticket/15266] Fix events in content_visibilityjaviexin2017-07-091-44/+26
* | | | | | | Merge pull request #5036 from JoshyPHP/ticket/15442Marc Alexander2017-12-231-1/+1
|\ \ \ \ \ \ \
| * | | | | | | [ticket/15442] Allow unsafe HTML in bbcode.htmlJoshyPHP2017-11-071-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #5032 from rxu/ticket/15224Marc Alexander2017-12-221-2/+17
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | [ticket/15224] Fix some MySQL fulltext index searching errorsrxu2017-11-041-2/+17
| |/ / / / /
* | | | | | Merge pull request #5025 from hubaishan/ticket/15433Marc Alexander2017-12-031-0/+7
|\ \ \ \ \ \
| * | | | | | [ticket/15433] Fix phpbbcli can enable non-existent extensionhubaishan2017-12-031-0/+7
* | | | | | | [ticket/15464] Detect BBCodes in uppercase when reparsingJoshyPHP2017-11-231-2/+2
* | | | | | | Merge pull request #4976 from rubencm/ticket/15171Marc Alexander2017-11-162-1/+40
|\ \ \ \ \ \ \
| * | | | | | | [ticket/15171] Add migrationRubén Calvo2017-10-311-0/+39
| * | | | | | | [ticket/15171] Fix texformatterRubén Calvo2017-10-311-1/+1
* | | | | | | | Merge pull request #4949 from marc1706/ticket/15353Máté Bartus2017-11-153-11/+45
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | [ticket/15353] Use empty where applicableMarc Alexander2017-10-122-4/+4
| * | | | | | | [ticket/15353] Make sure users can continue update after merging file diffMarc Alexander2017-09-103-10/+44
* | | | | | | | Merge pull request #5019 from marc1706/ticket/14994Marc Alexander2017-11-011-54/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/14994] Refactor template->assign_block_varjaviexin2017-11-011-1/+1
| * | | | | | | | [ticket/14994] Refactor template->assign_block_varjaviexin2017-11-011-19/+4
| * | | | | | | | [ticket/14994] Refactor template->assign_block_varjaviexin2017-10-291-51/+46
* | | | | | | | | Merge pull request #5013 from rxu/ticket/15419Marc Alexander2017-11-011-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/15419] Fix Sphinx UTF8 search in delta indexrxu2017-10-241-1/+2
| |/ / / / / / / /
* | | | | | | | | Merge pull request #4988 from Elsensee/ticket/15389Marc Alexander2017-11-012-19/+24
|\ \ \ \ \ \ \ \ \