Commit graph

38050 commits

Author SHA1 Message Date
rxu
660f3d2b86
[ticket/17402] Adjust precaution text
PHPBB-17402
2024-10-04 22:53:32 +07:00
Marc Alexander
ae8a5e791e
Merge pull request #6693 from marc1706/ticket/17343
[ticket/17343] Display push notifications in user language
2024-10-03 21:20:39 +02:00
Marc Alexander
ff7fffa8a4 Merge branch '3.3.x' 2024-10-03 11:43:24 +00:00
Marc Alexander
ae1d830e84
Merge pull request #6729 from rxu/ticket/17391
[ticket/17391] Fix PHP warning on creating group with the name already in use
2024-10-03 13:43:04 +02:00
Marc Alexander
d2f4a48694 Merge branch '3.3.x' 2024-10-03 09:33:55 +00:00
Marc Alexander
688c7cad49
Merge pull request #6731 from marc1706/ticket/17407
[ticket/17407] Combine create and update step and use replace edit-mode
2024-10-03 11:33:36 +02:00
Marc Alexander
44f04a91f3
[ticket/17407] Combine create and update step and use replace edit-mode
[skip ci] Since this change won't run until merged.

PHPBB-17407
2024-10-03 11:29:51 +02:00
Marc Alexander
efc667eca5 Merge branch '3.3.x' 2024-10-03 08:20:40 +00:00
Marc Alexander
db7b4c999d
Merge pull request #6730 from marc1706/ticket/17407
[ticket/17407] Update comment in merge check if possible
2024-10-03 10:20:18 +02:00
Marc Alexander
1b0c9b22e0
[ticket/17407] Update comment in merge check if possible
PHPBB-17407
2024-10-03 09:32:43 +02:00
rxu
4217dc46ca
[ticket/17391] Add simple functional test
PHPBB-17391
2024-10-03 13:24:52 +07:00
rxu
46ea7a8ffd
[ticket/17391] Fix PHP warning on creating group with the name already in use
PHPBB-17391
2024-10-03 12:37:30 +07:00
Marc Alexander
1ed5670afe
[ticket/17343] Clean up code for webpush output
PHPBB-17343
2024-10-02 22:06:43 +02:00
Marc Alexander
73a06ef4df
[ticket/17343] Fix emoji display and load users for notification text
PHPBB-17343
2024-10-01 21:33:57 +02:00
Marc Alexander
cc0375befe Merge branch '3.3.x' 2024-09-30 19:05:31 +00:00
Marc Alexander
f80b41aa77
Merge pull request #6704 from danieltj27/ticket/17382
[ticket/17382] Update the find a member FAQ text to fix grammar
2024-09-30 21:05:09 +02:00
Marc Alexander
767d9e1198
[ticket/17343] Display push notifications in user language
PHPBB-17343
2024-09-30 19:39:05 +02:00
Daniel James
501ecf5dec [ticket/17382] Update FAQ string with new suggestion
PHPBB-17382
2024-09-29 23:38:09 +01:00
Marc Alexander
94112979a0
Merge pull request #6702 from marc1706/ticket/16777
[ticket/16777] Remove remainders of max image size
2024-09-29 20:47:40 +02:00
Marc Alexander
8de32341e2
Merge branch '3.3.x' 2024-09-29 20:40:43 +02:00
Marc Alexander
13b267ca6f
Merge pull request #6715 from marc1706/ticket/17385
[ticket/17385] Backport file_downloader with guzzle for versioncheck with redirect support
2024-09-29 19:57:33 +02:00
Marc Alexander
d25e5f6360 Merge branch '3.3.x' 2024-09-29 17:29:56 +00:00
Marc Alexander
6db142b8ef
Merge pull request #6705 from rxu/ticket/17383
[ticket/17383] Fix HELO/EHLO error in email messenger on PHP8
2024-09-29 19:29:37 +02:00
Marc Alexander
ca0c784a8c
Merge pull request #6724 from marc1706/ticket/17403
[ticket/17403] Update composer and node dependencies
2024-09-29 14:56:06 +02:00
Marc Alexander
864e695deb Merge branch '3.3.x' 2024-09-29 09:58:30 +00:00
rxu
4ba4b94fe0
[ticket/17402] Add precaution
PHPBB-17402
2024-09-29 16:42:28 +07:00
Marc Alexander
071a91ac85
Merge pull request #6721 from marc1706/ticket/17400
[ticket/17400] Use fixed version for mssql 2017 tests
2024-09-29 11:30:13 +02:00
Marc Alexander
7c95839951
Merge pull request #6725 from iMattPro/ticket/17404
[ticket/17404] Update workflow test badges
2024-09-29 11:26:09 +02:00
Marc Alexander
65794eb96f Merge branch '3.3.x' 2024-09-29 09:14:18 +00:00
Marc Alexander
cd619d350b
Merge pull request #6727 from marc1706/ticket/17396
[ticket/17396] Use GitHub App to merge to master
2024-09-29 11:13:59 +02:00
Marc Alexander
fe4d8bfa7e
[ticket/17396] Use GitHub App to merge to master
[skip actions] Due to no code changes that run in PRs.

