Skip to content

Commit ab1891b

Browse files
marc1706marc1706
committed
Merge branch 'prep-release-4.0.0-a1'
2 parents ec681ad + a063b53 commit ab1891b

11 files changed

Lines changed: 554 additions & 41 deletions

File tree

‎build/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
44
<!-- a few settings for the build -->
5-
<property name="newversion" value="4.0.0-a1-dev" />
5+
<property name="newversion" value="4.0.0-a1" />
66
<property name="prevversion" value="3.3.15" />
7-
<property name="olderversions" value="3.1.12, 3.2.11, 3.3.0, 3.3.1, 3.3.2, 3.3.3, 3.3.4, 3.3.5, 3.3.6, 3.3.7, 3.3.8, 3.3.9, 3.3.10, 3.3.11, 3.3.12, 3.3.13, 3.3.14" />
7+
<property name="olderversions" value="3.1.12, 3.2.11, 3.3.14" />
88
<!-- no configuration should be needed beyond this point -->
99

1010
<property name="oldversions" value="${olderversions}, ${prevversion}" />

‎phpBB/adm/style/admin.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -663,6 +663,7 @@ li {
663663

664664
#menu li span.completed:before {
665665
font-family: "Font Awesome 6 Free";
666+
font-weight: 900;
666667
color: #515f77;
667668
margin-right: 1px;
668669
margin-left: -8px;
@@ -676,6 +677,7 @@ li {
676677

677678
.rtl #menu li span.completed:before {
678679
font-family: "Font Awesome 6 Free";
680+
font-weight: 900;
679681
color: #515f77;
680682
margin-right: -8px;
681683
margin-left: 1px;
@@ -2858,12 +2860,14 @@ fieldset.permissions .permissions-switch {
28582860

28592861
.roles-options > span:after {
28602862
font-family: "Font Awesome 6 Free";
2863+
font-weight: 900;
28612864
float: right;
28622865
content: "\f107";
28632866
}
28642867

28652868
.rtl .roles-options > span:after {
28662869
font-family: "Font Awesome 6 Free";
2870+
font-weight: 900;
28672871
float: left;
28682872
content: "\f107";
28692873
}

‎phpBB/config/installer/container/services.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ imports:
99
- { resource: ../../default/container/services_php.yml }
1010
- { resource: ../../default/container/services_routing.yml }
1111
- { resource: ../../default/container/services_twig.yml }
12+
- { resource: ../../default/container/services_twig_extensions.yml }
1213

1314
services:
1415
assets.bag:

‎phpBB/docs/CHANGELOG.html‎

Lines changed: 441 additions & 0 deletions
Large diffs are not rendered by default.

‎phpBB/includes/constants.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
*/
2929

3030
// phpBB Version
31-
@define('PHPBB_VERSION', '4.0.0-a1-dev');
31+
@define('PHPBB_VERSION', '4.0.0-a1');
3232

3333
// QA-related
3434
// define('PHPBB_QA', 1);

‎phpBB/install/convertors/convert_phpbb20.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
$convertor_data = array(
4141
'forum_name' => 'phpBB 2.0.x',
4242
'version' => '1.0.3',
43-
'phpbb_version' => '4.0.0-a1-dev',
43+
'phpbb_version' => '4.0.0',
4444
'author' => '<a href="https://www.phpbb.com/">phpBB Limited</a>',
4545
'dbms' => $dbms,
4646
'dbhost' => $dbhost,

‎phpBB/install/phpbbcli.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
define('IN_PHPBB', true);
2424
define('IN_INSTALL', true);
2525
define('PHPBB_ENVIRONMENT', 'production');
26-
define('PHPBB_VERSION', '4.0.0-a1-dev');
26+
define('PHPBB_VERSION', '4.0.0-a1');
2727
$phpbb_root_path = __DIR__ . '/../';
2828
$phpEx = substr(strrchr(__FILE__, '.'), 1);
2929

‎phpBB/install/schemas/schema_data.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_last
299299
INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock', '0');
300300
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
301301
INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0');
302-
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '4.0.0-a1-dev');
302+
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '4.0.0-a1');
303303
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
304304
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
305305
INSERT INTO phpbb_config (config_name, config_value) VALUES ('exts_composer_repositories', '[]');

‎phpBB/phpbb/db/migration/data/v400/v400a1.php‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?php
2+
/**
3+
*
4+
* This file is part of the phpBB Forum Software package.
5+
*
6+
* @copyright (c) phpBB Limited <https://www.phpbb.com>
7+
* @license GNU General Public License, version 2 (GPL-2.0)
8+
*
9+
* For full copyright and license information, please see
10+
* the docs/CREDITS.txt file.
11+
*
12+
*/
13+
14+
namespace phpbb\db\migration\data\v400;
15+
16+
class v400a1 extends \phpbb\db\migration\migration
17+
{
18+
public function effectively_installed()
19+
{
20+
return version_compare($this->config['version'], '4.0.0-a1', '>=');
21+
}
22+
23+
public static function depends_on()
24+
{
25+
return [
26+
'\phpbb\db\migration\data\v33x\v3315',
27+
'\phpbb\db\migration\data\v400\add_mention_settings',
28+
'\phpbb\db\migration\data\v400\remove_remote_avatar',
29+
'\phpbb\db\migration\data\v400\increase_avatar_size',
30+
'\phpbb\db\migration\data\v400\remove_img_link',
31+
'\phpbb\db\migration\data\v400\add_bbcode_font_icon',
32+
'\phpbb\db\migration\data\v400\font_awesome_6_upgrade',
33+
'\phpbb\db\migration\data\v400\remove_broken_captcha',
34+
'\phpbb\db\migration\data\v400\turnstile_captcha',
35+
'\phpbb\db\migration\data\v400\add_audio_files_attachment_group',
36+
'\phpbb\db\migration\data\v400\add_webpush_token',
37+
'\phpbb\db\migration\data\v400\remove_remote_upload',
38+
'\phpbb\db\migration\data\v400\remove_notify_type',
39+
'\phpbb\db\migration\data\v400\remove_template_php',
40+
'\phpbb\db\migration\data\v400\storage_adapter_local_subfolders_remove',
41+
'\phpbb\db\migration\data\v400\add_webpush_options',
42+
'\phpbb\db\migration\data\v400\remove_max_img_size',
43+
'\phpbb\db\migration\data\v400\hidpi_smilies',
44+
'\phpbb\db\migration\data\v400\extensions_composer_2',
45+
'\phpbb\db\migration\data\v400\add_storage_permission',
46+
'\phpbb\db\migration\data\v400\hidpi_icons',
47+
'\phpbb\db\migration\data\v400\qa_captcha',
48+
'\phpbb\db\migration\data\v400\search_backend_update',
49+
'\phpbb\db\migration\data\v400\remove_flash_v2',
50+
'\phpbb\db\migration\data\v400\add_disable_board_access_config',
51+
'\phpbb\db\migration\data\v400\remove_dbms_version_config',
52+
'\phpbb\db\migration\data\v400\ban_table_p2',
53+
'\phpbb\db\migration\data\v400\extensions_composer_3',
54+
'\phpbb\db\migration\data\v400\acp_storage_module',
55+
'\phpbb\db\migration\data\v400\add_video_files_attachment_group',
56+
'\phpbb\db\migration\data\v400\remove_attachment_download_mode',
57+
'\phpbb\db\migration\data\v400\remove_smtp_auth_method',
58+
];
59+
}
60+
61+
public function update_data()
62+
{
63+
return [
64+
['config.update', ['version', '4.0.0-a1']],
65+
];
66+
}
67+
}

‎phpBB/styles/prosilver/composer.json‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
{
2-
"name": "phpbb/phpbb-style-prosilver",
3-
"description": "phpBB Forum Software default style",
4-
"type": "phpbb-style",
5-
"version": "4.0.0-a1-dev",
6-
"homepage": "https://www.phpbb.com",
7-
"license": "GPL-2.0-only",
8-
"authors": [
9-
{
10-
"name": "phpBB Limited",
11-
"email": "operations@phpbb.com",
12-
"homepage": "https://www.phpbb.com/go/authors"
13-
}
14-
],
15-
"support": {
16-
"issues": "https://tracker.phpbb.com",
17-
"forum": "https://www.phpbb.com/community/",
18-
"docs": "https://www.phpbb.com/support/docs/",
19-
"irc": "irc://irc.libera.chat/phpbb",
20-
"chat": "https://www.phpbb.com/support/chat/"
21-
},
22-
"extra": {
23-
"display-name": "prosilver",
24-
"phpbb-version": "4.0.0-a1-dev",
25-
"parent-style": ""
26-
}
2+
"name": "phpbb/phpbb-style-prosilver",
3+
"description": "phpBB Forum Software default style",
4+
"type": "phpbb-style",
5+
"version": "4.0.0",
6+
"homepage": "https://www.phpbb.com",
7+
"license": "GPL-2.0-only",
8+
"authors": [
9+
{
10+
"name": "phpBB Limited",
11+
"email": "operations@phpbb.com",
12+
"homepage": "https://www.phpbb.com/go/authors"
13+
}
14+
],
15+
"support": {
16+
"issues": "https://tracker.phpbb.com",
17+
"forum": "https://www.phpbb.com/community/",
18+
"docs": "https://www.phpbb.com/support/docs/",
19+
"irc": "irc://irc.libera.chat/phpbb",
20+
"chat": "https://www.phpbb.com/support/chat/"
21+
},
22+
"extra": {
23+
"display-name": "prosilver",
24+
"phpbb-version": "4.0.0-a1",
25+
"parent-style": ""
26+
}
2727
}

0 commit comments

Comments
 (0)