From a987160cfb369dbe8fcd698e7c0c28e55c2210f1 Mon Sep 17 00:00:00 2001 From: Kevin Chung Date: Fri, 8 May 2020 16:27:14 -0400 Subject: [PATCH 1/3] Mark v2.4.2 --- CHANGELOG.md | 14 ++++++++++++++ CTFd/__init__.py | 2 +- docs/conf.py | 4 ++-- package.json | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08aa381b..cf5c10ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +2.4.2 / 2020-05-06 +================== + +**Admin Panel** +* Fix Challenge Reset in Admin Panel where Dynamic Challenges prevented resetting Challenges + +**Plugins** +* Add the `CTFd.plugins.migrations` module to allow plugins to handle migrations +* Make Dynamic Challenges have a cascading deletion constraint against their respective Challenge row + +**Miscellaneous** +* Add `app.plugins_dir` object to refer to the directory where plugins are installed + + 2.4.1 / 2020-05-06 ================== diff --git a/CTFd/__init__.py b/CTFd/__init__.py index 72f3361f..4faeda20 100644 --- a/CTFd/__init__.py +++ b/CTFd/__init__.py @@ -31,7 +31,7 @@ if sys.version_info[0] < 3: reload(sys) # noqa: F821 sys.setdefaultencoding("utf-8") -__version__ = "2.4.1" +__version__ = "2.4.2" class CTFdRequest(Request): diff --git a/docs/conf.py b/docs/conf.py index 576d68b0..ae77643f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -20,13 +20,13 @@ # -- Project information ----------------------------------------------------- project = u"CTFd" -copyright = u"2019, CTFd LLC" +copyright = u"2020, CTFd LLC" author = u"Kevin Chung" # The short X.Y version version = u"" # The full version, including alpha/beta/rc tags -release = u"2.4.1" +release = u"2.4.2" # -- General configuration --------------------------------------------------- diff --git a/package.json b/package.json index 43b4d93f..1e20200a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ctfd", - "version": "2.4.1", + "version": "2.4.2", "description": "CTFd is a Capture The Flag framework focusing on ease of use and customizability. It comes with everything you need to run a CTF and it's easy to customize with plugins and themes.", "main": "index.js", "directories": { From ee28d33027e4d01bcdd755ecbb4424203db2eb68 Mon Sep 17 00:00:00 2001 From: Kevin Chung Date: Fri, 8 May 2020 16:30:18 -0400 Subject: [PATCH 2/3] Add note about upgrade vs db.create_all --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf5c10ab..32e42e8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ * Fix Challenge Reset in Admin Panel where Dynamic Challenges prevented resetting Challenges **Plugins** -* Add the `CTFd.plugins.migrations` module to allow plugins to handle migrations +* Add the `CTFd.plugins.migrations` module to allow plugins to handle migrations. Plugins should now call `CTFd.plugins.migrations.upgrade` instead of `app.db.create_all` which will allow the plugin to have database migrations. * Make Dynamic Challenges have a cascading deletion constraint against their respective Challenge row **Miscellaneous** From b9fa46e411e4979d82cec2694e8dba2c36641d86 Mon Sep 17 00:00:00 2001 From: Kevin Chung Date: Fri, 8 May 2020 16:30:42 -0400 Subject: [PATCH 3/3] Set right CHANGELOG date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32e42e8c..2a2da8c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -2.4.2 / 2020-05-06 +2.4.2 / 2020-05-08 ================== **Admin Panel**