aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'senky/ticket/14739' into 3.2.xMarc Alexander2016-11-176-671/+5
|\
| * [ticket/14739] Remove SQLite 2.8.x database driverJakub Senko2016-11-166-671/+5
| | | | | | | | PHPBB3-14739
* | Merge pull request #4501 from marc1706/ticket/14716Tristan Darricau2016-11-141-1/+6
|\ \ | | | | | | | | | | | | | | | | | | [ticket/14716] Update dependencies to latest versions * marc1706/ticket/14716: [ticket/14716] Update dependencies to latest versions
| * | [ticket/14716] Update dependencies to latest versionsMarc Alexander2016-11-031-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This addresses some issues with symfony that resulted in issues when open_basedir restrictions were enabled, as well as issues with JPEG images in fast-image-size. The phpBB class extending the twig lexer also had to be modified to ensure compatibility after BC was broken by the PR https://github.com/twigphp/Twig/pull/2182 for twig 1.27. PHPBB3-14716
* | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-11-142-0/+113
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14831] Rename migration and replace preg_replace() with simpler methods [ticket/14831] Compare depends_on for migrations and remove prefixless names [ticket/14831] Add migration for deduplicating entries and fix typo [ticket/14831] Add method for getting valid migration name [ticket/14831] Fall back to possible migration names instead of adding prefix [ticket/14831] Make sure migrations always start with backslash
| * \ \ Merge pull request #4492 from marc1706/ticket/14831Tristan Darricau2016-11-142-0/+113
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14831] Make sure migrations always start with backslash * marc1706/ticket/14831: [ticket/14831] Rename migration and replace preg_replace() with simpler methods [ticket/14831] Compare depends_on for migrations and remove prefixless names [ticket/14831] Add migration for deduplicating entries and fix typo [ticket/14831] Add method for getting valid migration name [ticket/14831] Fall back to possible migration names instead of adding prefix [ticket/14831] Make sure migrations always start with backslash
| | * | | [ticket/14831] Rename migration and replace preg_replace() with simpler methodsMarc Alexander2016-10-252-6/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-14831
| | * | | [ticket/14831] Compare depends_on for migrations and remove prefixless namesMarc Alexander2016-10-231-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-14831
| | * | | [ticket/14831] Add migration for deduplicating entries and fix typoMarc Alexander2016-10-232-3/+81
| | | | | | | | | | | | | | | | | | | | PHPBB3-14831
| | * | | [ticket/14831] Add method for getting valid migration nameMarc Alexander2016-10-231-26/+34
| | | | | | | | | | | | | | | | | | | | PHPBB3-14831
| | * | | [ticket/14831] Fall back to possible migration names instead of adding prefixMarc Alexander2016-10-231-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of just adding the backslash as prefix if needed, this will take care of falling back to any possible migration with or without backslash no matter how the mgiration was saved in the database or called in the migrations file. This will result in a more robust migrator in regards to naming the migrations and previously run migrations. PHPBB3-14831
| | * | | [ticket/14831] Make sure migrations always start with backslashMarc Alexander2016-10-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The migration system expects every migration to start with a backslash. If depends on definitions do not supply that leading backslash, we should make sure it's added manually before calling the depends on migration. PHPBB3-14831
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-131-1/+34
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Merge pull request #4488 from senky/ticket/14825Marc Alexander2016-11-131-1/+34
| |\ \ \ | | | | | | | | | | | | | | | Add core.auth_oauth_login_after and core.auth_oauth_link_after
| | * | | [ticket/14825] Add core.auth_oauth_(login/link)_afterJakub Senko2016-11-131-1/+34
| | | | | | | | | | | | | | | | | | | | PHPBB3-14825
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-11-121-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/14859] Notifications for PM reports send to users with correct ↵Jim Mossing Holsteyn2016-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permissions Tracker ticket (set the ticket ID to your ticket ID): https://tracker.phpbb.com/browse/PHPBB3-14859 This addresses the problem that notifications of new PM reports were not sent out to moderators that weren't global moderators but did have the permission "Can close/delete PM reports". PHPBB3-14859
* | | | | 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
|\ \ \ \ \ | |/ / / /