1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-13 16:05:34 +02:00
Commit Graph

27835 Commits

Author SHA1 Message Date
Marc Alexander
f23b429cd6 Merge branch '3.3.x' 2019-07-22 21:40:17 +02:00
Marc Alexander
58fa8eabb7 Merge branch '3.2.x' into 3.3.x 2019-07-22 21:40:12 +02:00
Marc Alexander
7c559b2912 Merge pull request #5609 from senky/ticket/15946
[ticket/15946] Add core.posting_modify_row_data
2019-07-22 21:40:02 +02:00
Marc Alexander
cd7a8a7ca1 Merge branch '3.3.x' 2019-07-22 21:32:02 +02:00
Marc Alexander
b2c5f8fb48 Merge branch '3.2.x' into 3.3.x 2019-07-22 21:31:57 +02:00
Marc Alexander
d738397e6f Merge pull request #5606 from senky/ticket/15976
[ticket/15976] Reset user_passchg only if user changed password
2019-07-22 21:31:53 +02:00
Marc Alexander
0071dce31d Merge branch '3.3.x' 2019-07-22 21:24:51 +02:00
Marc Alexander
01018630c9 Merge pull request #5619 from marc1706/ticket/16082
[ticket/16082] Remove XCache as it does not support PHP 7
2019-07-22 21:24:46 +02:00
Marc Alexander
5b3aa37527 Merge branch '3.3.x' 2019-07-22 21:23:22 +02:00
Marc Alexander
f5d28a95b0 Merge pull request #5618 from marc1706/ticket/16081
[ticket/16081] Remove eAccelerator cache driver
2019-07-22 21:23:17 +02:00
Marc Alexander
21442388ff Merge branch '3.3.x' 2019-07-22 20:55:13 +02:00
Marc Alexander
204e3b1fe0 Merge branch '3.2.x' into 3.3.x 2019-07-22 20:55:06 +02:00
Marc Alexander
6559bb9511 Merge pull request #5572 from dark-1/ticket/16023
[ticket/16023] Add core.message_history_modify_template_vars
2019-07-22 20:55:00 +02:00
Marc Alexander
d1c70f7c66 Merge branch '3.3.x' 2019-07-21 22:24:57 +02:00
Marc Alexander
6fc269b62a Merge branch '3.2.x' into 3.3.x 2019-07-21 22:24:52 +02:00
Marc Alexander
0e2c927551 Merge pull request #5625 from marc1706/ticket/16093
[ticket/16093] Do not display attach-row-tpl
2019-07-21 22:24:48 +02:00
Marc Alexander
72dbba8592 Merge branch '3.3.x' 2019-07-21 21:38:31 +02:00
Marc Alexander
348979c13d Merge branch '3.2.x' into 3.3.x 2019-07-21 21:38:27 +02:00
Marc Alexander
091e195717 Merge pull request #5571 from dark-1/ticket/16021
[ticket/16021] Recognize number of Template Event instances in events.md file
2019-07-21 21:38:23 +02:00
Marc Alexander
627c8b75b1 Merge branch '3.3.x' 2019-07-21 21:12:11 +02:00
Marc Alexander
5d2e144624 Merge branch '3.2.x' into 3.3.x 2019-07-21 21:12:07 +02:00
Marc Alexander
17c6cd3676 Merge pull request #5562 from senky/ticket/15961
[ticket/15961] Use newer TLS in SMTP
2019-07-21 21:12:00 +02:00
Marc Alexander
17ef8a0369 [ticket/16093] Do not display attach-row-tpl
PHPBB3-16093
2019-07-21 20:47:16 +02:00
Marc Alexander
6941b3934d Merge pull request #5582 from paul999/ticket/16043
Make sure $phpbb_container is not null before trying to get anything …
2019-06-19 07:35:43 +02:00
Paul Sohier
4be13baef9 [ticket/16043] Check if not null before getting anything from the container
This is only happening when there is basicly an error during
init of the container.

PHPBB3-16043
2019-06-18 10:30:31 +02:00
Marc Alexander
102ea13e5d Merge branch '3.3.x' 2019-06-17 15:32:31 +02:00
Marc Alexander
6d4fdb1f15 Merge branch '3.2.x' into 3.3.x 2019-06-17 15:32:07 +02:00
Marc Alexander
ab6fd30d0d Merge pull request #5608 from senky/ticket/15967
[ticket/15967] Improve admin activate email wording
2019-06-17 15:31:42 +02:00
Marc Alexander
6bcfeea6cb Merge branch '3.3.x' 2019-06-17 15:28:35 +02:00
Marc Alexander
5cef0d2035 Merge branch '3.2.x' into 3.3.x 2019-06-17 15:28:10 +02:00
Marc Alexander
70f09a60c7 Merge pull request #5620 from senky/ticket/16075
[ticket/16075] Fix warning in PM filter
2019-06-17 15:27:45 +02:00
Marc Alexander
48aed593fe Merge branch '3.3.x' 2019-06-17 14:54:53 +02:00
Marc Alexander
8a979d6871 Merge branch '3.2.x' into 3.3.x 2019-06-17 14:53:56 +02:00
Marc Alexander
a393a23a08 Merge pull request #5616 from JoshyPHP/ticket/16074
[ticket/16074] Fix Twemoji URL for ZWJ sequences
2019-06-17 13:54:38 +02:00
Marc Alexander
3d8218e9d6 Merge branch '3.3.x' 2019-06-17 10:27:02 +02:00
Marc Alexander
30f522351e Merge branch '3.2.x' into 3.3.x 2019-06-17 10:26:33 +02:00
Marc Alexander
7f50c26941 Merge pull request #5622 from 3D-I/ticket/15211
[ticket/15211] Fix Emoji characters in forum name
2019-06-17 10:26:04 +02:00
Marc Alexander
670a606d11 Merge branch '3.3.x' 2019-06-17 10:21:36 +02:00
Marc Alexander
a6803e6a18 Merge branch '3.2.x' into 3.3.x 2019-06-17 10:21:09 +02:00
Marc Alexander
2a0b38cac0 Merge pull request #5604 from senky/ticket/15984
[ticket/15984] Use private cache-control
2019-06-17 10:20:36 +02:00
Marc Alexander
869637d544 Merge branch '3.3.x' 2019-06-17 10:15:30 +02:00
Marc Alexander
05f9ef7134 Merge branch '3.2.x' into 3.3.x 2019-06-17 10:15:00 +02:00
Marc Alexander
ca705af91d Merge pull request #5602 from senky/ticket/16003
[ticket/16003] Fix num_posts sync
2019-06-17 10:14:35 +02:00
Marc Alexander
2d80fc3c4a Merge branch '3.3.x' 2019-06-17 10:12:23 +02:00
Marc Alexander
fc8d0c54e9 Merge branch '3.2.x' into 3.3.x 2019-06-17 10:11:57 +02:00
Marc Alexander
c0917c2862 Merge pull request #5600 from senky/ticket/16047
[ticket/16047] Improve wording for PM permissions
2019-06-17 10:11:31 +02:00
Marc Alexander
d0b8e117cc Merge branch '3.3.x' 2019-06-17 10:07:30 +02:00
Marc Alexander
5de54906f0 Merge branch '3.2.x' into 3.3.x 2019-06-17 10:07:03 +02:00
Marc Alexander
cfd4aab7b7 Merge pull request #5599 from mrgoldy/ticket/16068
[ticket/16068] Adjust DocBlock @param's
2019-06-17 10:06:11 +02:00
Marc Alexander
93c1061f17 Merge branch '3.3.x' 2019-06-17 10:00:52 +02:00