1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-18 16:11:06 +02:00
Commit Graph

30164 Commits

Author SHA1 Message Date
adc75b700f Merge pull request #5083 from JoshyPHP/ticket/15512
[ticket/15512] Avoid reparsing non-existent polls
2018-01-19 12:20:54 +01:00
fb5247a726 Merge pull request #5095 from senky/ticket/15099
[ticket/15099] Remove type attr from INCLUDECSS and INCLUDEJS
2018-01-17 23:06:16 +01:00
ad748ec0a7 [ticket/15099] Fix tests
PHPBB3-15099
2018-01-17 22:10:53 +01:00
84ff21a586 [ticket/15099] Remove type attr from INCLUDECSS and INCLUDEJS
PHPBB3-15099
2018-01-17 18:30:21 +01:00
1cd8bbac0c Merge pull request #5071 from dsinn/ticket/15495
[ticket/15495] Use transaction in ACP move_forum
2018-01-16 21:34:20 +01:00
5878d66ebf [ticket/15512] Avoid reparsing non-existent polls
PHPBB3-15512
2018-01-12 16:28:37 +01:00
7f6ececf95 Merge pull request #5079 from rxu/ticket/15502
[ticket/15502] Fix migrations
2018-01-12 07:30:51 +01:00
d268a63812 Merge pull request #5082 from marc1706/ticket/15506
[ticket/15506] Assign attachrow_template_vars before foreach
2018-01-11 21:43:49 +01:00
16bfb5bfc3 Merge pull request #5072 from Derky/ticket/15499
[ticket/15499] Remove HHVM from Travis build matrix
2018-01-11 21:32:37 +01:00
500cd2916e Merge pull request #5080 from marc1706/ticket/15055
[ticket/15055] Display content on unexpted server error
2018-01-11 21:02:12 +01:00
350d4f3e6d [ticket/15506] Assign attachrow_template_vars before foreach
The attachrow_template_vars array needs to be defined once in front of the
foreach instead of resetting the array on every iteration of the foreach.

PHPBB3-15506
2018-01-11 21:00:19 +01:00
6a75fe26fc [ticket/15055] Use regex to copy php to tools php
PHPBB3-15055
2018-01-10 21:41:53 +01:00
8d551e2ded [ticket/15055] Specifiy PHP 7.1.12 and use development ini
PHP 7.1.13 seems to randomly fail. Use 7.1.12 for now.

PHPBB3-15055
2018-01-10 20:47:24 +01:00
62f8fed797 [ticket/15055] Run sql2016 builds with PHP 7.1
PHPBB3-15055
2018-01-09 21:29:40 +01:00
3c7f45c166 [ticket/15055] Fix line break and disable sql server 2017 for now
SQL Server 2017 currently fails for unknown reasons and just results in
an overall longer build time. Therefore disabling it for now.

