1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-22 20:26:25 +02:00
Commit Graph

26631 Commits

Author SHA1 Message Date
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
Derky
2119dee53d [ticket/15489] Add NO_FORUMS_IN_CATEGORY message
PHPBB3-15489
2018-01-04 21:09:39 +01:00
Daniel Sinn
84ccb3aded [ticket/15495] Use transaction in ACP move_forum
Should prevent the forums table from getting messed up if an error or
concurrent execution happens.

PHPBB3-15495
2018-01-03 16:18:14 -05:00
Matt Friedman
3c143e7ae8 [ticket/15369] Update composer to 1.5
PHPBB3-15369
2018-01-02 12:27:41 -08: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
27a24d0a67 [ticket/15055] Try using build matrix
PHPBB3-15055
2018-01-01 18:55:19 +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
Marc Alexander
66143e99be [ticket/15055] Further fixes to ensure PHP 7.1 & mssql compatibility
PHPBB3-15055
2018-01-01 18:54:08 +01:00
rxu
f8fbe37936 [ticket/14972] replace all occurrences of sizeof() with the count()
PHPBB3-14972
2018-01-01 13:56:04 +01:00
Marc Alexander
ff18802656 [ticket/14972] Fix template context use of sizeof()
PHPBB3-14972
2018-01-01 13:56:04 +01:00
rxu
e1376e14de [ticket/14972] Fix create_insert_array() declaration in admin_activate_user
PHPBB3-14972
2018-01-01 13:56:03 +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
bf5f11e11a Merge branch 'ticket/security/211' into ticket/security/211-rhea 2018-01-01 11:54:37 +01:00
Marc Alexander
0c3f7c6c8e [prep-release-3.1.12] Update changelog for 3.1.12 2017-12-31 16:41:47 +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
7dfd57077a Merge pull request #40 from phpbb/ticket/security/211
[ticket/security/211] Make sure website URL only uses http & https schemes
2017-12-31 16:37:58 +01:00
Marc Alexander
92350db572 [prep-release-3.1.12] Update version numbers to 3.1.12 2017-12-31 16:36:16 +01:00
Marc Alexander
a2daf30415 [prep-release-3.1.12] Update version numbers to 3.1.12 2017-12-31 16:31:04 +01:00
abyssmedia
949f07e8ba [ticket/15303] Correctly refer to $memcached and not $memcache
PHPBB3-15303
2017-12-31 16:23:45 +01:00
Derky
4fe09b98b0 [ticket/15489] Remove NO_FORUMS message for categories with subforums
PHPBB3-15489
2017-12-31 15:55:10 +01:00
hubaishan
ea01890407 [ticket/15491] Fix out dated linkes in Installer support page
Fix out dated linkes in Installer support page

PHPBB3-15491
2017-12-31 13:35:33 +03:00
Marc Alexander
9e3432cd7b Merge branch '3.2.x' 2017-12-28 22:06:33 +01:00
Marc Alexander
0ff5f9fa0e [3.2.x] Update version number to 3.2.3-dev 2017-12-28 22:03:10 +01:00
Marc Alexander
39b1420774 [prep-release-3.2.2] Update changelog for 3.2.2-RC1 2017-12-28 15:10:03 +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
adad3aac66 [prep-release-3.2.2] Update version to 3.2.2 2017-12-28 14:59:00 +01:00
Marc Alexander
ca4a3f4698 [prep-release-3.2.2] Update version to 3.2.2-RC1 2017-12-28 14:58:01 +01:00
Marc Alexander
7bb7bbc54c Merge branch '3.2.x' 2017-12-28 14:51:05 +01:00
Marc Alexander
e90e3ec368 [ticket/15179] Update dependencies for 3.2.x
PHPBB3-15179
2017-12-28 13:52:51 +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
Marc Alexander
ea1d911508 Merge branch '3.2.x' 2017-12-28 10:43:31 +01:00
Marc Alexander
7c0ff6ddd4 Merge pull request #5045 from senky/ticket/15454
[ticket/15454] Add core.mcp_queue_approve_details_template
2017-12-28 10:43:27 +01:00
Marc Alexander
b6ac183a32 [ticket/15454] Add post template data to event
PHPBB3-15454
2017-12-28 09:09:21 +01:00
Marc Alexander
19c8112e99 Merge branch '3.2.x' 2017-12-28 08:29:32 +01:00
Marc Alexander
0b52923129 Merge pull request #5044 from hubaishan/ticket/15453
[ticket/15453] Add core event after language deleted in acp_language.php
2017-12-28 08:29:28 +01:00
Marc Alexander
15033667da Merge branch '3.2.x' 2017-12-28 08:22:40 +01:00
Marc Alexander
53ce1330d6 Merge pull request #5063 from vinny/ticket/15485
[ticket/15485] Add template event for forum images
2017-12-28 08:22:36 +01:00
Marc Alexander
a12ad9c914 Merge branch '3.2.x' 2017-12-27 21:31:36 +01:00
Marc Alexander
01181f1e4e Merge pull request #5040 from kasimi/ticket/15446
[ticket/15446] Add event core.acp_profile_action
2017-12-27 21:31:31 +01:00
Marc Alexander
59c7a5506b Merge branch '3.2.x' 2017-12-27 21:27:15 +01:00
Marc Alexander
d8f9cb4961 Merge pull request #5041 from kasimi/ticket/15447
[ticket/15447] Add event core.acp_profile_modify_profile_row
2017-12-27 21:27:11 +01:00
Marc Alexander
475b85200b Merge branch '3.2.x' 2017-12-27 21:14:02 +01:00
Marc Alexander
20a6182a86 Merge pull request #5042 from kinerity/ticket/15451
[ticket/15451] Add template event mcp_topic_postrow_attachments_before/after
2017-12-27 21:13:38 +01:00
Marc Alexander
f0284ddbdf Merge branch '3.2.x' 2017-12-27 20:56:51 +01:00