mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-24 01:20:40 +01:00
Code Issues Releases Wiki Activity
31,452 Commits 18 Branches 191 Tags
Commit Graph

31452 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Alexander
82ccc43767
Merge branch '3.2.x' 2018-01-17 23:06:19 +01:00
Marc Alexander
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
Jakub Senko
ad748ec0a7
[ticket/15099] Fix tests 
PHPBB3-15099
 2018-01-17 22:10:53 +01:00
Jakub Senko
84ff21a586
[ticket/15099] Remove type attr from INCLUDECSS and INCLUDEJS 
PHPBB3-15099
 2018-01-17 18:30:21 +01:00
JoshyPHP
f01e29effe [ticket/15518] Add a setting to toggle permission checks for pms in viewtopic 
PHPBB3-15518
 2018-01-17 00:16:26 +01:00
Christian Schnegelberger
1f80b668f1 [ticket/15500] Remove number from upper PHP limit 
PHPBB3-15500
 2018-01-16 21:42:38 +01:00
Marc Alexander
ab65accebc
Merge branch '3.2.x' 2018-01-16 21:34:23 +01:00
Marc Alexander
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
Marc Alexander
3469545e3a
[ticket/15516] Add instructions for running UI tests 
PHPBB3-15516
 2018-01-14 12:59:01 +01:00
JoshyPHP
5878d66ebf [ticket/15512] Avoid reparsing non-existent polls 
PHPBB3-15512
 2018-01-12 16:28:37 +01:00
hubaishan
baabcad8ab [ticket/15510] Link Orphan attachments in ACP General to its page 
Link Orphan attachments in ACP General to Orphaned attachments page
if Orphan attachments>0

PHPBB3-15510
 2018-01-12 18:23:16 +03:00
Derky
6ac85a371a Merge branch '3.2.x' 2018-01-12 07:32:13 +01:00
Derky
7f6ececf95 Merge pull request #5079 from rxu/ticket/15502 
[ticket/15502] Fix migrations
 2018-01-12 07:30:51 +01:00
Derky
3d409d4932 Merge branch '3.2.x' 2018-01-11 21:45:46 +01:00
Derky
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
Marc Alexander
4bf3290c23 Merge branch '3.2.x' 2018-01-11 21:33:44 +01:00
Marc Alexander
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
Derky
beed8821ff Merge branch '3.2.x' 2018-01-11 21:03:20 +01:00
Derky
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
Marc Alexander
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
hubaishan
8c89194cc6 [ticket/15492] Fix permission role combobox in RTL 
Varius fixes to css and js for correct
displaying permission role combbox in RTL mode

PHPBB3-15492
 2018-01-11 19:10:32 +03:00
Marc Alexander
6a75fe26fc [ticket/15055] Use regex to copy php to tools php 
PHPBB3-15055
 2018-01-10 21:41:53 +01:00
Marc Alexander
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
Marc Alexander
62f8fed797 [ticket/15055] Run sql2016 builds with PHP 7.1 
PHPBB3-15055
 2018-01-09 21:29:40 +01:00
Marc Alexander
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
Marc Alexander
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
Christian Schnegelberger
81a8a76c59 [ticket/15500] Updates PHP requirements to 5.4.7+ in docs/ 
PHPBB3-15500
 2018-01-07 22:22:41 +01:00
Marc Alexander
6b221ae4cb
Merge branch '3.2.x' 2018-01-07 19:30:41 +01:00
Marc Alexander
f26cf2dc1f
[3.2.x] Update versions to 3.2.3-dev 2018-01-07 18:51:18 +01:00
Marc Alexander
d2226b3664
Merge branch '3.1.x' into 3.2.x 2018-01-07 18:44:58 +01:00
Marc Alexander
7e2136587a
Merge branch 'prep-release-3.2.2' into 3.2.x 2018-01-07 18:43:45 +01:00
Marc Alexander
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
Marc Alexander
dc8ff9da28
Merge branch 'prep-release-3.1.12' into 3.1.x 2018-01-07 13:29:47 +01:00
Marc Alexander
e4fc82bee5
Merge branch 'prep-release-3.1.12' into prep-release-3.2.2 2018-01-07 11:52:38 +01:00
Marc Alexander
f38fce5ce5
[prep-release-3.1.12] Update changelog release-3.1.12 2018-01-07 11:47:59 +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
e7c5fc32d2
[prep-release-3.2.2] Update changelog for 3.2.2 release 2018-01-07 11:43:54 +01:00
Marc Alexander
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
Marc Alexander
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
Marc Alexander
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
Marc Alexander
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
Marc Alexander
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
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
Marc Alexander
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
Matt Friedman
a2e603c058 [ticket/15369] Fix php_exporter tests 
PHPBB3-15369
 2018-01-06 11:01:40 -08:00
Marc Alexander
57179fbb79
[ticket/15353] Do not use empty to not offer empty archive for download 
PHPBB3-15353
 2018-01-06 19:59:55 +01:00
Matt Friedman
6ad1188b65 [ticket/15369] Fix tests 
PHPBB3-15369
 2018-01-06 10:37:39 -08:00
Matt Friedman
a6b45ff0fd [ticket/15369] Update composer to 1.6.x 
PHPBB3-15369
 2018-01-06 09:36:16 -08:00