Commit graph

11357 commits

Author SHA1 Message Date
Marc Alexander
d6293db147
Merge branch '3.3.x' 2019-07-23 21:18:31 +02:00
Marc Alexander
c382536f47
Merge branch '3.2.x' into 3.3.x 2019-07-23 21:18:27 +02:00
Marc Alexander
b59e101d8d
Merge pull request #5610 from espipj/ticket/16070
[ticket/16070] Remove support for WebSTAR and Xitami
2019-07-23 21:18:22 +02:00
Marc Alexander
edd3472fcb
Merge branch '3.3.x' 2019-07-23 21:08:59 +02:00
Marc Alexander
b5e6f34cd9
Merge branch '3.2.x' into 3.3.x 2019-07-23 21:08:54 +02:00
Marc Alexander
a4ad94ef5c
Merge pull request #5624 from senky/ticket/16089
[ticket/16089] Add core.confirm_box_ajax_before
2019-07-23 21:08:50 +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
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
Jakub Senko
90dcd1a0f4
[ticket/16089] Add core.confirm_box_ajax_before
PHPBB3-16089
2019-07-22 08:19:32 +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
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
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
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
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
3D-I
aad8ffff51 [ticket/15211] Fix Emoji characters in forum name
PHPBB3-15211
2019-06-11 05:44:17 +02:00
Jakub Senko
a91b37d8f2
[ticket/16075] Fix warning in PM filter
PHPBB3-16075
2019-06-07 16:12:02 +02:00
Marc Alexander
6261ea3c9e
Merge branch '3.3.x' 2019-06-06 22:28:53 +02:00
Marc Alexander
95264e2152
Merge branch '3.2.x' into 3.3.x 2019-06-06 22:28:33 +02:00
Marc Alexander
4babe93a5d
Merge pull request #5573 from dark-1/ticket/16024
[ticket/16024] Add core.topic_review_modify_sql_ary
2019-06-06 22:27:00 +02:00
Marc Alexander
54d8735013
Merge branch '3.3.x' 2019-06-05 21:22:37 +02:00
Marc Alexander
183d1afcaa
Merge branch '3.2.x' into 3.3.x 2019-06-05 21:22:32 +02:00
Marc Alexander
ddc9a4dff6
Merge pull request #5615 from 3D-I/ticket/16073
[ticket/16073] Fix warning in ACP version check
2019-06-05 21:22:26 +02:00
Marc Alexander
2c3e3245cd
Merge branch '3.3.x' 2019-06-04 22:21:58 +02:00
Marc Alexander
99d83673f5
Merge branch '3.2.x' into 3.3.x 2019-06-04 22:21:52 +02:00
Marc Alexander
5e4f4b2dc6
Merge pull request #5612 from senky/ticket/15932
[ticket/15932] Disallow deleting locked attachments
2019-06-04 22:21:45 +02:00
Marc Alexander
ff61288295
Merge branch '3.3.x' 2019-06-03 21:18:53 +02:00
Marc Alexander
5540a0f8e0
Merge branch '3.2.x' into 3.3.x 2019-06-03 21:18:46 +02:00
3D-I
0a89c53658 [ticket/16073] Fix warning in ACP version check
PHPBB3-16073
2019-06-01 00:25:24 +02:00
3D-I
fa1952fd08 [ticket/16071] Undefined index for custom attachments groups
PHPBB3-16071
2019-05-29 09:03:55 +02:00
Jakub Senko
9e985af1e8
[ticket/15932] Disallow deleting locked attachments
PHPBB3-15932
2019-05-28 10:15:59 +02:00
espipj
0c3ff0419c [ticket/16070] Remove unused code
PHPBB3-16070
2019-05-27 21:26:44 +01:00