aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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 '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 #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 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 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 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 '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 '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 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 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 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
* | | [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 pull request #4461 from marc1706/ticket/14785Marc Alexander2016-09-242-0/+16
|\ \ | | | | | | | | | [ticket/14785] Add template event overall_header_headerbar_after/before
| * | [ticket/14785] Add template event overall_header_headerbar_after/beforeGerB2016-09-242-0/+16
| | | | | | | | | | | | PHPBB3-14785
* | | Merge pull request #4462 from marc1706/ticket/14796Marc Alexander2016-09-241-1/+1
|\ \ \ | | | | | | | | | | | | [ticket/14796] Use log_table class member instead of table constant
| * | | [ticket/14796] Use log_table class member instead of table constantForumhulp.com2016-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Was still using the old LOG_TABLE constant in the delete method. PHPBB3-14796
* | | | Merge pull request #4394 from marc1706/ticket/14484Tristan Darricau2016-09-243-35/+399
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14484] Add possibility to use extensions in UI tests * marc1706/ticket/14484: [ticket/14484] Properly enable extensions in UI tests [ticket/14484] Move facebook/webdriver back to tests dir composer.json [ticket/14484] Move facebook webdriver to main composer.json
| * | | | [ticket/14484] Properly enable extensions in UI testsMarc Alexander2016-07-311-9/+18
| | | | | | | | | | | | | | | | | | | | PHPBB3-14484
| * | | | [ticket/14484] Move facebook/webdriver back to tests dir composer.jsonMarc Alexander2016-07-316-47/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make sure we don't try to install it to incompatible PHP 5.3.3. PHPBB3-14484
| * | | | [ticket/14484] Move facebook webdriver to main composer.jsonMarc Alexander2016-07-277-95/+410
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also updated ui test case file to have same feature set as the 3.2.x version. PHPBB3-14484
* | | | | Merge pull request #3527 from Elsensee/ticket/13709Marc Alexander2016-09-241-8/+30
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | [ticket/13709] Add fallback for email templates used by extensions
| * | | | [ticket/13709] Add fallback for email templates used by extensionsOliver Schramm2016-08-211-8/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a fallback to english for the core like we do it in $user->add_lang() PHPBB3-13709
* | | | | Merge pull request #4432 from Senky/ticket/14762Marc Alexander2016-09-241-4/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14762] Add core event to session.php
| * | | | | [ticket/14762] Add core event to session.phpJakub Senko2016-09-181-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14762
* | | | | | Merge pull request #4433 from Senky/ticket/14747Marc Alexander2016-09-241-0/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | [ticket/14747] Add post_data to core.modify_posting_auth
| * | | | | [ticket/14747] Add post_data to core.modify_posting_authJakub Senko2016-09-031-0/+3
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-14747
* | | | | Merge pull request #4460 from marc1706/ticket/14784Marc Alexander2016-09-241-2/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14784] missing rewrite for lighttpd