aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5580 from mrgoldy/ticket/16039origin/3.2.xMarc Alexander2019-05-011-1/+1
|\ | | | | | | [ticket/16039] Global dispatcher
| * [ticket/16039] Global dispatchermrgoldy2019-05-011-1/+1
|/ | | | PHPBB3-16039
* Merge branch 'prep-release-3.2.6' into 3.2.xMarc Alexander2019-04-2923-29/+236
|\
| * [prep-release-3.2.6] Update Changelog and add missing preg_matchMarc Alexander2019-04-282-2/+3
| |
| * [prep-release-3.2.6] Update changelog for 3.2.6Marc Alexander2019-04-281-0/+18
| |
| * [prep-release-3.2.6] Add migration to 3.2.6Marc Alexander2019-04-271-0/+39
| |
| * [prep-release-3.2.6] Update to 3.2.6 versionMarc Alexander2019-04-274-5/+5
| |
| * [prep-release-3.2.6] Fix expected data in avatar manager testMarc Alexander2019-04-271-1/+1
| |
| * Merge pull request #48 from phpbb/ticket/security/228Marc Alexander2019-04-274-2/+22
| |\ | | | | | | | | | [ticket/security/228] Add form token to login box
| | * [ticket/security/228] Add form token to login boxDerky2019-04-264-2/+22
| | | | | | | | | | | | SECURITY-228
| * | Merge pull request #47 from phpbb/ticket/security/233Marc Alexander2019-04-273-2/+46
| |\ \ | | | | | | | | | | | | [ticket/security/233] Make smtp_password and smtp_username dynamic
| | * | [ticket/security/233] Fix invalid INSERT INTOMarc Alexander2019-04-211-2/+2
| | | | | | | | | | | | | | | | SECURITY-233
| | * | [ticket/security/233] Make smtp_password and smtp_username dynamicMarc Alexander2019-04-213-2/+46
| | | | | | | | | | | | | | | | SECURITY-233
| * | | Merge pull request #46 from phpbb/ticket/security/231Marc Alexander2019-04-274-4/+39
| |\ \ \ | | | | | | | | | | | | | | | [ticket/security/231] Disable remote avatar functionality & add warning
| | * | | [ticket/security/231] Disable remote avatar functionality & add warningMarc Alexander2019-04-174-4/+39
| | | |/ | | |/| | | | | | | | | SECURITY-231
| * | | Merge pull request #45 from phpbb/ticket/security/234Marc Alexander2019-04-274-4/+26
| |\ \ \ | | | | | | | | | | | | | | | [ticket/security/234] Add URL validation for input fields & main site URL
| | * | | [ticket/security/234] Add test for URL validationMarc Alexander2019-04-141-1/+9
| | | | | | | | | | | | | | | | | | | | SECURITY-234
| | * | | [ticket/security/234] Add URL validation for input fieldsMarc Alexander2019-04-143-3/+17
| | |/ / | | | | | | | | | | | | SECURITY-234
| * | | Merge pull request #44 from phpbb/ticket/security/235Marc Alexander2019-04-272-13/+33
| |\ \ \ | | | | | | | | | | | | | | | Ticket/security/235 Wildcard char count in search
| | * | | [ticket/security/235] Update search native testsMarc Alexander2019-04-261-4/+4
| | | | | | | | | | | | | | | | | | | | SECURITY-235
| | * | | [ticket/security/235] Only allow one wildcard in the search query to limit ↵Derky2019-04-261-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the database load SECURITY-235
| | * | | [ticket/security/235] Use whitespace instead of word boundary regex to ↵Derky2019-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove wildcards This fixes removing the wildcard in the following search query: *.test SECURITY-235
| | * | | [ticket/security/235] Remove non trailing wildcards from search keywordsDerky2019-04-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Database indexes are only used if wildcards are used at the end. SECURITY-235
| | * | | [ticket/security/235] Apply wildcard char count patchDerky2019-03-141-9/+15
| | | | | | | | | | | | | | | | | | | | SECURITY-235
| * | | | Merge pull request #5576 from marc1706/ticket/16027Marc Alexander2019-04-271-0/+8
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | [ticket/16027] Force clearing of cache folder on install for functional
| | * | | [ticket/16027] Force clearing of cache folder on install for functionalMarc Alexander2019-04-241-0/+8
| |/ / / | | | | | | | | | | | | PHPBB3-16027
* | | | [3.2.x] Update versions to 3.2.7-devMarc Alexander2019-04-213-5/+5
| | | |
* | | | Merge branch 'prep-release-3.2.6' into 3.2.xMarc Alexander2019-04-218-7/+109
|\| | |
| * | | [prep-release-3.2.6] Update changelog for 3.2.6-RC1Marc Alexander2019-04-201-0/+65
| | | |
| * | | [prep-release-3.2.6] Add migration for 3.2.6-RC1Marc Alexander2019-04-201-0/+37
| | | |
| * | | [prep-release-3.2.6] Update version numbers for 3.2.6 release processMarc Alexander2019-04-202-3/+3
| | | |
| * | | [prep-release-3.2.6] Update version numbers for 3.2.6-RC1Marc Alexander2019-04-204-4/+4
|/ / /
* | | Merge pull request #5570 from dark-1/ticket/16020Marc Alexander2019-04-201-1/+1
|\ \ \ | | | | | | | | | | | | [ticket/16020] Fix some mistake from PHPBB3-15827
| * | | [ticket/16020] Fix some mistake from PHPBB3-15827Dark❶2019-04-191-1/+1
| | | | | | | | | | | | | | | | PHPBB3-16020
* | | | Merge pull request #5567 from marc1706/ticket/16018Marc Alexander2019-04-202-138/+139
|\ \ \ \ | |/ / / |/| | | | | | | [ticket/16018] Update composer to 1.8.5, symfony & dependencies to latest
| * | | [ticket/16018] Update composer to 1.8.5, symfony & dependencies to latestMarc Alexander2019-04-172-138/+139
| | | | | | | | | | | | | | | | PHPBB3-16018
* | | | Merge pull request #5559 from mrgoldy/ticket/16007Marc Alexander2019-04-174-7/+38
|\ \ \ \ | |/ / / |/| | | | | | | [ticket/16007] Show ban message for OAuth login
| * | | [ticket/16007] Correct check_ban_test to booleanmrgoldy2019-04-021-1/+2
| | | | | | | | | | | | | | | | PHPBB3-16007
| * | | [ticket/16007] No strict comparison against "false"mrgoldy2019-04-023-4/+7
| | | | | | | | | | | | | | | | PHPBB3-16007
| * | | [ticket/16007] Show ban message for OAuth loginmrgoldy2019-04-023-6/+33
| | | | | | | | | | | | | | | | PHPBB3-16007
* | | | Merge pull request #5513 from mrgoldy/ticket/15942Marc Alexander2019-04-173-16/+41
|\ \ \ \ | |_|_|/ |/| | | | | | | [ticket/15942] Allow array in confirm_box title
| * | | [ticket/15942] Add language to compatibility globals & use in confirm_boxMarc Alexander2019-04-172-9/+16
| | | | | | | | | | | | | | | | PHPBB3-15942
| * | | [ticket/15942] Past tensemrgoldy2019-04-161-1/+1
| | | | | | | | | | | | | | | | PHPBB3-15942
| * | | [ticket/15942] Update DocBlockmrgoldy2019-04-161-0/+2
| | | | | | | | | | | | | | | | PHPBB3-15942
| * | | [ticket/15942] Optimize countmrgoldy2019-01-151-4/+6
| | | | | | | | | | | | | | | | PHPBB3-15942
| * | | [ticket/15942] Allow array in confirm_box titlemrgoldy2019-01-152-9/+23
| | | | | | | | | | | | | | | | PHPBB3-15942
* | | | Merge pull request #5534 from battye/ticket/15917Marc Alexander2019-04-132-1/+9
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/15917] Unapproved topics message for forums with no other posts
| * | | | [ticket/15917] Remove br tagsbattye2019-04-071-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-15917
| * | | | [ticket/15917] Special unapproved topics messagebattye2019-02-132-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For forums that have no approved posts but also have topics awaiting approval, to avoid the inconsistency of saying 'no posts' alongside a positive post count. PHPBB3-15917
* | | | | Merge pull request #5484 from rxu/ticket/15915Marc Alexander2019-04-122-2/+50
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/15915] Add template events to posting_attach_body.html