From c2624c7bb936693e37e4e17f22cad5a4b08f61a8 Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@nyu.edu>
Date: Mon, 7 Sep 2020 23:06:13 -0400
Subject: [PATCH] Update CHANGELOG and version numbers

---
 CHANGELOG.md     | 14 +++++++++-----
 CTFd/__init__.py |  2 +-
 package.json     |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9218227a..ed5dfa71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,14 +2,15 @@
 
 **General**
 
-- Loosen team password confirmation to also accept team captain password to make it easier to change the team password
-- Adds the ability to add custom user and team fields for registration/profile settings
-- Improve Notifications pubsub system to use a subscriber per server instead of a subscriber per browser
+- Loosen team password confirmation in team settings to also accept the team captain's password to make it easier to change the team password
+- Adds the ability to add custom user and team fields for registration/profile settings.
+- Improve Notifications pubsub events system to use a subscriber per server instead of a subscriber per browser. This should improve the reliability of CTFd at higher load and make it easier to deploy the Notifications system
 
 **Admin Panel**
 
 - Add a comments functionality for admins to discuss challenges, users, teams, pages
-- Adds a legal section where users can add a terms of service and privacy policy
+- Adds a legal section in Configs where users can add a terms of service and privacy policy
+- Add a Custom Fields section in Configs where admins can add/edit custom user/team fields
 - Move user graphs into a modal for Admin Panel
 
 **API**
@@ -18,7 +19,7 @@
 
 **Themes**
 
-- Make scoreboard caching only cache the score table instead of the entire page. This is done by caching the specific template section
+- Make scoreboard caching only cache the score table instead of the entire page. This is done by caching the specific template section. Refer to #1586, specifically the changes in `scoreboard.html`.
 - Add rel=noopener to external links to prevent tab napping attacks
 - Change the registration page to reference links to Terms of Service and Privacy Policy if specified in configuration
 
@@ -29,6 +30,9 @@
 - Make gevent default in serve.py and add a `--disable-gevent` switch in serve.py
 - Add `tenacity` library for retrying logic
 - Add `pytest-sugar` for slightly prettier pytest output
+- Add a `listen()` method to `CTFd.utils.events.EventManager` and `CTFd.utils.events.RedisEventManager`.
+  - This method should implement subscription for a CTFd worker to whatever underlying notification system there is. This should be implemented with gevent or a background thread.
+  - The `subscribe()` method (which used to implement the functionality of the new `listen()` function) now only handles passing notifications from CTFd to the browser. This should also be implemented with gevent or a background thread.
 
 # 3.0.2 / 2020-08-23
 
diff --git a/CTFd/__init__.py b/CTFd/__init__.py
index 5c9826b7..38f5a3af 100644
--- a/CTFd/__init__.py
+++ b/CTFd/__init__.py
@@ -26,7 +26,7 @@ from CTFd.utils.migrations import create_database, migrations, stamp_latest_revi
 from CTFd.utils.sessions import CachingSessionInterface
 from CTFd.utils.updates import update_check
 
-__version__ = "3.0.2"
+__version__ = "3.1.0"
 __channel__ = "oss"
 
 
diff --git a/package.json b/package.json
index b5b03c28..2273c342 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ctfd",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "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": {