PHPBB3-15055
2018-01-09 21:22:58 +01:00
daf668a969 [ticket/15055] Display content on unexpted server error
PHPBB3-15055
2018-01-08 21:17:38 +01:00
rxu
0391b48d7e [ticket/15502] Fix migrations
PHPBB3-15502
2018-01-09 01:01:49 +07:00
f26cf2dc1f [3.2.x] Update versions to 3.2.3-dev 2018-01-07 18:51:18 +01:00
d2226b3664 Merge branch '3.1.x' into 3.2.x 2018-01-07 18:44:58 +01:00
7e2136587a Merge branch 'prep-release-3.2.2' into 3.2.x 2018-01-07 18:43:45 +01:00
77b275181a [prep-release-3.2.2] Add 3.1.12 to build and fix display of download box release-3.2.2 2018-01-07 16:59:14 +01:00
dc8ff9da28 Merge branch 'prep-release-3.1.12' into 3.1.x 2018-01-07 13:29:47 +01:00
e4fc82bee5 Merge branch 'prep-release-3.1.12' into prep-release-3.2.2 2018-01-07 11:52:38 +01:00
f38fce5ce5 [prep-release-3.1.12] Update changelog release-3.1.12 2018-01-07 11:47:59 +01:00
f8180ca97b [prep-release-3.2.2] Add migration for 3.2.2 2018-01-07 11:45:49 +01:00
e7c5fc32d2 [prep-release-3.2.2] Update changelog for 3.2.2 release 2018-01-07 11:43:54 +01:00
4aab9e792a Merge pull request #5077 from marc1706/ticket/15353
[ticket/15353] Do not use empty to not offer empty archive for download
2018-01-07 11:06:18 +01:00
f26b2c00de Merge pull request #5076 from marc1706/ticket/15496
[ticket/15496] Add sort key to SELECT in fulltext_postgres
2018-01-07 11:06:09 +01:00
2a6c9233e9 Merge pull request #5075 from marc1706/ticket/15497
[ticket/15497] Backport fix for create_insert_array() declaration in admin_activate_user
2018-01-07 11:05:14 +01:00
69a168bcb2 Merge pull request #5074 from marc1706/ticket/15498
[ticket/15498] Do not pass whether URL uses router to is_route
2018-01-07 11:04:37 +01:00
c7b3407eb2 Merge pull request #5068 from Derky/ticket/15489
[ticket/15489] Remove NO_FORUMS message for categories with subforums
2018-01-07 11:04:22 +01:00
1b4bad6583 Merge remote-tracking branch 'upstream/3.2.x' into prep-release-3.2.2 2018-01-07 11:02:31 +01:00
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
2a939fa779 Merge pull request #41 from phpbb/ticket/security/211-rhea
[ticket/security/211] Rhea version of security fix
2018-01-07 10:28:59 +01:00
57179fbb79 [ticket/15353] Do not use empty to not offer empty archive for download
PHPBB3-15353
2018-01-06 19:59:55 +01:00
d05c7fd342 [ticket/15496] Add sort key to SELECT in fulltext_postgres
Postgres requires that the column being ordered also appears in the
SELECT part of the query.

PHPBB3-15496
2018-01-06 16:06:59 +01:00
rxu
101e6c8f96 [ticket/14972] Fix create_insert_array() declaration in admin_activate_user
PHPBB3-14972
2018-01-06 11:10:43 +01:00
e31474542d [ticket/15498] Do not pass whether URL uses router to is_route
is_route expects a flag of whether this is a route that was generated
with the router as opposed to is_router_used() which returns whether
the router will be used via app.php.

PHPBB3-15498
2018-01-06 10:53:12 +01:00
90e440855e [ticket/15499] Remove HHVM from Travis build matrix
PHPBB3-15499
2018-01-06 00:09:02 +01:00
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
98c5069500 [ticket/15055] Display appveyor badges in readme
PHPBB3-15055
2018-01-05 21:22:24 +01:00
2fcb8ab87f Merge pull request #5069 from marc1706/ticket/14972-rhea
[ticket/14972] Backport for PHP 7.2 compatibility
2018-01-04 21:20:46 +01:00
2119dee53d [ticket/15489] Add NO_FORUMS_IN_CATEGORY message
PHPBB3-15489
2018-01-04 21:09:39 +01:00
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
7b6be23117 [ticket/15055] Use getMock() for phpBB 3.2 compatibility
PHPBB3-15055
2018-01-01 19:25:11 +01:00
4afb53dd8d [ticket/15055] Add comments explaining overriden createXMLDataSet()
PHPBB3-15055
2018-01-01 18:57:56 +01:00
ee8b72d733 [ticket/15055] Properly support index length check on mssql
PHPBB3-15055
2018-01-01 18:57:50 +01:00
d99ef03446 [ticket/15055] Run phantomjs for UI tests
PHPBB3-15055
2018-01-01 18:56:31 +01:00
a999718b42 [ticket/15055] Support console questions on windows
PHPBB3-15055
2018-01-01 18:56:20 +01:00
ede339c1c8 [ticket/15055] Extend build matrix and trim text in extension_acp_test
PHPBB3-15055
2018-01-01 18:56:13 +01:00