1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-08 16:45:19 +02:00

4313 Commits

Author SHA1 Message Date
Marc Alexander
411bcc8b8e
Merge branch '3.2.x' 2019-03-13 20:49:45 +01:00
rubencm
96491a70e8 [ticket/15965] Fix hardcoded directory
PHPBB3-15965
2019-02-12 21:19:47 +00:00
Marc Alexander
c76a6177d6
Merge branch '3.2.x' 2019-01-20 15:43:27 +01:00
mrgoldy
e8bbbbd6fa [ticket/15931] Fix PM report emails
PHPBB3-15931
2019-01-14 14:52:06 +01:00
Marc Alexander
830269dfee
[ticket/14948] Update lexer to be compatible with twig 2.6
PHPBB3-14948
2019-01-02 20:19:57 +01:00
Marc Alexander
75757a7db4
[ticket/14948] Update requirements and travis build matrix
PHPBB3-14948
2019-01-02 20:19:56 +01:00
Marc Alexander
c6cc6ba8d8
[ticket/14948] Adjust calls for twig and phpunit updates
PHPBB3-14948
2019-01-02 20:19:56 +01:00
chita
3a45e1fbcc Merge branch '3.2.x' 2018-12-29 16:06:55 +01:00
chita
a578ce0119 Merge pull request #5488 from marc1706/ticket/15921
[ticket/15921] Update textformattter to 1.3.2
2018-12-29 15:56:44 +01:00
JoshyPHP
e9310c928e
[ticket/15921] Use backward compatible template for emojis
PHPBB3-15921
2018-12-29 11:23:47 +01:00
Marc Alexander
05f4046b2b
Merge branch '3.2.x' 2018-12-27 10:00:14 +01:00
Marc Alexander
220490e4db
Merge pull request #5359 from Elsensee/ticket/15509
[ticket/15509] Don't show disabled board when in install
2018-12-27 09:59:42 +01:00
Marc Alexander
4bf485395e
[ticket/15921] Use twemoji
PHPBB3-15921
2018-12-26 23:51:15 +01:00
JoshyPHP
31c0466815
[ticket/15921] Updated dependencies to latest textformatter
PHPBB3-15921
2018-12-26 23:06:18 +01:00
Marc Alexander
805b52a2ef
Merge pull request #5090 from deguif/twig-2
[ticket/15508] Support Twig 2.x
2018-12-25 23:06:25 +01:00
Marc Alexander
9df8975092
Merge branch '3.2.x' 2018-12-24 15:49:21 +01:00
Marc Alexander
64b66a51b6
Merge pull request #5456 from nunoplopes/ticket/15876
[ticket/15876] MySQL 5.7+ support for Q&A captcha plugin
2018-12-24 15:49:13 +01:00
Marc Alexander
c79da081d8
Merge branch '3.2.x' 2018-12-24 15:32:58 +01:00
Marc Alexander
58856c06b0
Merge pull request #5481 from kasimi/ticket/15910-3.2.x
[ticket/15910] Pass object arguments by reference implicitly
2018-12-24 15:32:50 +01:00
Marc Alexander
08e1a7a9e1
Merge branch '3.2.x' 2018-12-23 17:59:21 +01:00
Marc Alexander
ca98cd413a
Merge pull request #5479 from kasimi/ticket/15904
[ticket/15904] Fix counting empty template blocks
2018-12-23 17:14:14 +01:00
Marc Alexander
e389cb2fab
Merge branch '3.2.x' 2018-12-22 17:33:05 +01:00
Marc Alexander
b089116965
[prep-release-3.2.5] Add 3.2.5 migration 2018-12-19 20:16:31 +01:00
Marc Alexander
85ecd2c7be
Merge pull request #43 from phpbb/security/229
[security/229] Update jQuery to 1.12.4
2018-12-19 19:59:19 +01:00
Marc Alexander
68489b2c13
[ticket/15911] Add missing braces
PHPBB3-15911
2018-12-18 21:28:15 +01:00
Marc Alexander
304750a88b
[ticket/15911] Resolve warnings when updating from 3.0.0 to latest
PHPBB3-15911
2018-12-18 21:07:41 +01:00
Marc Alexander
37b33e6b67
[security/229] Adjust effectively_installed on jquery update migration
SECURITY-229
2018-12-13 21:22:58 +01:00
kasimi
83f4074116
[ticket/15910] Pass object arguments by reference implicitly
PHPBB3-15910
2018-12-12 12:41:56 +01:00
Marc Alexander
97c5861d59
[security/229] Update jQuery CDN link
SECURITY-229
2018-12-09 15:43:01 +01:00
kasimi
3bce8bce10
[ticket/15904] Fix counting empty template blocks
PHPBB3-15904
2018-12-08 22:06:19 +01:00
Marc Alexander
6e9c5c6769
Merge pull request #5336 from rubencm/ticket/12629
[ticket/12629] Add debug.errors_show
2018-12-03 21:18:59 +01:00
Marc Alexander
d4e78669ba
Merge branch '3.2.x' 2018-12-01 19:29:10 +01:00
Marc Alexander
8a1d148fa8
[prep-release-3.2.5] Add 3.2.5-RC1 migration 2018-11-29 21:47:47 +01:00
Marc Alexander
b851e708bb
Merge branch '3.2.x' 2018-11-26 21:19:47 +01:00
Marc Alexander
db7f4d4c95
Merge pull request #5450 from hubaishan/ticket/15665
[ticket/15665] Fix MSSQL crashes if upload dir>2GB
2018-11-26 21:19:42 +01:00
Nuno Lopes
eb1cb07341 [ticket/15876] MySQL 5.7+ support for Q&A captch plugin
PHPBB3-15876
2018-11-24 23:43:41 +00:00
Marc Alexander
000f8a27e3
Merge branch '3.2.x' 2018-11-20 20:54:55 +01:00
Marc Alexander
5179e4f93f
Merge pull request #5433 from marc1706/ticket/15542
[ticket/15542] Always append assets versions to assets
2018-11-20 20:54:50 +01:00
hubaishan
dc96e70d1b [ticket/15665] fix double semicolon
PHPBB3-15665
2018-11-20 15:56:02 +03:00
hubaishan
717d4840e2 [ticket/15665] Fix MSSQL crashes if upload dir>2GB
Add cast_expr_to_bigint() to mssql_base

