Commit graph

37693 commits

Author SHA1 Message Date
Marc Alexander
a7b4f035a4
Merge branch '3.3.x' 2024-06-01 08:32:01 +02:00
Marc Alexander
cd0e682984
Merge pull request #6619 from marc1706/ticket/17308
[ticket/17308] Change project key to start with PHPBB-
2024-06-01 08:31:59 +02:00
Marc Alexander
8cf12b5189
Merge branch '3.3.x' 2024-06-01 08:15:28 +02:00
Marc Alexander
431b399c68
Merge pull request #6628 from marc1706/ticket/17327
[ticket/17327] Use class name from use statement
2024-06-01 08:15:26 +02:00
Marc Alexander
56d8a7e43f
[ticket/17327] Use class name from use statement
PHPBB3-17327
2024-05-31 22:30:05 +02:00
Marc Alexander
b22726294d
Merge branch '3.3.x' 2024-05-31 21:41:59 +02:00
Marc Alexander
2976314205
Merge branch 'prep-release-3.3.12' into 3.3.x 2024-05-31 21:41:03 +02:00
Marc Alexander
be6bb09984
[prep-release-3.3.12] Update changelog for 3.3.12 2024-05-31 20:05:39 +02:00
Marc Alexander
c495a26f98
[ticket/17153] Use mocked user class in extension test
PHPBB3-17153
2024-05-31 11:25:22 +02:00
Marc Alexander
ad7721368c
[ticket/17153] Add basic avatar config file for installer
It doesn't actually add proper avatar functionality to the installer but
provides the necessary base classes for templating.

PHPBB3-17153
2024-05-31 11:25:22 +02:00
Marc Alexander
aac7d5a99c
[ticket/17153] Use routing helper instead of controller helper in upload avatar
The controller helper class is not needed, routing helper brings all the
needed functionality already.

PHPBB3-17153
2024-05-31 11:25:22 +02:00
Marc Alexander
4db4a5571b
[ticket/17153] Remove phpbb_get_avatar()
PHPBB3-17153
2024-05-31 11:25:22 +02:00
Marc Alexander
f54bafec29
[ticket/17153] Remove get_user_avatar
PHPBB3-17153
2024-05-31 11:25:22 +02:00
Marc Alexander
808b2f3a41
[ticket/17153] Remove phpbb_get_user_avatar
PHPBB3-17153
2024-05-31 11:25:22 +02:00
Marc Alexander
cf44868393
[ticket/17153] Remove phpbb_get_group_avatar()
PHPBB3-17153
2024-05-31 11:25:22 +02:00
Marc Alexander
902283c368
[ticket/17153] Use twig and avatar helper to render avatars
PHPBB3-17153
2024-05-31 11:25:22 +02:00
Marc Alexander
32e6c637ec
Merge branch '3.3.x' 2024-05-31 11:09:16 +02:00
Marc Alexander
8a8232109c
Merge pull request #6609 from battye/ticket/17175
[ticket/17175] Fix topic title in the breadcrumbs when emailing a topic
2024-05-31 11:08:06 +02:00
Marc Alexander
6f3d50bfb2
Merge branch '3.3.x' 2024-05-31 10:46:08 +02:00
Marc Alexander
f3ead808f3
Merge pull request #6615 from danieltj27/ticket/17316
[ticket/17316] Add template events to ucp_groups_manage
2024-05-31 10:46:06 +02:00
Marc Alexander
7a26ba43f6
Merge branch '3.3.x' 2024-05-31 10:41:03 +02:00
Marc Alexander
276502ce58
Merge pull request #6613 from danieltj27/ticket/17315
[ticket/17315] add template events to acp_groups
2024-05-31 10:41:00 +02:00
Marc Alexander
463dbd59ec
Merge branch '3.3.x' 2024-05-31 09:52:17 +02:00
Marc Alexander
8899fcfdc2
Merge pull request #6626 from LukeWCS/ticket/17325
[ticket/17325] Show message for "Re-Check version" if phpBB is still up to date
2024-05-31 09:50:54 +02:00
Marc Alexander
2aba9b0e3f
[prep-release-3.3.12] Remove columns from user_add
These have default values and do not require setting in user_add().
2024-05-30 20:39:52 +02:00
Marc Alexander
80a12f7108
[prep-release-3.3.12] Update changelog for 3.3.12 2024-05-30 11:03:06 +02:00
Marc Alexander
6cef48af2f
[prep-release-3.3.12] Add migration for 3.3.12 2024-05-30 11:00:23 +02:00
Marc Alexander
607fe555af
[prep-release-3.3.12] Update version numbers to 3.3.12 2024-05-30 11:00:22 +02:00
Daniel James
166c4eeb7e
[ticket/17316] Add template events to ucp_groups_manage
PHPBB3-17316
2024-05-30 10:45:30 +02:00
Marc Alexander
bf55502c62
[ticket/17325] Use not instead of ! in template
PHPBB3-17325
2024-05-30 10:40:25 +02:00
Marc Alexander
e101f02473
Merge pull request #6605 from iMattPro/ticket/17300
[ticket/17300] Better Sticky and Announcement Icons
2024-05-30 10:21:10 +02:00
Marc Alexander
f5b14a95b4
Merge branch '3.3.x' 2024-05-30 09:08:58 +02:00
Marc Alexander
df5fcafcb9
Merge pull request #6616 from danieltj27/ticket/17317
[ticket/17317] Change button text for pm recipient to increase readability
2024-05-30 08:54:55 +02:00
Marc Alexander
1fb7e6d2c8
[ticket/security/278] Always release cron lock, even invalid task is passed
SECURITY-278
2024-05-29 22:04:16 +02:00
Marc Alexander
1c1c981b17
[ticket/security/276] Centralise call for token expiration
SECURITY-276
2024-05-29 22:04:15 +02:00
Marc Alexander
7c661746cf
[ticket/security/276] Add test for expiration timer
SECURITY-276
2024-05-29 22:04:15 +02:00
Marc Alexander
24dd47adcf
[ticket/security/276] Add missing information message
SECURITY-276
2024-05-29 22:04:15 +02:00
Marc Alexander
f853f6523f
[ticket/security/276] Prevent sending activation emails multiple times per day
SECURITY-276
2024-05-29 22:04:15 +02:00
Marc Alexander
a63a1913fa
[ticket/security-276] Add migration for user_actkey expiration column
SECURITY-276
2024-05-29 22:04:15 +02:00
Marc Alexander
cfeb747f10
Merge branch '3.3.x' 2024-05-29 21:54:16 +02:00
Marc Alexander
ef593afec5
Merge branch 'prep-release-3.3.12' into 3.3.x 2024-05-29 21:53:47 +02:00
Marc Alexander
51da43f77f
[prep-release-3.3.12] Fix since version and undo md exporter change 2024-05-29 21:53:11 +02:00
Marc Alexander
e328ee96d2
Merge pull request #6625 from rxu/ticket/17324
[ticket/17324] Add template event to notification_dropdown.html
2024-05-29 21:42:46 +02:00
Marc Alexander
4b206ee28b
Merge branch '3.3.x' 2024-05-28 21:08:17 +02:00
Marc Alexander
7f11c1b46d
Merge pull request #6624 from battye/ticket/16553
[ticket/16553] Fix for General Error when approving/disapproving a reported post through the MCP
2024-05-28 21:08:15 +02:00
LukeWCS
ae18669fcd [ticket/17325] Show message for "Re-Check version" if phpBB is still up to date
Show explicit message for "Re-Check version" if installed version is still up
to date

PHPBB3-17325
2024-05-28 20:55:49 +02:00
rxu
9ea4aabe9a
[ticket/17324] Allow targeting events to prep-releases
PHPBB3-17324
2024-05-28 20:36:40 +02:00
rxu
a88040df85
[ticket/17324] Adjust target version
PHPBB3-17324
2024-05-28 20:36:40 +02:00
rxu
fcf89208cf
[ticket/17324] Add template event to notification_dropdown.html
PHPBB3-17324
2024-05-28 20:36:40 +02:00
Marc Alexander
85e60c7816
Merge branch '3.3.x' 2024-05-27 20:17:28 +02:00