aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14733] Use new interface to preserve backwards compatibilityMarc Alexander2016-10-033-10/+79
| | | | PHPBB3-14733
* [ticket/14733] Use default cost factor in bcrypt constructorMarc Alexander2016-10-031-1/+2
| | | | PHPBB3-14733
* [ticket/14733] Support increasing hashing cost factorMarc Alexander2016-10-037-6/+75
| | | | PHPBB3-14733
* 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
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-10-011-0/+46
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4465 from Senky/ticket/8301Marc Alexander2016-10-011-0/+46
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | [ticket/8301] Add log_time index
| | * | | [ticket/8301] Add log_time indexJakub Senko2016-09-251-0/+46
| | |/ / | | | | | | | | | | | | PHPBB3-8301
* | | | Merge pull request #4473 from rxu/ticket/14799-1Marc Alexander2016-09-301-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/14799] Remove accidentally added whitespaces into 3.2.x and master
| * | | | [ticket/14799] Remove accidentally added whitespaces into 3.2.x and masterrxu2016-10-011-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-14799
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-09-281-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 3.1.x: [ticket/14799] purge_notifications() should not leave open transactions.
| * | | Merge branch 'prep-release-3.1.10' into 3.1.xTristan Darricau2016-09-281-0/+1
| |\ \ \ | | |/ / | |/| / | | |/ | | | * prep-release-3.1.10: [ticket/14799] purge_notifications() should not leave open transactions.
| | * Merge pull request #4468 from markshawtoronto/ticket/14799Tristan Darricau2016-09-284-3/+4
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14799] purge_notifications() should not leave open transactions. * markshawtoronto/ticket/14799: [ticket/14799] purge_notifications() should not leave open transactions. [3.1.x] Increase version for 3.1.11 development
| | | * [ticket/14799] purge_notifications() should not leave open transactions.markshawtoronto2016-09-271-0/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | When running purge_notifications(), if a notification type does not exist then a db transaction is started but never completed. On an error in get_notification_type_id(), end the transaction. PHPBB3-14799
* | | Merge pull request #4463 from marc1706/ticket/14797Tristan Darricau2016-09-255-7/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14797] Support PHP 7.1 and clearly state support for latest versions * marc1706/ticket/14797: [ticket/14797] Support PHP 7.1 and clearly state support for latest versions
| * | | [ticket/14797] Support PHP 7.1 and clearly state support for latest versionsMarc Alexander2016-09-255-7/+6
| | | | | | | | | | | | | | | | PHPBB3-14797
* | | | Merge pull request #4265 from Senky/ticket/10809Tristan Darricau2016-09-2521-636/+7
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | [ticket/10809] Remove MSSQL support * Senky/ticket/10809: [ticket/10809] Reflect MSSQL removal in docs files [ticket/10809] Remove MSSQL support
| * | | [ticket/10809] Reflect MSSQL removal in docs filesJakub Senko2016-08-022-3/+3
| | | | | | | | | | | | | | | | PHPBB3-10809
| * | | [ticket/10809] Remove MSSQL supportJakub Senko2016-08-0219-633/+4
| | | | | | | | | | | | | | | | PHPBB3-10809
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-242-1/+119
|\ \ \ \ | | |/ / | |/| |
| * | | [3.1.x] Increase version for 3.1.11 developmentMarc Alexander2016-09-243-3/+3
| | | |
| * | | Merge branch 'prep-release-3.1.10' into 3.1.xMarc Alexander2016-09-248-9/+127
| |\ \ \ | | | |/ | | |/|
| | * | [prep-release-3.1.10] Add changelog for 3.1.10-RC1Marc Alexander2016-09-241-1/+83
| | | |
| | * | [prep-release-3.1.10] Add migration for 3.1.10-RC1Marc Alexander2016-09-241-0/+36
| | | |
| | * | [prep-release-3.1.10] Update version to 3.1.10-RC1Marc Alexander2016-09-246-8/+8
| |/ /
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-242-0/+16
|\ \ \ | |/ /
| * | Merge pull request #4461 from marc1706/ticket/14785Marc Alexander2016-09-242-0/+16
| |\ \ | | | | | | | | | | | | [ticket/14785] Add template event overall_header_headerbar_after/before