From 03282d9f50a9a2665863ca313daf0f05ff1c6e3a Mon Sep 17 00:00:00 2001 From: Mayur Dhamanwala Date: Thu, 6 Apr 2017 10:00:16 +1000 Subject: [PATCH 1/2] (fix) Removing groups. --- server/data/groups.json | 28 ---------------------------- server/settings.py | 1 - 2 files changed, 29 deletions(-) delete mode 100644 server/data/groups.json diff --git a/server/data/groups.json b/server/data/groups.json deleted file mode 100644 index 39c0ff318..000000000 --- a/server/data/groups.json +++ /dev/null @@ -1,28 +0,0 @@ -[ - { - "_id": "54f7bbb510245479d1ed55de", - "description": "This is where senior editorial staff keep documents and other stuff that has no business being in a CMS. It will eventually be used for group messaging/communications as well.", - "members": [ - {"user": "54e64b011024542de640fee0"}, - {"user": "54ed952410245479ccc38477"}, - {"user": "54ed952410245479ccc3844c"}, - {"user": "54ed94da10245479ccc383f7"}, - {"user": "54ed94da10245479ccc383e1"}, - {"user": "54ed94da10245479ccc383e2"} - ], - "name": "editorial management" - }, - { - "_id": "54fe7a5610245489e9c69bb8", - "description": "Libel, defamation and similar shizzle.", - "members": [ - {"user": "54ed952410245479ccc3845f"}, - {"user": "54ed952410245479ccc38460"}, - {"user": "54ed952410245479ccc38461"}, - {"user": "54ed952410245479ccc3845c"}, - {"user": "54ed952410245479ccc3845e"}, - {"user": "54ed952410245479ccc3845d"} - ], - "name": "LEGAL" - } -] diff --git a/server/settings.py b/server/settings.py index a462c6eca..d643eb948 100644 --- a/server/settings.py +++ b/server/settings.py @@ -104,7 +104,6 @@ def env(variable, fallback_value=None): 'apps.tasks', 'apps.preferences', 'apps.spikes', - 'apps.groups', 'apps.prepopulate', 'apps.legal_archive', 'apps.search', From 859dc4cc272d1de23f456917c6626f27618bbfc3 Mon Sep 17 00:00:00 2001 From: Mayur Dhamanwala Date: Thu, 6 Apr 2017 09:39:37 +1000 Subject: [PATCH 2/2] Update cores. --- client/package.json | 2 +- server/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/package.json b/client/package.json index f23d34ea1..b2d1bd961 100644 --- a/client/package.json +++ b/client/package.json @@ -2,6 +2,6 @@ "name": "superdesk", "license": "GPL-3.0", "dependencies": { - "superdesk-core": "superdesk/superdesk-client-core#ef13e958c" + "superdesk-core": "superdesk/superdesk-client-core#ed5f3db" } } diff --git a/server/requirements.txt b/server/requirements.txt index 5f867d694..50a881d42 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -5,4 +5,4 @@ unidecode==0.04.19 newrelic>=2.66,<2.67 titlecase==0.8.2 -git+git://github.com/superdesk/superdesk-core.git@9e8818852#egg=Superdesk-Core +git+git://github.com/superdesk/superdesk-core.git@39e5dad5#egg=Superdesk-Core