Commit graph

37448 commits

Author SHA1 Message Date
Marc Alexander
b8e66f43dc
Merge pull request #6611 from iMattPro/ticket/17313
[ticket/17313] Add Push Module to Correct Parent
2024-05-15 21:51:54 +02:00
Matt Friedman
9cb10ec28d
[ticket/17313] Add Push Module to Correct Parent
PHPBB3-17313

Signed-off-by: Matt Friedman <maf675@gmail.com>
2024-05-13 17:46:19 -07:00
Marc Alexander
df5822141e
Merge branch '3.3.x' 2024-05-13 20:52:21 +02:00
Marc Alexander
6aa980eadb
Merge branch 'prep-release-3.3.12' into 3.3.x 2024-05-13 20:51:08 +02:00
Marc Alexander
dbf0b9ebe6
Merge pull request #6610 from Crizz0/ticket/17311
[ticket/17311] Update PHP requirements and tested version
2024-05-13 20:50:11 +02:00
Christian Schnegelberger
874fb8c59c [ticket/17311] Update PHP requirements and tested version
PHPBB3-17176
2024-05-13 19:21:52 +02:00
Marc Alexander
43dcf73a21
Merge branch '3.3.x' 2024-05-12 21:13:02 +02:00
Marc Alexander
e195e2ad82
[3.3.x] Update version to 3.3.13-dev 2024-05-12 21:10:16 +02:00
Marc Alexander
9aebbcc1a0
Merge branch 'prep-release-3.3.12' into 3.3.x 2024-05-12 21:08:01 +02:00
Marc Alexander
7b734ef529
[prep-release-3.3.12] Update changelog for 3.3.12-RC1 2024-05-09 13:01:53 +02:00
Marc Alexander
6753961756
[prep-release-3.3.12] Update stylesheet hashes for 3.3.12-RC1 2024-05-09 12:59:38 +02:00
Marc Alexander
d2295b82f1
[prep-release-3.3.12] Add migration for 3.3.12-RC1 2024-05-09 12:59:37 +02:00
Marc Alexander
74845a6b3a
[prep-release-3.3.12] Update version numbers to 3.3.12 2024-05-09 12:59:36 +02:00
Marc Alexander
f13b17fd00
[prep-release-3.3.12] Update version numbers to 3.3.12-RC1 2024-05-09 12:59:35 +02:00
Marc Alexander
546cf61dbd
Merge branch '3.3.x' 2024-05-08 17:24:42 +02:00
Marc Alexander
d67493e887
Merge pull request #6608 from marc1706/ticket/17310-master
[ticket/17310] Update workflow actions to v4 -- master version
2024-05-08 17:24:38 +02:00
Marc Alexander
149d0bd227
Merge pull request #6607 from marc1706/ticket/17310
[ticket/17310] Update workflow actions to v4
2024-05-08 17:24:26 +02:00
Marc Alexander
8c8f7315ea
Merge branch '3.3.x' 2024-05-08 17:22:18 +02:00
Marc Alexander
eb12d385a0
Merge pull request #6549 from marc1706/ticket/15325
[ticket/15325] Do not show non-local permissions for local data
2024-05-08 17:22:15 +02:00
Marc Alexander
b502fe9fbc
Merge branch 'ticket/17310' into ticket/17310-master 2024-05-07 21:58:10 +02:00
Marc Alexander
d318768634
[ticket/17176] Use correct ldap URI
PHPBB3-17176
2024-05-07 21:57:48 +02:00
Marc Alexander
843cb97048
[ticket/17176] Use ldapuri instead of removed ldaphost
PHPBB3-17176
2024-05-07 21:57:35 +02:00
Marc Alexander
9ecd1e4dd4
Merge pull request #6606 from marc1706/ticket/17309
[ticket/17309] Update gulp and remove no longer needed gulp packages
2024-05-07 21:50:29 +02:00
Marc Alexander
b5f867c3cc
[ticket/17310] Update node action to v3 and node version to 20
PHPBB3-17310
2024-05-07 21:24:20 +02:00
Marc Alexander
ec1f322440
Merge branch 'ticket/17310' into ticket/17310-master 2024-05-07 21:24:08 +02:00
Marc Alexander
a85c36b15e
[ticket/17310] Update workflow actions to v4
PHPBB3-17310
2024-05-07 21:21:10 +02:00
Marc Alexander
19f534770d
[ticket/17309] Update gulp and remove no longer needed gulp packages
PHPBB3-17309
2024-05-07 21:02:28 +02:00
Marc Alexander
76ab83893b
[ticket/15325] Rename variable for sql is local exclude
PHPBB3-15325
2024-05-06 20:06:10 +02:00
Marc Alexander
222ca643b5
Merge branch '3.3.x' 2024-05-06 18:23:21 +02:00
Marc Alexander
9aec69413f
Merge pull request #6594 from marc1706/ticket/17077
[ticket/17077] Improve handling of posting to reduce double submit possibility
2024-05-06 18:22:58 +02:00
Marc Alexander
42108b5e11
[ticket/15325] Remove no longer needed note about permissions being global
PHPBB3-15325
2024-05-04 09:00:30 +02:00
Marc Alexander
241cd5f41a
Merge branch '3.3.x' 2024-05-03 22:16:41 +02:00
Marc Alexander
2267ef1ac2
Merge pull request #6604 from marc1706/ticket/17130
[ticket/17130] Reparse magic urls in posts based on actual content
2024-05-03 22:16:28 +02:00
Marc Alexander
3f73ae8545
[ticket/17130] Reparse magic urls in posts based on actual content
PHPBB3-17130
2024-05-03 20:25:44 +02:00
Marc Alexander
6f45b46746
[ticket/17077] Add proper locking in PHP without releasing form tokens
PHPBB3-17077
2024-05-01 11:22:29 +02:00
Marc Alexander
a05ce5fd59
Merge branch '3.3.x' 2024-04-28 21:07:56 +02:00
Marc Alexander
844bf0141f
Merge pull request #6602 from Crizz0/ticket/17306-master
[ticket/17306] Add type declaration to get_context and array for $words (for Master)
2024-04-28 21:07:52 +02:00
Marc Alexander
df43810f55
Merge pull request #6600 from Crizz0/ticket/17306
[ticket/17306] Add type declaration to get_context and array for $words
2024-04-28 21:07:08 +02:00
Marc Alexander
f81c217015
Merge pull request #6599 from marc1706/ticket/12960
[ticket/12960] Remove broken captcha and add incomplete captcha as placeholder
2024-04-28 09:02:14 +02:00
Marc Alexander
2008035527
Merge branch '3.3.x' 2024-04-23 21:43:50 +02:00
Marc Alexander
42252460a9
Merge pull request #6603 from marc1706/ticket/17305
[ticket/17305] Add missing space to sql_sort
2024-04-23 21:43:44 +02:00
Marc Alexander
8dd6b5373d
[ticket/15325] Add test for displayed permissions
PHPBB3-15325
2024-04-23 21:33:09 +02:00
Marc Alexander
6c45c1ff6b
[ticket/15325] Do not show non-local permissions for local data
PHPBB3-15325
2024-04-23 20:49:02 +02:00
Marc Alexander
18a672c16e
[ticket/17305] Add missing space to sql_sort
PHPBB3-17305
2024-04-23 20:17:59 +02:00
Marc Alexander
4a3367e594
Merge branch '3.3.x' 2024-04-22 21:42:53 +02:00
Marc Alexander
d60998ba69
Merge pull request #6601 from marc1706/ticket/17305
[ticket/17305] Change sql_sort to be more in line with previous code
2024-04-22 21:42:51 +02:00
Marc Alexander
03ac7a6d5e
Merge branch 'ticket/17306' into ticket/17306-master 2024-04-21 21:22:55 +02:00
Christian Schnegelberger
8f1a777c5f
[ticket/17306] Add type declaration to get_context and array for $words
PHPBB3-17306
2024-04-21 21:22:46 +02:00
Christian Schnegelberger
17a50027b1
[ticket/17306] Change type description for get_context()
PHPBB3-17306
2024-04-21 21:21:09 +02:00
Marc Alexander
c219abf726
Merge branch '3.3.x' 2024-04-21 21:15:31 +02:00