1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-22 16:40:21 +01:00

31285 Commits

Author SHA1 Message Date
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
3a8305e190
Merge pull request #5098 from VSEphpbb/ticket/15526
[ticket/15526] Cast bbcode id to INT in merge bbcodes migration
2018-01-24 19:19:29 +01:00
Marc Alexander
ca537a691d
Merge branch '3.2.x' 2018-01-24 19:16:28 +01:00
Marc Alexander
928a8c0e89
Merge pull request #5100 from senky/ticket/15528
[ticket/15528] Display style phpBB version
2018-01-24 19:16:24 +01:00
Marc Alexander
ef6b6b156d
Merge branch '3.2.x' 2018-01-24 19:09:29 +01:00
Marc Alexander
128a6e4c8d
Merge pull request #5101 from senky/ticket/15529
[ticket/15529] Color groups in ACP
2018-01-24 19:09:25 +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
Marc Alexander
18cd315071
Merge branch '3.2.x' 2018-01-24 18:40:09 +01:00
Marc Alexander
10691fda8e
Merge pull request #5104 from Crizz0/ticket/15532
[ticket/15532] PR-template: Updates the links for guidelines and message format
2018-01-24 18:40:01 +01:00
Marc Alexander
ef0680fd19
Merge branch '3.2.x' 2018-01-24 18:32:19 +01:00
Marc Alexander
23a1f3feda
Merge pull request #5106 from senky/ticket/15514
[ticket/15514] Improve SMTP_SERVER lang key
2018-01-24 18:31:37 +01:00
Marc Alexander
2113e998d1
Merge branch '3.2.x' 2018-01-24 18:12:21 +01:00
Marc Alexander
b9cb75bf60
Merge pull request #5099 from VSEphpbb/ticket/15525
[ticket/15525] Update to valid SPDX license name GPL-2.0-only
2018-01-24 18:12:02 +01:00
Jakub Senko
277f4efcc7
[ticket/15514] Improve SMTP_SERVER lang key
PHPBB3-15514
2018-01-24 13:34:23 +01:00
Christian Schnegelberger
329eb201d9 [ticket/15532] Updates the links for guidelines and message format
PHPBB3-15532
2018-01-22 22:17:25 +01:00
Jakub Senko
233a07ceda
[ticket/15528] Rename column label
PHPBB3-15528
2018-01-22 22:04:23 +01:00
JoshyPHP
5c8a667db2 [ticket/15527] Skip malformed BBCodes during merge_duplicate_bbcodes migration
PHPBB3-15527
2018-01-22 02:37:47 +01:00
Jakub Senko
875dc63c6f
[ticket/15529] Color groups in ACP
PHPBB3-15529
2018-01-21 11:04:07 +01:00
Jakub Senko
abe218c34a
[ticket/15528] Display style phpBB version
PHPBB3-15528
2018-01-21 10:54:07 +01:00
Marc Alexander
d0c93d56ad
Merge branch '3.2.x' 2018-01-20 19:57:38 +01:00
Marc Alexander
d0143bec88
Merge pull request #5084 from hubaishan/ticket/15510
[ticket/15510] Link Orphan attachments in ACP General to its page
2018-01-20 19:57:33 +01:00
Marc Alexander
e0f9794126
Merge branch '3.2.x' 2018-01-20 19:52:18 +01:00
Marc Alexander
55e13693b0
Merge pull request #5078 from Crizz0/ticket/15500
[ticket/15500] Updates PHP requirements to 5.4.7+ in docs/
2018-01-20 19:51:35 +01:00
Marc Alexander
c6dbfeadee
Merge branch '3.2.x' 2018-01-20 19:50:15 +01:00
Marc Alexander
5c989b1e8e
Merge pull request #5067 from hubaishan/ticket/15491
[ticket/15491] Fix out dated linkes in Installer support page
2018-01-20 19:50:11 +01:00
Marc Alexander
8b03b9ded2
Merge branch '3.2.x' 2018-01-20 19:45:50 +01:00
Marc Alexander
8f742fb7d5
Merge pull request #5097 from canonknipser/ticket/15513
[ticket/15513] Signature edit in acp gives error
2018-01-20 19:45:46 +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
Matt Friedman
2d8b856a63 [ticket/15525] Update to valid SPDX license name GPL-2.0-only
PHPBB3-15525
2018-01-20 09:52:14 -08:00
Marc Alexander
77d02d4d24
Merge branch '3.2.x' 2018-01-20 18:40:35 +01:00
Marc Alexander
227e7cadba
Merge pull request #5096 from kasimi/ticket/15523
[ticket/15523] Fix AdBlocker causing JS error when using CookieConsent
2018-01-20 18:40:31 +01:00
canonknipser
122f61e1ca [ticket/15513] Signature edit in acp gives error
When editing a users signature in acp, a error is thrown.

PHPBB3-15513
2018-01-20 18:00:44 +01:00
kasimi
ce6adeea02
[ticket/15523] Fix AdBlocker causing JS error when using CookieConsent
PHPBB3-15523
2018-01-19 18:41:58 +01:00
Christian Schnegelberger
bb442c498b [ticket/15500] Adds 7.1 and 7.2 to tested versions
PHPBB3-15500
2018-01-19 18:16:17 +01:00
hubaishan
ccc260b179 [ticket/15491] Add twitter and facebook
Add twitter and facebook

PHPBB3-15491
2018-01-19 19:07:16 +03:00
hubaishan
ede0a36076 [ticket/15510] Link Orphan attachments in ACP General to its page
change `IF TOTAL_ORPHAN` to `IF TOTAL_ORPHAN > 0`

PHPBB3-15510
2018-01-19 16:28:54 +03:00
Marc Alexander
39945aec10
Merge branch '3.2.x' 2018-01-19 12:20:57 +01:00
Marc Alexander
adc75b700f
Merge pull request #5083 from JoshyPHP/ticket/15512
[ticket/15512] Avoid reparsing non-existent polls
2018-01-19 12:20:54 +01:00
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
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
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