aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/15918] Apply the Twig escape filter to not add-slashed contents3D-I2018-12-241-2/+2
* [ticket/15918] Remove redundant escape JS3D-I2018-12-241-3/+3
* Merge pull request #1 from phpbb/3.2.x3Di2018-12-2425-34/+302
|\
| * Merge pull request #5479 from kasimi/ticket/15904Marc Alexander2018-12-231-1/+2
| |\
| | * [ticket/15904] Fix counting empty template blockskasimi2018-12-081-1/+2
| * | Merge branch 'prep-release-3.2.5' into 3.2.xMarc Alexander2018-12-2215-22/+210
| |\ \ | | |/ | |/|
| | * [prep-release-3.2.5] Add 3.2.5 migrationMarc Alexander2018-12-191-0/+38
| | * [prep-release-3.2.5] Update changelog for 3.2.5Marc Alexander2018-12-191-0/+13
| | * [prep-release-3.2.5] Update version numbers to 3.2.5Marc Alexander2018-12-194-5/+5
| | * Merge pull request #43 from phpbb/security/229Marc Alexander2018-12-193-4/+49
| | |\
| | | * [security/229] Adjust effectively_installed on jquery update migrationMarc Alexander2018-12-131-1/+1
| | | * [security/229] Add ajax prefilter for crossdomain requestsMarc Alexander2018-12-111-0/+7
| | | * [security/229] Update jQuery CDN linkMarc Alexander2018-12-091-0/+37
| | | * [SECURITY/229] Update jQuery to 1.12.4Marc Alexander2018-12-091-4/+5
| | * | Merge pull request #5483 from marc1706/ticket/15911Marc Alexander2018-12-193-5/+32
| | |\ \
| | | * | [ticket/15911] Add missing bracesMarc Alexander2018-12-181-0/+2
| | | * | [ticket/15911] Resolve warnings when updating from 3.0.0 to latestMarc Alexander2018-12-182-3/+6
| | | * | [ticket/15911] Prevent errors when trying to delete from non-existent tablesMarc Alexander2018-12-181-2/+24
| | |/ /
| | * | Merge pull request #5470 from marc1706/ticket/15888Marc Alexander2018-12-161-1/+1
| | |\ \
| | | * | [ticket/15888] Changing ACP link from 3.1 to 3.2 docsJim Mossing Holsteyn2018-12-031-1/+1
| | | |/
| | * | Merge pull request #5466 from marc1706/ticket/15893Marc Alexander2018-12-164-9/+74
| | |\ \ | | | |/ | | |/|
| | | * [ticket/15893] Pass needed language class directly to format quoteMarc Alexander2018-12-024-15/+28
| | | * [ticket/15893] Add test for covering phpbb_format_quoteMarc Alexander2018-12-021-0/+52
| | |/
| * | [3.2.x] Update versions to 3.2.6-devMarc Alexander2018-12-013-3/+3
| * | Merge branch 'prep-release-3.2.5' into 3.2.xMarc Alexander2018-12-018-7/+66
| |\ \ | | |/
| | * [prep-release-3.2.5] Update changelog for 3.2.5-RC1Marc Alexander2018-11-291-0/+23
| | * [prep-release-3.2.5] Add 3.2.5-RC1 migrationMarc Alexander2018-11-291-0/+36
| | * [prep-release-3.2.5] Update version numbers for 3.2.5Marc Alexander2018-11-292-3/+3
| | * [prep-release-3.2.5] Update version numbers for 3.2.5-RC1Marc Alexander2018-11-294-4/+4
| |/
| * Merge pull request #5455 from toxyy/ticket-15879Marc Alexander2018-11-291-0/+14
| |\
| | * [ticket/15879] Add core.posting_modify_default_variablesAlec2018-11-241-0/+14
| * | Merge pull request #5451 from vinny/ticket/15867Marc Alexander2018-11-291-1/+1
| |\ \
| | * | [ticket/15867] Add class for message field in the contact formVinny2018-11-111-1/+1
| * | | Merge pull request #5449 from senky/ticket/15878Marc Alexander2018-11-281-0/+3
| |\ \ \
| | * | | [ticket/15878] Add attachments to ucp_pm_view_messageJakub Senko2018-11-191-0/+3
| * | | | Merge pull request #5443 from toxyy/ticket/15872Marc Alexander2018-11-281-2/+5
| |\ \ \ \
| | * | | | [ticket/15872] Add show_user_activity to display_user_activity_modify_activesAlec2018-11-121-2/+5
| | | |/ / | | |/| |
| * | | | Merge pull request #5427 from dark-1/ticket/15858Marc Alexander2018-11-271-2/+2
| |\ \ \ \ |/ / / / /
| * | | | [ticket/15858] Unapproved User(s) appearing as Guest in Team PageDarkā¶2018-10-291-2/+2
* | | | | Merge pull request #5450 from hubaishan/ticket/15665Marc Alexander2018-11-261-0/+8
|\ \ \ \ \
| * | | | | [ticket/15665] fix double semicolonhubaishan2018-11-201-1/+1
| * | | | | [ticket/15665] Fix MSSQL crashes if upload dir>2GBhubaishan2018-11-201-0/+8
* | | | | | Merge pull request #5432 from 3D-I/ticket/15859Marc Alexander2018-11-251-0/+14
|\ \ \ \ \ \
| * | | | | | [ticket/15859] Add core.viewforum_modify_topic_ordering3D-I2018-11-181-1/+1
| * | | | | | [ticket/15859] Add core.viewforum_modify_topic_ordering3D-I2018-11-111-1/+1
| * | | | | | [ticket/15859] Add core.viewforum_modify_topic_ordering3D-I2018-10-291-0/+14
| * | | | | | Merge pull request #2 from phpbb/3.2.x3Di2018-10-2647-376/+964
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge pull request #5454 from rxu/ticket/15881Marc Alexander2018-11-251-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | [ticket/15881] Reset login keys for account reactivation after password updaterxu2018-11-241-0/+2
|/ / / / / / /
* | | | | | | Merge pull request #5433 from marc1706/ticket/15542Marc Alexander2018-11-201-1/+6
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |