1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-21 14:59:46 +02:00

871 Commits

Author SHA1 Message Date
Marc Alexander
7786b78e94
Merge branch '3.2.x' 2018-02-21 19:06:00 +01:00
FH
4577404fc2 [ticket/15520] sql_build_query build subquery
Fix for the building of subqueries
in sql_build_query

PHPBB3-15520
2018-02-03 21:06:12 +01:00
Marc Alexander
2053399085
Merge branch '3.2.x' 2018-01-24 23:35:53 +01:00
Marc Alexander
a74658091b
Merge pull request #5102 from JoshyPHP/ticket/15527
[ticket/15527] Skip malformed BBCodes during merge_duplicate_bbcodes migration
2018-01-24 23:35:49 +01:00
Marc Alexander
4b4f256817
Merge branch '3.2.x' 2018-01-24 19:19:34 +01:00
Marc Alexander
532afbf83a
[ticket/15527] Remove "use" and specify full class name for exception
PHPBB3-15527
2018-01-24 18:47:40 +01:00
JoshyPHP
5c8a667db2 [ticket/15527] Skip malformed BBCodes during merge_duplicate_bbcodes migration
PHPBB3-15527
2018-01-22 02:37:47 +01:00
Matt Friedman
f08887e277 [ticket/15526] Cast bbcode id to INT in merge bbcodes migration
PHPBB3-15526
2018-01-20 09:54:45 -08:00
Derky
6ac85a371a Merge branch '3.2.x' 2018-01-12 07:32:13 +01:00
rxu
0391b48d7e [ticket/15502] Fix migrations
PHPBB3-15502
2018-01-09 01:01:49 +07:00
Marc Alexander
6b221ae4cb
Merge branch '3.2.x' 2018-01-07 19:30:41 +01:00
Marc Alexander
f8180ca97b
[prep-release-3.2.2] Add migration for 3.2.2 2018-01-07 11:45:49 +01:00
Marc Alexander
1b4bad6583
Merge remote-tracking branch 'upstream/3.2.x' into prep-release-3.2.2 2018-01-07 11:02:31 +01:00
Marc Alexander
3ae0169542
Merge remote-tracking branch 'phpbb-security/prep-release-3.1.12' into prep-release-3.2.2 2018-01-07 10:48:43 +01:00
Derky
7560ffcbe9 Merge branch '3.2.x' 2018-01-05 22:52:33 +01:00
Derky
182a96f273 Merge pull request #4680 from marc1706/ticket/15055
[ticket/15055] Add appveyor file to allow running tests on appveyor as well
2018-01-05 22:44:34 +01:00
Marc Alexander
ee8b72d733 [ticket/15055] Properly support index length check on mssql
PHPBB3-15055
2018-01-01 18:57:50 +01:00
Marc Alexander
6f6750b629 [ticket/15055] Specify utf8 as character set in sqlsrv_connect
This is needed to be able to correctly retrieve unicode data from the db.

