1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 19:24:01 +02:00
Commit Graph

38537 Commits

Author SHA1 Message Date
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
Matt Friedman
4573e2eae0 [ticket/17300] Replace Sticky and Announcement Icons
PHPBB3-17300

Signed-off-by: Matt Friedman <maf675@gmail.com>
2024-05-04 08:32:51 -07: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
Marc Alexander
6f5035597a Merge pull request #6597 from rxu/ticket/17303-master
[ticket/17303] Update jQuery to the version 3.7.1 - master version
2024-04-21 21:15:27 +02:00
Marc Alexander
663100a44f Merge pull request #6596 from rxu/ticket/17303
[ticket/17303] Update jQuery to the version 3.7.1 - 3.3.x version
2024-04-21 21:15:04 +02:00
Marc Alexander
1c8128292c [ticket/17305] Change sql_sort to be more in line with previous code
PHPBB3-17305
2024-04-21 21:01:22 +02:00
Marc Alexander
eb37600df0 Merge branch '3.3.x' 2024-04-19 08:51:19 +02:00
Marc Alexander
25bd56c254 Merge pull request #6598 from marc1706/ticket/17305
[ticket/17305] Improve queries for unanswered posts/topics
2024-04-19 08:51:17 +02:00
Marc Alexander
e83f25a448 [ticket/12960] Remove not needed extra language variable
PHPBB3-12960
2024-04-19 08:49:57 +02:00
Marc Alexander
d1e2e39469 [ticket/12960] Add tests for incomplete captcha
PHPBB3-12960
2024-04-19 08:43:49 +02:00
Marc Alexander
7da461eac4 [ticket/12960] Add docblock for removed_captchas array
PHPBB3-12960
2024-04-18 22:16:36 +02:00
Marc Alexander
9d51ca3eb7 [ticket/12960] Add migration for removing broken captcha
PHPBB3-12960
2024-04-18 22:14:52 +02:00
Marc Alexander
4c721de243 Merge pull request #6591 from iMattPro/ticket/17297
[ticket/17297] Fix broken no avatar source tag in HTML
2024-04-17 20:50:07 +02:00
Marc Alexander
5d11098753 [ticket/12960] Do not try to enable removed captcha during install
PHPBB3-12960
2024-04-17 20:42:41 +02:00