From 32284dbb7627a8b212b4d7f0058d50f413a02979 Mon Sep 17 00:00:00 2001 From: Mayur Dhamanwala Date: Mon, 7 Aug 2017 11:18:23 +1000 Subject: [PATCH] update cores --- client/package.json | 2 +- client/superdesk.config.js | 5 +++++ server/requirements.txt | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/client/package.json b/client/package.json index f4fdbaa92..ae63e82fb 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#d5d5e42344a" + "superdesk-core": "superdesk/superdesk-client-core#639ac1e4af0" } } diff --git a/client/superdesk.config.js b/client/superdesk.config.js index 4572d7bd1..68ae3da1d 100644 --- a/client/superdesk.config.js +++ b/client/superdesk.config.js @@ -52,6 +52,11 @@ module.exports = function() { searchShortcut: 1 }, + activity: { + 'edit.item.popup': 0, + 'view.item.popup': 0 + }, + view: { timeformat: 'HH:mm', dateformat: 'DD/MM/YYYY' diff --git a/server/requirements.txt b/server/requirements.txt index f09d80472..112fd38db 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@a51eed034#egg=Superdesk-Core \ No newline at end of file +git+git://github.com/superdesk/superdesk-core.git@7dd97ed566#egg=Superdesk-Core \ No newline at end of file