From 1785886d0496b0e0007287643eb05b4c16abafc1 Mon Sep 17 00:00:00 2001 From: Tom Hutchison Date: Sun, 19 Jan 2020 13:04:57 -0500 Subject: [PATCH] Adding conflicts manually, bump version, changelog, requires --- CHANGELOG.md | 6 ++++++ skin.json | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44821afb..b53d31d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## Version 2.3.0 +* [compatibility, deprecated] Fix for deprecated wfSuppressWarnings and wfRestoreWarnings with new Wikimedia\... +* [bug, code] Remove duplicated prepend call in foreground.js +* [b/c break] Version minor bump, MW >= 1.34 now required +* [enhancement] Use of requires MW >= 1.34 in skin.json + ## Version 2.2.4 * [bug] PR #352 Breaks Compatibility with MW < 1.34 - Rollback for re-release as v2.3.0 * [compatibility] Final Release v2.x.x requires MW <= 1.33 diff --git a/skin.json b/skin.json index 83713cfb..8d2c9738 100644 --- a/skin.json +++ b/skin.json @@ -1,6 +1,6 @@ { "name": "Foreground", - "version": "2.2.4", + "version": "2.3.0", "author": [ "Garrick Van Buren", "Jamie Thingelstad", @@ -14,6 +14,9 @@ "ValidSkinNames": { "foreground": "Foreground" }, + "requires": { + "MediaWiki": ">= 1.34.0" + }, "MessagesDirs": { "SkinForeground": [ "i18n" @@ -72,4 +75,4 @@ }, "config": {}, "manifest_version": 1 -} +} \ No newline at end of file