aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'nicofuma/ticket/14814' into 3.2.xMarc Alexander2016-11-053-8/+22
|\
| * [ticket/14814] Fix reparser cronTristan Darricau2016-11-023-8/+22
| | | | | | | | PHPBB3-14814
* | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-10-241-10/+27
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14831] Optimize code construction [ticket/14831] Add more tests against UCP modules [ticket/14831] Add more tests, better name for $e placeholder [ticket/14831] Do not throw exception on the module existence checking [ticket/14831] Fix module migrator tool
| * | [ticket/14831] Optimize code constructionrxu2016-10-241-5/+3
| | | | | | | | | | | | PHPBB3-14831
| * | [ticket/14831] Add more tests, better name for $e placeholderrxu2016-10-231-6/+6
| | | | | | | | | | | | PHPBB3-14831
| * | [ticket/14831] Do not throw exception on the module existence checkingrxu2016-10-231-7/+27
| | | | | | | | | | | | PHPBB3-14831
| * | [ticket/14831] Fix module migrator toolrxu2016-10-231-4/+3
| | | | | | | | | | | | PHPBB3-14831
* | | Merge branch '3.1.x' into 3.2.xMáté Bartus2016-10-201-0/+3
|\ \ \ | |/ /
| * | [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-122-0/+41
|\ \ \ | |/ /
| * | 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
| | | |
* | | | [ticket/14807] s9e/textformatter 0.8.1Tristan Darricau2016-10-101-1/+0
| | | | | | | | | | | | | | | | PHPBB3-14807
* | | | [ticket/14807] Updates TwigTristan Darricau2016-10-021-0/+11
| |_|/ |/| | | | | | | | PHPBB3-14807
* | | 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
* | | | [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.
| * | | [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 #4265 from Senky/ticket/10809Tristan Darricau2016-09-258-618/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10809] Remove MSSQL support * Senky/ticket/10809: [ticket/10809] Reflect MSSQL removal in docs files [ticket/10809] Remove MSSQL support
| * | | [ticket/10809] Remove MSSQL supportJakub Senko2016-08-028-618/+4
| | | | | | | | | | | | | | | | PHPBB3-10809
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-241-0/+36
|\ \ \ \ | | |/ / | |/| |
| * | | [prep-release-3.1.10] Add migration for 3.1.10-RC1Marc Alexander2016-09-241-0/+36
| | | |
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-241-1/+1
|\ \ \ \ | |/ / /
| * | | [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 branch '3.1.x' into 3.2.xMarc Alexander2016-09-241-4/+14
|\ \ \ \ | |/ / /
| * | | 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
* | | | | [ticket/14793] Fix "A non-numeric value encountered" PHP warning on PHP 7.1+rxu2016-09-222-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-14793
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-171-4/+108
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4406 from rmcgirr83/ticket/14581Marc Alexander2016-09-171-4/+108
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14581] Add core events to content_visibility
| | * | | | [ticket/14581] Add core events to content_visibilityRichard McGirr2016-08-101-4/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Events added for both changing the content visibility for both posts and topics, executing right before and after the SQL UPDATE query for setting the visibillity. https://tracker.phpbb.com/browse/PHPBB3-14581 PHPBB3-14581
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-171-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/14782] Don't use 'DISTINCT' when using 'SQL_CALC_FOUND_ROWS'DavidIQ2016-09-161-1/+1
| | | | | |
* | | | | | Merge branch '3.1.x' into 3.2.xAndreas Fischer2016-09-151-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14782] Use the $select variable in "Your Posts" search
| * | | | | [ticket/14782] Use the $select variable in "Your Posts" searchDavidIQ2016-09-131-1/+1
| | | | | |
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-09-061-1/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4426 from bantu/ticket/14109Marc Alexander2016-09-061-1/+3
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | [ticket/14109] Increase MySQL Version for InnoDB FULLTEXT Index to 5.…
| | * | | | [ticket/14109] Increase MySQL Version for InnoDB FULLTEXT Index to 5.6.8.Andreas Fischer2016-08-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required for proper overall database operation. In previous versions, InnoDB might error on ALTER statements when multiple FULLTEXT Indexes are defined. PHPBB3-14109
* | | | | | [ticket/10961] Send HTTP 403 when applicableJakub Senko2016-09-013-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10961
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-08-311-66/+117
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: phpBB/phpbb/db/migration/tool/module.php
| * | | | | Merge pull request #4377 from rxu/ticket/14703Marc Alexander2016-08-311-66/+117
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | [ticket/14703] Fix parent module selection for custom extension modules
| | * | | | [ticket/14703] Fix the docblockrxu2016-07-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14703
| | * | | | [ticket/14703] Fix existance checking if multiple parent module_langname foundrxu2016-07-241-9/+26
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14703
| | * | | | [ticket/14703] Add test for the case multiple parent module_langname foundrxu2016-07-241-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14703
| | * | | | [ticket/14703] Select the parent module id from the several foundrxu2016-07-231-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14703
| | * | | | [ticket/14703] Refine the parent module selection for custom extension modulesrxu2016-07-101-71/+79
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14703