aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMarc Alexander2016-10-242-0/+8
|\
| * Merge pull request #4477 from rxu/ticket/14808Marc Alexander2016-10-242-0/+8
| |\ | | | | | | | | | [ticket/14808] Add template event overall_header_searchbox_after
| | * [ticket/14808] Add template event overall_header_searchbox_afterrxu2016-10-042-0/+8
| | | | | | | | | | | | PHPBB3-14808
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-10-231-9/+11
|\ \ \ | |/ /
| * | Merge pull request #4490 from kasimi/ticket/14827Marc Alexander2016-10-231-9/+11
| |\ \ | | | | | | | | | | | | [ticket/14827] Fix adding multiple form keys
| | * | [ticket/14827] Possibility to add multiple form keyskasimi2016-10-191-9/+11
| | | | | | | | | | | | | | | | PHPBB3-14827
* | | | Merge branch '3.1.x' into 3.2.xMáté Bartus2016-10-201-0/+3
|\ \ \ \ | |/ / /
| * | | Merge pull request #4482 from marc1706/ticket/14821Máté Bartus2016-10-201-0/+3
| |\ \ \ | | | | | | | | | | | | | | | [ticket/14821] Replace escaped strong tags with actual tags
| | * | | [ticket/14821] Simplify regex for converting <strong> tags back to HTMLMarc Alexander2016-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-14821
| | * | | [ticket/14821] Replace escaped strong tags with actual tagsMarc Alexander2016-10-141-0/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Everything else will still be escaped. This will however add back support for bold text in exception messages. PHPBB3-14821
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-10-123-1/+42
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.1.10' into 3.1.xMarc Alexander2016-10-125-3/+44
| |\ \ \ | | |_|/ | |/| |
| | * | Merge pull request #27 from phpbb/ticket/security-196Marc Alexander2016-10-021-0/+5
| | |\ \ | | | | | | | | | | | | | | | [ticket/security-196] Escapes the exception messages before displaying them
| | | * | [ticket/security-196] Escapes the exception messages before displaying themTristan Darricau2016-04-191-0/+5
| | | | | | | | | | | | | | | | | | | | SECURITY-196
| | * | | [prep-release-3.1.10] Add 3.1.10 migrationMarc Alexander2016-10-021-0/+36
| | | | |
| | * | | [prep-release-3.1.10] Update version numbers for 3.1.10Marc Alexander2016-10-023-3/+3
| | | | |
* | | | | Merge pull request #4476 from Nicofuma/ticket/14807Marc Alexander2016-10-105-128/+142
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14807] Updates dependencies
| * | | | | [ticket/14807] s9e/textformatter 0.8.1Tristan Darricau2016-10-102-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14807
| * | | | | [ticket/14807] Fix tests after symfony upgradeTristan Darricau2016-10-091-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14807
| * | | | | [ticket/14807] Updates s9e textformatter againTristan Darricau2016-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14807
| * | | | | [ticket/14807] Updates paragonie/random_compatTristan Darricau2016-10-092-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14807
| * | | | | [ticket/14807] Updates everything elseTristan Darricau2016-10-022-110/+118
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14807
| * | | | | [ticket/14807] Updates TwigTristan Darricau2016-10-022-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14807
* | | | | | Merge pull request #4478 from Nicofuma/ticket/14813Marc Alexander2016-10-091-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14813] Add missing functions_compatibiity in phpbbcli
| * | | | | | [ticket/14813] Add missing functions_compatibiity in phpbbcliTristan Darricau2016-10-091-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-14813
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-10-032-1/+17
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | * 3.1.x: [ticket/14802] Add test for empty/blank lines in poll options [ticket/14802] Empty/blank lines should not be additional poll options
| * | | | Merge pull request #4471 from dsinn/ticket/14802Tristan Darricau2016-10-032-1/+17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14802] Empty/blank lines should not be additional poll options * dsinn/ticket/14802: [ticket/14802] Add test for empty/blank lines in poll options [ticket/14802] Empty/blank lines should not be additional poll options
| | * | | | [ticket/14802] Add test for empty/blank lines in poll optionsDaniel Sinn2016-10-031-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14802
| | * | | | [ticket/14802] Empty/blank lines should not be additional poll optionsDaniel Sinn2016-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14802
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-10-022-0/+16
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14786] Add mcp_forum_actions_before/after events
| * | | | | Merge pull request #4467 from Senky/ticket/14786Tristan Darricau2016-10-023-0/+20
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14786] Add mcp_forum_actions_before/after events * Senky/ticket/14786: [ticket/14786] Add mcp_forum_actions_before/after events
| | * | | | | [ticket/14786] Add mcp_forum_actions_before/after eventsJakub Senko2016-09-263-0/+20
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | PHPBB3-14786
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-10-021-0/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14787] Add 1 more parameter to the core.search_modify_url_parameters
| * | | | | Merge pull request #4469 from rxu/ticket/14787-2Tristan Darricau2016-10-021-0/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14787] Add 1 more parameter to the core.search_modify_url_parameters * rxu/ticket/14787-2: [ticket/14787] Add 1 more parameter to the core.search_modify_url_parameters
| | * | | | | [ticket/14787] Add 1 more parameter to the core.search_modify_url_parametersrxu2016-09-291-0/+3
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-14787
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-10-021-3/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14801] Highlighting utf8 strings in search results
| * | | | | Merge pull request #4470 from rxu/ticket/14801Tristan Darricau2016-10-021-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14801] Highlighting utf8 strings in search results * rxu/ticket/14801: [ticket/14801] Highlighting utf8 strings in search results
| | * | | | | [ticket/14801] Highlighting utf8 strings in search resultsrxu2016-09-291-3/+3
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-14801
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-10-023-13/+29
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14789] Remove obsolete check_form_key() and add missing hashes [ticket/14789] Move form key checks to where they actually do something
| * | | | | Merge branch 'prep-release-3.1.10' into 3.1.xTristan Darricau2016-10-023-13/+29
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.10: [ticket/14789] Remove obsolete check_form_key() and add missing hashes [ticket/14789] Move form key checks to where they actually do something
| | * | | | Merge pull request #4474 from marc1706/ticket/14789Tristan Darricau2016-10-023-13/+29
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14789] Move form key checks to where they actually do something * marc1706/ticket/14789: [ticket/14789] Remove obsolete check_form_key() and add missing hashes [ticket/14789] Move form key checks to where they actually do something
| | | * | | | [ticket/14789] Remove obsolete check_form_key() and add missing hashesMarc Alexander2016-09-302-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14789
| | | * | | | [ticket/14789] Move form key checks to where they actually do somethingMarc Alexander2016-09-302-11/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14789
* | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-10-021-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14805] Ignore platform requirements while building packages
| * | | | | | Merge branch 'prep-release-3.1.10' into 3.1.xTristan Darricau2016-10-021-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * prep-release-3.1.10: [ticket/14805] Ignore platform requirements while building packages
| | * | | | | Merge pull request #4475 from marc1706/ticket/14805Tristan Darricau2016-10-022-2/+48
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14805] Ignore platform requirements while building packages * marc1706/ticket/14805: [ticket/14805] Ignore platform requirements while building packages [ticket/8301] Add log_time index
| | | * | | | [ticket/14805] Ignore platform requirements while building packagesMarc Alexander2016-10-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14805
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-10-011-0/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #4466 from Senky/ticket/14795Marc Alexander2016-10-011-0/+8
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | [ticket/14795] Merge topic views when merging topics
| | * | | | | [ticket/14795] Merge topic views when merging topicsJakub Senko2016-09-251-0/+8
| | | |_|/ / | | |/| | | | | | | | | | | | | | | PHPBB3-14795
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-21 06:09:24 +0000