PHPBB3-15665
2018-11-20 13:38:15 +03:00
Marc Alexander
06a3bfd203
Merge branch '3.2.x' 2018-11-11 14:03:27 +01:00
Marc Alexander
023ec01611
[prep-release-3.2.4] Correctly specify dependencies 2018-11-11 10:14:16 +01:00
Marc Alexander
f631d6b84d
[prep-release-3.2.4] Add migration for 3.2.4 2018-11-10 21:24:14 +01:00
Marc Alexander
0dfbb60bc3
Merge pull request #42 from phpbb/ticket/security/227
[ticket/security/227] Replace ImageMagick support with thumbnail event
2018-11-10 17:04:00 +01:00
Derky
3d534a5eb6 [ticket/security/227] Change migration depends_on to 3.2.4-RC1
SECURITY-227
2018-11-04 23:18:38 +01:00
Marc Alexander
11ae11a156
[ticket/15542] Only add assets version for relative paths
PHPBB3-15542
2018-10-29 22:57:53 +01:00
Marc Alexander
5d4fccd235 [ticket/15542] Always append assets versions to assets
PHPBB3-15542
2018-10-29 16:07:48 +01:00
Marc Alexander
5849fb69a4
Merge branch '3.2.x' 2018-10-28 21:57:28 +01:00
Marc Alexander
46bc335524
[prep-release-3.2.4] Add migration for 3.2.4-RC1 2018-10-28 20:19:07 +01:00
Marc Alexander
f7056d232b
Merge branch '3.2.x' 2018-10-28 16:32:51 +01:00