Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [prep-release-3.2.2] Add 3.1.12 to build and fix display of download box | Marc Alexander | 2018-01-07 | 2 | -5/+6 |
| | |||||
* | [prep-release-3.2.2] Add migration for 3.2.2 | Marc Alexander | 2018-01-07 | 1 | -0/+37 |
| | |||||
* | Merge pull request #5077 from marc1706/ticket/15353 | Marc Alexander | 2018-01-07 | 2 | -4/+4 |
|\ | | | | | | | [ticket/15353] Do not use empty to not offer empty archive for download | ||||
| * | [ticket/15353] Do not use empty to not offer empty archive for download | Marc Alexander | 2018-01-06 | 2 | -4/+4 |
| | | | | | | | | PHPBB3-15353 | ||||
* | | Merge pull request #5076 from marc1706/ticket/15496 | Marc Alexander | 2018-01-07 | 1 | -1/+1 |
|\ \ | | | | | | | | | | [ticket/15496] Add sort key to SELECT in fulltext_postgres | ||||
| * | | [ticket/15496] Add sort key to SELECT in fulltext_postgres | Marc Alexander | 2018-01-06 | 1 | -1/+1 |
| |/ | | | | | | | | | | | | | Postgres requires that the column being ordered also appears in the SELECT part of the query. PHPBB3-15496 | ||||
* | | Merge remote-tracking branch 'upstream/3.2.x' into prep-release-3.2.2 | Marc Alexander | 2018-01-07 | 77 | -308/+359 |
|\ \ | |||||
| * \ | Merge pull request #4680 from marc1706/ticket/15055 | Derky | 2018-01-05 | 4 | -22/+82 |
| |\ \ | | | | | | | | | | | | | [ticket/15055] Add appveyor file to allow running tests on appveyor as well | ||||
| | * | | [ticket/15055] Properly support index length check on mssql | Marc Alexander | 2018-01-01 | 2 | -6/+29 |
| | | | | | | | | | | | | | | | | PHPBB3-15055 | ||||
| | * | | [ticket/15055] Specify utf8 as character set in sqlsrv_connect | Marc Alexander | 2018-01-01 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | This is needed to be able to correctly retrieve unicode data from the db. PHPBB3-15055 | ||||
| | * | | [ticket/15055] Try using build matrix | Marc Alexander | 2018-01-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-15055 | ||||
| | * | | [ticket/15055] Only drop dependent PK indexes and fix more tests for mssql | Marc Alexander | 2018-01-01 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | PHPBB3-15055 | ||||
| | * | | [ticket/15055] Drop primary keys when necessary and fix test comparisons | Marc Alexander | 2018-01-01 | 1 | -0/+35 |
| | | | | | | | | | | | | | | | | PHPBB3-15055 | ||||
| | * | | [ticket/15055] Use unicode column types where necessary | Marc Alexander | 2018-01-01 | 1 | -14/+14 |
| | |/ | | | | | | | | | | PHPBB3-15055 | ||||
| * | | [ticket/14972] replace all occurrences of sizeof() with the count() | rxu | 2018-01-01 | 71 | -215/+215 |
| | | | | | | | | | | | | PHPBB3-14972 | ||||
| * | | [ticket/14972] Fix template context use of sizeof() | Marc Alexander | 2018-01-01 | 1 | -46/+33 |
| | | | | | | | | | | | | PHPBB3-14972 | ||||
| * | | [ticket/14972] Fix create_insert_array() declaration in admin_activate_user | rxu | 2018-01-01 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-14972 | ||||
| * | | [ticket/14972] Fix use of deprecated media attachment constants | rxu | 2018-01-01 | 1 | -3/+10 |
| | | | | | | | | | | | | PHPBB3-14972 | ||||
| * | | [ticket/14972] Fix sizeof calls | rxu | 2018-01-01 | 2 | -21/+18 |
| |/ | | | | | | | | | | | | | | | | | | | As of PHP 7.2, only arrays and objects implementing the Countable interface should be passed as a count() or sizeof() parameter. See https://github.com/php/php-src/blob/php-7.2.0alpha2/UPGRADING#L197-L198 Also, sizeof() seems to be sheduled for deprecation, see https://wiki.php.net/rfc/deprecations_php_7_2#suggested_deprecations PHPBB3-14972 | ||||
* | | Merge remote-tracking branch 'phpbb-security/prep-release-3.1.12' into ↵ | Marc Alexander | 2018-01-07 | 3 | -2/+37 |
|\ \ | | | | | | | | | | prep-release-3.2.2 | ||||
| * | | [prep-release-3.1.12] Add migration for 3.1.12 | Marc Alexander | 2017-12-31 | 1 | -0/+36 |
| | | | |||||
| * | | Merge pull request #40 from phpbb/ticket/security/211 | Marc Alexander | 2017-12-31 | 1 | -1/+14 |
| |\ \ | | | | | | | | | | | | | [ticket/security/211] Make sure website URL only uses http & https schemes | ||||
| | * | | [ticket/security/211] Allow make_clickable() again after change to regex | Marc Alexander | 2017-08-03 | 2 | -2/+1 |
| | | | | | | | | | | | | | | | | SECURITY-211 | ||||
| * | | | [ticket/15303] Correctly refer to $memcached and not $memcache | abyssmedia | 2017-12-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-15303 | ||||
* | | | | Merge branch 'ticket/security/211' into ticket/security/211-rhea | Marc Alexander | 2018-01-01 | 2 | -2/+16 |
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | |||||
| * | | [ticket/security/211] Only run make_clickable() on URL type profile fields | Marc Alexander | 2017-07-23 | 2 | -1/+15 |
| | | | | | | | | | | | | SECURITY-211 | ||||
| * | | [ticket/security/211] Make sure website URL only uses http & https schemes | Marc Alexander | 2017-07-22 | 1 | -1/+1 |
| | | | | | | | | | | | | SECURITY-211 | ||||
* | | | [prep-release-3.2.2] Add migration for 3.2.2-RC1 | Marc Alexander | 2017-12-28 | 2 | -0/+41 |
| | | | |||||
* | | | Merge pull request #4971 from Elsensee/ticket/15339 | Marc Alexander | 2017-12-28 | 10 | -141/+221 |
|\ \ \ | | | | | | | | | | | | | [ticket/15339] Use manual method when adding modules | ||||
| * | | | [ticket/15339] Fix tests | Oliver Schramm | 2017-12-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-15339 | ||||
| * | | | [ticket/15339] Free sql results in migration module tool | Oliver Schramm | 2017-11-17 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | PHPBB3-15339 | ||||
| * | | | [ticket/15339] Allow a module to have multiple parents | Oliver Schramm | 2017-11-17 | 3 | -123/+136 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also restore old behaviour from Olympus regarding re-sorting modules PHPBB3-15339 | ||||
| * | | | [ticket/15339] Use manual method when adding modules | Oliver Schramm | 2017-09-22 | 9 | -18/+83 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will fix cases where the module is deleted in later versions and the migrator thus cannot retrieve the info. PHPBB3-15339 | ||||
* | | | | Merge pull request #5061 from marc1706/ticket/15322 | Derky | 2017-12-27 | 1 | -0/+37 |
|\ \ \ \ | | | | | | | | | | | | | | | | [ticket/15322] Add config for envelope sender & remove mail function setting | ||||
| * | | | | [ticket/15322] Try to make new email setting more readable | Marc Alexander | 2017-12-13 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-15322 | ||||
| * | | | | [ticket/15322] Add config setting for -f parameter & remove mail function name | Marc Alexander | 2017-12-11 | 1 | -0/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The -f parameter can now be added via configuration in the ACP. Addtionally, the config setting for the mail function name has been removed. PHPBB3-15322 | ||||
* | | | | | Merge pull request #5037 from hubaishan/ticket/14857 | Marc Alexander | 2017-12-27 | 1 | -0/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/14857] Throw `S` from dateformat for non English languages | ||||
| * | | | | | [ticket/14857] Throw `S` from dateformat for non English languages | hubaishan | 2017-12-24 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Throw `S` (ordinal suffix) from dateformat for non English languages PHPBB3-14857 | ||||
* | | | | | | Merge pull request #5038 from JoshyPHP/ticket/15444 | Marc Alexander | 2017-12-27 | 1 | -0/+75 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/15444] Merge duplicate BBCodes via a migration | ||||
| * | | | | | | [ticket/15444] Add a migration to merge duplicate BBCodes | JoshyPHP | 2017-12-10 | 1 | -0/+75 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15444 | ||||
* | | | | | | | Merge pull request #5053 from JoshyPHP/ticket/15468 | Marc Alexander | 2017-12-27 | 1 | -0/+180 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | Add a service to merge duplicate BBCodes | ||||
| * | | | | | | [ticket/15468] Add a service to merge duplicate BBCodes | JoshyPHP | 2017-12-10 | 1 | -0/+180 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15468 | ||||
* | | | | | | | Merge pull request #5046 from JoshyPHP/ticket/15457 | Marc Alexander | 2017-12-27 | 2 | -6/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | [ticket/15457] Updated s9e/text-formatter dependency | ||||
| * | | | | | | [ticket/15457] Updated s9e/text-formatter dependency | JoshyPHP | 2017-12-10 | 2 | -6/+5 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | PHPBB3-15457 | ||||
* | | | | | | Merge pull request #4868 from javiexin/ticket/15266 | Marc Alexander | 2017-12-27 | 1 | -52/+74 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/15266] Fix events in content_visibility | ||||
| * | | | | | | [ticket/15266] Update since, add changed, and use empty where applicable | Marc Alexander | 2017-12-27 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15266 | ||||
| * | | | | | | [ticket/15266] Expand functionality of content_visibility | javiexin | 2017-12-27 | 1 | -0/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new function "is_visible", and replaced several immediate uses of the above, including a single event in the new function to handle change in all places consistently, and much simpler. PHPBB3-15266 | ||||
| * | | | | | | [ticket/15266] Fix events in content_visibility | javiexin | 2017-07-10 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional errors found. The event parameter 'timestamp' does not exist, it is really called 'time'. Affects four events: core.set_post_visibility_before_sql core.set_post_visibility_after core.set_topic_visibility_before_sql core.set_topic_visibility_after PHPBB3-15266 | ||||
| * | | | | | | [ticket/15266] Fix events in content_visibility | javiexin | 2017-07-09 | 1 | -44/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes core.phpbb_content_visibility_get_visibility_sql_before, core.phpbb_content_visibility_get_forums_visibility_before, core.phpbb_content_visibility_get_global_visibility_before Does not modify the events, but fixes some comments, and changes the rest of the function to allow (at least) the documented event functionality. PHPBB3-15266 | ||||
* | | | | | | | Merge pull request #5036 from JoshyPHP/ticket/15442 | Marc Alexander | 2017-12-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15442] Allow unsafe HTML in bbcode.html |