PHPBB-17396
2024-09-29 11:09:46 +02:00
Marc Alexander
6c2d68962f
Merge branch '3.3.x' 2024-09-29 09:38:15 +02:00
Marc Alexander
283b4f8171
Merge pull request #6726 from rxu/ticket/17405
[ticket/17405] Fix getting UTC date/time information logic
2024-09-29 09:38:13 +02:00
rxu
990cbe093b
[ticket/17405] Fix getting UTC date/time information logic
PHPBB-17405
2024-09-29 01:57:53 +07:00
Matt Friedman
80957d12eb
[ticket/17404] Update workflow test badges
PHPBB-17404

Signed-off-by: Matt Friedman <maf675@gmail.com>
2024-09-28 09:26:04 -07:00
Marc Alexander
9938613d42
Merge branch '3.3.x' 2024-09-28 16:52:14 +01:00
Marc Alexander
d8dc1204c2
Merge pull request #6723 from marc1706/ticket/17394
[ticket/17394] Merge local 3.3.x and not remote into master
2024-09-28 16:52:12 +01:00
Marc Alexander
724ecdcdba
[ticket/17403] Update node packages
PHPBB-17403
2024-09-28 16:32:34 +01:00
Marc Alexander
56f8b08ec2
[ticket/17403] Update composer depdencies and twig
PHPBB-17403
2024-09-28 16:29:55 +01:00
Marc Alexander
d5e94f1d97
[ticket/17394] Merge local 3.3.x and not remote into master
PHPBB-17394
2024-09-28 16:14:22 +01:00
Marc Alexander
9ace4dc585
[ticket/17385] Change default value in docblock
PHPBB-17385
2024-09-28 16:01:02 +01:00
rxu
2ac9c0ae7c
[ticket/17402] Add CLI reparser option to force reparsing BBCode
PHPBB-17402
2024-09-28 21:47:09 +07:00
Marc Alexander
e21d7be3d3
Merge branch '3.3.x' 2024-09-28 15:28:11 +01:00
Marc Alexander
5229152604
[ticket/17400] Use ubuntu 20.04 until microsoft fixes their container
PHPBB-17400
2024-09-28 15:23:35 +01:00
Marc Alexander
914383a581
Merge pull request #6714 from danieltj27/ticket/17390
[ticket/17390] Fix unset template variable for topic approval in mcp
2024-09-25 16:12:07 +01:00
Marc Alexander
f628e4f0b4
Merge pull request #6714 from danieltj27/ticket/17390
[ticket/17390] Fix unset template variable for topic approval in mcp
2024-09-25 17:08:39 +02:00
Marc Alexander
96df4d1284
Merge pull request #6664 from rubencm/ticket/17357
[ticket/17357] Remove file_info from storage
2024-09-25 17:07:04 +02:00
Marc Alexander
a23fb62817
Merge branch '3.3.x' 2024-09-25 15:21:07 +01:00
Marc Alexander
45a43e85d8
Merge pull request #6720 from marc1706/ticket/17396
[ticket/17396] Fetch full history and branch 3.3.x if merging to master
2024-09-25 16:14:45 +02:00
Marc Alexander
08d184b0fa
[ticket/17396] Try running other-tests on ubuntu-20.04
PHPBB-17396
2024-09-25 14:34:54 +01:00