Commit graph

36375 commits

Author SHA1 Message Date
Marc Alexander
4ae50d1776
Merge branch '3.3.x' 2022-06-26 20:29:00 +02:00
Marc Alexander
fc83f213d5
Merge branch 'prep-release-3.3.8' into 3.3.x 2022-06-26 20:28:13 +02:00
Marc Alexander
5e3dd4b55e
[prep-release-3.3.8] Add migration for 3.3.8 2022-06-26 09:39:25 +02:00
Marc Alexander
53e5113893
[prep-release-3.3.8] Update version numbers to 3.3.8 2022-06-26 09:39:23 +02:00
Marc Alexander
3ee81800ec
Merge branch '3.3.x' 2022-06-06 22:56:31 +02:00
Marc Alexander
f930f8821f
[3.3.x] Update versions to 3.3.9-dev 2022-06-06 22:54:43 +02:00
Marc Alexander
b84b875cd2
Merge branch 'prep-release-3.3.8' into 3.3.x 2022-06-06 22:53:26 +02:00
Marc Alexander
bc4a787470
[prep-release-3.3.8] Update changelog for 3.3.8-RC1 2022-06-06 14:40:59 +02:00
Marc Alexander
c6ef628589
[prep-release-3.3.8] Add migration for 3.3.8-RC1 2022-06-06 14:40:31 +02:00
Marc Alexander
d4415d4ad8
[prep-release-3.3.8] Update version numbers to 3.3.8 2022-06-06 14:40:30 +02:00
Marc Alexander
2b92ff372b
[prep-release-3.3.8] Update version numbers to 3.3.8-RC1 2022-06-06 14:40:29 +02:00
Marc Alexander
9548876c9c
Merge branch '3.3.x' 2022-06-06 14:39:14 +02:00
Marc Alexander
5e0bc27dc8
Merge pull request #6400 from marc1706/ticket/16987-master
[ticket/16987] Update composer dependencies to latest versions - master version
2022-06-06 14:39:10 +02:00
Marc Alexander
c410c9bc47
Merge pull request #6399 from marc1706/ticket/16987
[ticket/16987] Update composer dependencies to latest versions
2022-06-06 14:38:46 +02:00
Marc Alexander
d42cc11347
Merge branch 'ticket/16987' into ticket/16987-master 2022-06-06 09:56:25 +02:00
Marc Alexander
52f625a88c
[ticket/16987] Update composer dependencies to latest versions
PHPBB3-16987
2022-06-06 09:54:17 +02:00
Marc Alexander
21f27c2d75
Merge branch '3.3.x' 2022-06-06 09:47:00 +02:00
Marc Alexander
cc5d820443
Merge pull request #6398 from marc1706/ticket/16978-master
[ticket/16978] add missing ul closeing tag & convert to twig
2022-06-06 09:46:56 +02:00
Marc Alexander
feea7958f7
Merge pull request #6378 from hanakin/ticket/16978
[ticket/16978] add missing ul closeing tag
2022-06-06 09:45:44 +02:00
Marc Alexander
9622105d01
[ticket/16978] Resolve invalid twig syntax
PHPBB3-16978
2022-06-04 21:57:47 +02:00
Marc Alexander
25a84713c0
[ticket/16978] Move nbsp to inside if of submit
PHPBB3-16978
2022-06-04 08:51:08 +02:00
hanakin
63c42c49fa
[ticket/16978] merge labgs remove xhtml 1.0 stuff
PHPBB3-16978
2022-06-03 22:42:08 +02:00
hanakin
f8fb1749f0
[ticket/16978] minor cleanup
PHPBB3-16978
2022-06-03 22:39:56 +02:00
hanakin
5b4a955b65
[ticket/16978] convert file to twig
PHPBB3-16978
2022-06-03 22:38:22 +02:00
Marc Alexander
a3c67c18f1
Merge branch 'ticket/16978' into ticket/16978-master 2022-06-03 22:18:03 +02:00
Marc Alexander
2071b94fd0
Merge branch '3.3.x' 2022-06-03 21:21:27 +02:00
Marc Alexander
c61c130596
Merge pull request #6390 from marc1706/ticket/16988
[ticket/16988] Improve handling of appended branch info and security branches
2022-06-03 21:21:24 +02:00
Marc Alexander
900e2c70ac
Merge branch '3.3.x' 2022-05-02 20:50:02 +02:00
Marc Alexander
59a95a3c35
Merge pull request #6396 from lionel-rowe/ticket/13859
[ticket/13859] Allow up-to-date format for Youtube profile field URLs
2022-05-02 20:49:59 +02:00
lionel-rowe
60af39b38c
[ticket/13859] Reorder static & public in migration
PHPBB3-13859
2022-05-02 17:38:38 +02:00
Marc Alexander
c6c294e8c7
Merge branch '3.3.x' 2022-05-01 20:20:46 +02:00
Marc Alexander
8376012f9a
Merge pull request #6393 from LukeWCS/3.3.x
[ticket/16990] Fix for the style template code in the post editor
2022-05-01 20:20:43 +02:00
lionel-rowe
dd6e110210 [ticket/13859] Allow up-to-date format for Youtube profile field URLs
Per the tracker issue:

> In 3.1 a youtube profilefield was added in which we can insert our youtube
> username to link to it.... There is just one major problem though...
>
> New youtube members no longer get an username. So I think we should decide on
> providing different ways to access their profile.

This PR will allow users to use any valid YouTube-domain URL, which allows for
all 3 formats (`/channel/...`, `/c/...`, and the now-legacy `/user/...`).

Per [YouTube's docs](https://support.google.com/youtube/answer/6180214?hl=en):

> ## Channel URL (ID-based)
> Example: youtube.com/channel/UCUZHFZ9jIKrLroW8LcyJEQQ
>
> This is the standard URL that YouTube channels use.
>
> ...
>
> ## Custom URL
> Example: youtube.com/c/YouTubeCreators
>
> A custom URL is a shorter, easy-to-remember URL that you can share with your
> audience.
>
> ...
>
> ## Legacy username URL
> Example: youtube.com/user/YouTube
>
> Depending on when your channel was created, it may have a username. Usernames
> are no longer required for channels today, but you can still use this URL to
> direct to your channel — even if your channel name has changed since you chose
> your username. Existing usernames can't be changed.

PHPBB3-13859
2022-05-01 14:54:39 +01:00
Marc Alexander
5f7ce9b66a
Merge branch '3.3.x' 2022-04-30 23:02:13 +02:00
Marc Alexander
898075f0f8
Merge pull request #6391 from battye/ticket/16800
[ticket/16800] Fix 'No Posts' bug when no date format supplied
2022-04-30 23:02:10 +02:00
Marc Alexander
0a64ffa834
Merge branch '3.3.x' 2022-04-30 22:46:05 +02:00
Marc Alexander
3308318524
Merge pull request #6377 from lionel-rowe/ticket/16981
[ticket/16981] Fix HTML-encoded emojis in email subject line
2022-04-30 22:27:37 +02:00
Marc Alexander
024b37c7b2
Merge branch '3.3.x' 2022-04-30 22:23:10 +02:00
Marc Alexander
e7a5407a40
Merge pull request #6369 from marc1706/ticket/16967
[ticket/16967] Remove support for INCLUDEPHP and PHP/ENDPHP in templates
2022-04-30 22:23:06 +02:00
Marc Alexander
54c27e3e67
Merge pull request #6382 from marc1706/ticket/16967-3.3.x
[ticket/16967] Deprecate PHP in templates
2022-04-30 22:22:49 +02:00
Marc Alexander
412fd483d0
Merge branch '3.3.x' 2022-04-30 22:21:53 +02:00
Marc Alexander
54156dd9d8
Merge pull request #6358 from MichaIng/ticket/16959
[ticket/16959] Remove redundant URL parameters from notification mails
2022-04-30 22:21:51 +02:00
Marc Alexander
6e18e8e10f
Merge branch '3.3.x' 2022-04-30 21:56:08 +02:00
Marc Alexander
8084d977fb
Merge pull request #6395 from kaileysnay/ticket/16991
[ticket/16991] Add events for bookmarks and subscribed topics in UCP
2022-04-30 21:56:06 +02:00
kaileysnay
997f1b92cf [ticket/16991] Add events for bookmarks and subscribed topics in UCP
PHPBB3-16991
2022-04-28 17:31:39 -04:00
kaileysnay
e1069bcbde [ticket/16991] Add events for bookmarks and subscribed topics in UCP
PHPBB3-16991
2022-04-28 17:31:39 -04:00
LukeWCS
9e22bc8691 [ticket/16990] Removed XHTML tag format
PHPBB3-16990
2022-04-27 23:18:52 +02:00
LukeWCS
751b0e2ede [ticket/16990] Fix for the style template code in the post editor
The code present in the prosilver style template causes the wrong
checkbox to be displayed in the post editor if the combination
`f_delete`:true and `f_softdelete`:false is active in the user
context. With this combination, this effectively prevents a forum
post from being deleted via the editor options.

Corrected the relevant section and switched to Twig syntax

PHPBB3-16990
2022-04-26 22:13:50 +02:00
battye
b9f7c3ff6e [ticket/16800] Fix 'No Posts' bug when no date format supplied
PHPBB3-16800
2022-04-17 18:03:48 +08:00
Marc Alexander
0d84769d66
[ticket/16988] Apply fixes suggested by shellcheck
PHPBB3-16988
2022-04-17 09:40:56 +02:00