From 7ff744d3fa0e4874db4c068b7393b68f56ffff55 Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 18 Jun 2023 11:26:25 +0100 Subject: [PATCH] Prepare 1.1.1 release (#3399) --- CHANGELOG.md | 28 +++++++++++- core/classes/Database/DatabaseInitialiser.php | 2 +- core/includes/updates/202.php | 24 ----------- core/includes/updates/203.php | 43 ------------------- core/includes/updates/{201.php => 210.php} | 4 +- custom/panel_templates/Default/template.php | 8 ++-- custom/templates/DefaultRevamp/template.php | 8 ++-- modules/Cookie Consent/module.php | 6 +-- modules/Core/module.php | 6 +-- modules/Discord Integration/module.php | 4 +- modules/Forum/module.php | 6 +-- modules/Members/module.php | 6 +-- package.json | 2 +- 13 files changed, 52 insertions(+), 95 deletions(-) delete mode 100644 core/includes/updates/202.php delete mode 100644 core/includes/updates/203.php rename core/includes/updates/{201.php => 210.php} (76%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12d7752888..af6fc732ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,34 @@ # NamelessMC v2 Changelog -## [Unreleased](https://github.com/NamelessMC/Nameless/compare/v2.1.0...v2) +## [Unreleased](https://github.com/NamelessMC/Nameless/compare/v2.1.1...v2) > [Milestone](https://github.com/NamelessMC/Nameless/milestone/21) +## [2.1.1](https://github.com/NamelessMC/Nameless/compare/v2.1.0...v2.1.1) - 2023-06-18 +### Added +- Add Russian translation for Members module [#3352](https://github.com/NamelessMC/Nameless/pull/3352) + +### Changed +- Add all missing languages to the Members module [#3350](https://github.com/NamelessMC/Nameless/pull/3350) +- Remove unable to update groups catch [#3360](https://github.com/NamelessMC/Nameless/pull/3360) +- Call compileQueries only when needed [#3386](https://github.com/NamelessMC/Nameless/pull/3386) +- Remove Discord discriminator requirement [#3374](https://github.com/NamelessMC/Nameless/pull/3374) +- Require module autoload file before module init [#3397](https://github.com/NamelessMC/Nameless/pull/3397) + +### Fixed +- Fix AuthMe enabled value [#3349](https://github.com/NamelessMC/Nameless/pull/3349) +- Ensure Minecraft integration is enabled [#3356](https://github.com/NamelessMC/Nameless/pull/3356) +- Include .htaccess file in release zip [#3362](https://github.com/NamelessMC/Nameless/pull/3362) +- Fix missing cache settings [#3361](https://github.com/NamelessMC/Nameless/pull/3361) +- Fix user group issue [#3365](https://github.com/NamelessMC/Nameless/pull/3365) +- Fix forum title/description encoding on edit [#3359](https://github.com/NamelessMC/Nameless/pull/3359) +- Remove placeholder from singular message [#3369](https://github.com/NamelessMC/Nameless/pull/3369) +- Fix not being able to see Members page in Navigation settings [#3372](https://github.com/NamelessMC/Nameless/pull/3372) +- Fix multi query [#3383](https://github.com/NamelessMC/Nameless/pull/3383) +- Fix icon not being properly shown [#3377](https://github.com/NamelessMC/Nameless/pull/3377) +- Fix ghost player on status page [#3351](https://github.com/NamelessMC/Nameless/pull/3351) +- Fix outdated event [#3394](https://github.com/NamelessMC/Nameless/pull/3394) +- Fix OAuth linking for forced integrations [#3395](https://github.com/NamelessMC/Nameless/pull/3395) + ## [2.1.0](https://github.com/NamelessMC/Nameless/compare/v2.0.3...v2.1.0) - 2023-05-01 ### Added - Add dark mode toggle switch [#2877](https://github.com/NamelessMC/Nameless/pull/2877) diff --git a/core/classes/Database/DatabaseInitialiser.php b/core/classes/Database/DatabaseInitialiser.php index 55845eea9f..568b0130f1 100644 --- a/core/classes/Database/DatabaseInitialiser.php +++ b/core/classes/Database/DatabaseInitialiser.php @@ -183,7 +183,7 @@ private function initialiseSettings(): void { Util::setSetting('recaptcha_type', 'Recaptcha3'); Util::setSetting('recaptcha_login', '0'); Util::setSetting('email_verification', '1'); - Util::setSetting('nameless_version', '2.1.0'); + Util::setSetting('nameless_version', '2.1.1'); Util::setSetting('version_checked', date('U')); Util::setSetting('phpmailer', '0'); Util::setSetting('user_avatars', '0'); diff --git a/core/includes/updates/202.php b/core/includes/updates/202.php deleted file mode 100644 index 00cf4a3778..0000000000 --- a/core/includes/updates/202.php +++ /dev/null @@ -1,24 +0,0 @@ -runMigrations(); - - // Move 'authme_db' json row in settings table to 'authme' section in config file - $authme_db = null; - $result = DB::getInstance()->get('settings', ['name', 'authme_db']); - if ($result->count()) { - $authme_db = $result->first()->value; - } - if ($authme_db !== null) { - $authme_db = (array) json_decode($authme_db); - unset($authme_db['sync']); - $authme_db['port'] = (int) $authme_db['port']; - Config::set('authme', $authme_db); - DB::getInstance()->delete('settings', ['name', 'authme_db']); - } - - $this->setVersion('2.0.3'); - } -}; diff --git a/core/includes/updates/203.php b/core/includes/updates/203.php deleted file mode 100644 index 8ef34408f5..0000000000 --- a/core/includes/updates/203.php +++ /dev/null @@ -1,43 +0,0 @@ -runMigrations(); - - // Move query interval from cache to settings table - $cache = new Cache(['name' => 'nameless', 'extension' => '.cache', 'path' => ROOT_PATH . '/cache/']); - $cache->setCache('server_query_cache'); - if ($cache->isCached('query_interval')) { - $query_interval = $cache->retrieve('query_interval'); - if (is_numeric($query_interval) && $query_interval <= 60 && $query_interval >= 5) { - // Interval ok - } else { - // Default to 10 - $query_interval = 10; - } - Util::setSetting('minecraft_query_interval', $query_interval); - } - - // Replace `external_query` with `query_type` - Util::setSetting('query_type', Util::getSetting('external_query') == 1 ? 'external' : 'internal'); - Util::setSetting('external_query', null); - - // Forum post conversion - ConvertForumPostTask::schedule(); - - // Sitemap generation - GenerateSitemap::schedule(new Language('core', 'en_UK')); - - // Add all groups to member list selectable groups - Util::setSetting('member_list_viewable_groups', json_encode(array_map(static fn (Group $group) => $group->id, Group::all())), 'Members'); - - Config::set('core.installed', true); - - // Ensure admin group has administrator perm - $admin_group = DB::getInstance()->query('SELECT permissions FROM nl2_groups WHERE id = 2')->first(); - $perms = json_decode($admin_group->permissions, true); - $perms['administrator'] = 1; - DB::getInstance()->query('UPDATE nl2_groups SET permissions = ? WHERE id = 2', [json_encode($perms)]); - - $this->setVersion('2.1.0'); - } -}; diff --git a/core/includes/updates/201.php b/core/includes/updates/210.php similarity index 76% rename from core/includes/updates/201.php rename to core/includes/updates/210.php index eb115a8a93..f7ea670b1b 100644 --- a/core/includes/updates/201.php +++ b/core/includes/updates/210.php @@ -1,10 +1,8 @@ runMigrations(); - $this->setVersion('2.0.2'); + $this->setVersion('2.1.1'); } }; diff --git a/custom/panel_templates/Default/template.php b/custom/panel_templates/Default/template.php index 247b9bf700..7c880f0054 100644 --- a/custom/panel_templates/Default/template.php +++ b/custom/panel_templates/Default/template.php @@ -5,7 +5,7 @@ * * For NamelessMC * https://github.com/NamelessMC/Nameless/ - * NamelessMC version 2.1.0 + * NamelessMC version 2.1.1 * * License: MIT * @@ -24,8 +24,8 @@ public function __construct(Smarty $smarty, Language $language) { parent::__construct( 'Default', // Template name - '2.1.0', // Template version - '2.1.0', // Nameless version template is made for + '2.1.1', // Template version + '2.1.1', // Nameless version template is made for 'Coldfire' // Author, you can use HTML here ); @@ -40,7 +40,7 @@ public function __construct(Smarty $smarty, Language $language) { $this->addCSSFiles([ (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/custom/panel_templates/Default/assets/css/sb-admin-2.min.css' => [], 'https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i' => [], - (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/custom/panel_templates/Default/assets/css/custom.css?v=210' => [], + (defined('CONFIG_PATH') ? CONFIG_PATH : '') . '/custom/panel_templates/Default/assets/css/custom.css?v=211' => [], ]); $this->addJSFiles([ diff --git a/custom/templates/DefaultRevamp/template.php b/custom/templates/DefaultRevamp/template.php index 2ac3ddf288..138079d8e8 100755 --- a/custom/templates/DefaultRevamp/template.php +++ b/custom/templates/DefaultRevamp/template.php @@ -2,7 +2,7 @@ /* * Made by Samerton | Revamped by Xemah * https://github.com/NamelessMC/Nameless/ - * NamelessMC version 2.1.0 + * NamelessMC version 2.1.1 * * License: MIT * @@ -25,8 +25,8 @@ class DefaultRevamp_Template extends TemplateBase { public function __construct($cache, $smarty, $language, $user, $pages) { $template = [ 'name' => 'DefaultRevamp', - 'version' => '2.1.0', - 'nl_version' => '2.1.0', + 'version' => '2.1.1', + 'nl_version' => '2.1.1', 'author' => 'Xemah', ]; @@ -80,7 +80,7 @@ public function onPageLoad() { define('PAGE_LOAD_TIME', $this->_language->get('general', 'page_loaded_in', ['time' => round($page_load, 3)])); $this->addCSSFiles([ - $this->_template['path'] . 'css/custom.css?v=210' => [] + $this->_template['path'] . 'css/custom.css?v=211' => [] ]); $route = (isset($_GET['route']) ? rtrim($_GET['route'], '/') : '/'); diff --git a/modules/Cookie Consent/module.php b/modules/Cookie Consent/module.php index f5788b4f7a..8beaac5e9c 100644 --- a/modules/Cookie Consent/module.php +++ b/modules/Cookie Consent/module.php @@ -2,7 +2,7 @@ /* * Made by Samerton * https://github.com/NamelessMC/Nameless/ - * NamelessMC version 2.1.0 + * NamelessMC version 2.1.1 * * License: MIT * @@ -20,8 +20,8 @@ public function __construct(Language $language, Language $cookie_language, Pages $name = 'Cookie Consent'; $author = 'Samerton'; - $module_version = '2.1.0'; - $nameless_version = '2.1.0'; + $module_version = '2.1.1'; + $nameless_version = '2.1.1'; parent::__construct($this, $name, $author, $module_version, $nameless_version); diff --git a/modules/Core/module.php b/modules/Core/module.php index 5796311b97..f3814fe54c 100644 --- a/modules/Core/module.php +++ b/modules/Core/module.php @@ -2,7 +2,7 @@ /* * Made by Samerton * https://github.com/NamelessMC/Nameless/ - * NamelessMC version 2.1.0 + * NamelessMC version 2.1.1 * * License: MIT * @@ -21,8 +21,8 @@ public function __construct(Language $language, Pages $pages, User $user, Naviga $name = 'Core'; $author = 'Samerton'; - $module_version = '2.1.0'; - $nameless_version = '2.1.0'; + $module_version = '2.1.1'; + $nameless_version = '2.1.1'; parent::__construct($this, $name, $author, $module_version, $nameless_version); diff --git a/modules/Discord Integration/module.php b/modules/Discord Integration/module.php index c0b9c2a8c7..03ad2dc7f4 100644 --- a/modules/Discord Integration/module.php +++ b/modules/Discord Integration/module.php @@ -9,8 +9,8 @@ public function __construct(Language $language, Pages $pages, Endpoints $endpoin $name = 'Discord Integration'; $author = 'Aberdeener'; - $module_version = '2.1.0'; - $nameless_version = '2.1.0'; + $module_version = '2.1.1'; + $nameless_version = '2.1.1'; parent::__construct($this, $name, $author, $module_version, $nameless_version); diff --git a/modules/Forum/module.php b/modules/Forum/module.php index 35735b38c3..6d2ae791b1 100644 --- a/modules/Forum/module.php +++ b/modules/Forum/module.php @@ -2,7 +2,7 @@ /* * Made by Samerton * https://github.com/NamelessMC/Nameless/ - * NamelessMC version 2.1.0 + * NamelessMC version 2.1.1 * * License: MIT * @@ -20,8 +20,8 @@ public function __construct(Language $language, Language $forum_language, Pages $name = 'Forum'; $author = 'Samerton'; - $module_version = '2.1.0'; - $nameless_version = '2.1.0'; + $module_version = '2.1.1'; + $nameless_version = '2.1.1'; parent::__construct($this, $name, $author, $module_version, $nameless_version); diff --git a/modules/Members/module.php b/modules/Members/module.php index ac5dcd7ea8..6a2cd24b8b 100644 --- a/modules/Members/module.php +++ b/modules/Members/module.php @@ -2,7 +2,7 @@ /* * Made by Aberdeener * https://github.com/NamelessMC/Nameless/ - * NamelessMC version 2.1.0 + * NamelessMC version 2.1.1 * * License: MIT * @@ -20,8 +20,8 @@ public function __construct(Language $language, Language $members_language, Page $name = 'Members'; $author = 'Aberdeener'; - $module_version = '2.1.0'; - $nameless_version = '2.1.0'; + $module_version = '2.1.1'; + $nameless_version = '2.1.1'; parent::__construct($this, $name, $author, $module_version, $nameless_version); diff --git a/package.json b/package.json index 08c8cfe93c..d155a04f36 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nameless", - "version": "2.1.0", + "version": "2.1.1", "repository": "https://github.com/NamelessMC/Nameless", "license": "MIT", "private": true,