PHPBB3-15055
2018-01-01 18:55:25 +01:00
Marc Alexander
400fc0f73d [ticket/15055] Only drop dependent PK indexes and fix more tests for mssql
PHPBB3-15055
2018-01-01 18:55:12 +01:00
Marc Alexander
635befa00e [ticket/15055] Drop primary keys when necessary and fix test comparisons
PHPBB3-15055
2018-01-01 18:54:41 +01:00
Marc Alexander
5bb62f5560 [ticket/15055] Use unicode column types where necessary
PHPBB3-15055
2018-01-01 18:54:34 +01:00
rxu
f8fbe37936
[ticket/14972] replace all occurrences of sizeof() with the count()
PHPBB3-14972
2018-01-01 13:56:04 +01:00
rxu
dec06d10fe
[ticket/14972] Fix use of deprecated media attachment constants
PHPBB3-14972
2018-01-01 13:56:03 +01:00
rxu
8c3808e9e7
[ticket/14972] Fix sizeof calls
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
2018-01-01 13:08:12 +01:00
Marc Alexander
5def7e255e
[prep-release-3.1.12] Add migration for 3.1.12 2017-12-31 16:39:02 +01:00
Marc Alexander
9e3432cd7b
Merge branch '3.2.x' 2017-12-28 22:06:33 +01:00
Marc Alexander
bd52c64e68
[prep-release-3.2.2] Add migration for 3.2.2-RC1 2017-12-28 15:02:37 +01:00
Marc Alexander
f9da4f10ae
Merge pull request #5017 from Elsensee/ticket/15339-33
[ticket/15339] Use manual method when adding modules
2017-12-28 11:14:13 +01:00
Marc Alexander
d90680d685
Merge pull request #4971 from Elsensee/ticket/15339
[ticket/15339] Use manual method when adding modules
2017-12-28 10:50:55 +01:00
Derky
c94c2a1ec2 Merge branch '3.2.x' 2017-12-27 19:32:20 +01:00
Derky
8e19bb83b5 Merge pull request #5061 from marc1706/ticket/15322
[ticket/15322] Add config for envelope sender & remove mail function setting
2017-12-27 19:30:27 +01:00
Marc Alexander
c596383592
Merge branch '3.2.x' 2017-12-27 19:08:16 +01:00
Oliver Schramm
1702219629 Merge branch 'ticket/15339' into ticket/15339-33 2017-12-24 19:55:46 +01:00
Oliver Schramm
2b16b7cada [ticket/15339] Fix tests
PHPBB3-15339
2017-12-24 19:55:03 +01:00
Marc Alexander
4e045ed767
[ticket/15322] Try to make new email setting more readable
PHPBB3-15322
2017-12-13 21:31:07 +01:00
Marc Alexander
9f055e1af3
[ticket/15322] Add config setting for -f parameter & remove mail function name
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
2017-12-11 21:56:21 +01:00
JoshyPHP
485a4a75b2 [ticket/15444] Add a migration to merge duplicate BBCodes
PHPBB3-15444
2017-12-10 04:00:18 +01:00
Oliver Schramm
719a49d387 [ticket/15339] Free sql results in migration module tool
PHPBB3-15339
2017-11-17 01:31:31 +01:00
Oliver Schramm
aa961991fd [ticket/15339] Allow a module to have multiple parents
Also restore old behaviour from Olympus regarding re-sorting modules

PHPBB3-15339
2017-11-17 01:29:38 +01:00
Marc Alexander
c123254242
Merge branch '3.2.x' 2017-11-16 22:11:11 +01:00
Marc Alexander
0517e43dff
Merge pull request #4976 from rubencm/ticket/15171
[ticket/15171] Replace all BBCode templates by default
2017-11-16 21:56:57 +01:00
Marc Alexander
e157d8890b
Merge pull request #5020 from marc1706/ticket/15424
[ticket/15424] Multiple typo fixes in docs & comments
2017-11-01 12:27:13 +01:00
Marc Alexander
6259789e02
Merge branch '3.2.x' 2017-11-01 10:40:01 +01:00
Rubén Calvo
4bf0f4a50f [ticket/15171] Add migration
PHPBB3-15171
2017-10-31 14:37:36 +01:00
luzpaz
e13ba99c81
[ticket/15424] Multiple typo fixes in docs & comments
Fixed typos in some docs, guidelines, some non-user-facing files.

PHPBB3-15424
2017-10-29 12:44:01 +01:00
Oliver Schramm
297278a45c Merge branch 'ticket/15339' into ticket/15339-33 2017-10-28 04:00:22 +02:00
David Colón
33ceceda02 [ticket/15372] Add permission to schema and copy from f_read 2017-10-26 16:21:50 -04:00
David Colón
4ae7cb89ff [ticket/15372] Remove revert_data from migration 2017-10-26 16:09:01 -04:00
David Colón
e55480385b [ticket/15372] Migration for adding f_list_topic permission 2017-10-26 16:09:01 -04:00
Marc Alexander
d11db17e2c
Merge branch '3.2.x' 2017-10-22 10:19:35 +02:00