Merge pull request #337 from mdhaman/1.8

Update cores 1.8.6
superdesk · Aug 7, 2017 · 5c8f6a6 · 5c8f6a6
2 parents 3aa3541 + 32284db
commit 5c8f6a6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
+git+git://github.com/superdesk/superdesk-core.git@7dd97ed566#egg=Superdesk-Core