From 2113f6af6f9910157245654bd0e5fb80d6bf4848 Mon Sep 17 00:00:00 2001 From: Mayur Dhamanwala Date: Wed, 14 Sep 2016 10:18:45 +1000 Subject: [PATCH 1/2] Updating cores for version 1.2 --- 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 3d2344df9..da2c6575c 100644 --- a/client/package.json +++ b/client/package.json @@ -2,7 +2,7 @@ "name": "superdesk", "license": "GPL-3.0", "dependencies": { - "superdesk-core": "superdesk/superdesk-client-core#3e2c1a5d", + "superdesk-core": "superdesk/superdesk-client-core#6a7d7b5", "babel-core": "^6.10.4", "babel-loader": "^6.2.4", "babel-preset-es2015": "^6.9.0", diff --git a/server/requirements.txt b/server/requirements.txt index 5c5dcc36d..0582d8b8f 100644 --- a/server/requirements.txt +++ b/server/requirements.txt @@ -4,4 +4,4 @@ pyodbc==3.0.10 unidecode==0.04.19 -git+git://github.com/superdesk/superdesk-core.git@94a405a71#egg=Superdesk-Core +git+git://github.com/superdesk/superdesk-core.git@288ba23#egg=Superdesk-Core From 8b658cb9df915e097de867d37fd3ebd0be40a46e Mon Sep 17 00:00:00 2001 From: Mayur Dhamanwala Date: Wed, 14 Sep 2016 10:42:16 +1000 Subject: [PATCH 2/2] Adding ingest provider search settings in superdesk config. --- client/superdesk.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/superdesk.config.js b/client/superdesk.config.js index 2b0410adb..c90463f4a 100644 --- a/client/superdesk.config.js +++ b/client/superdesk.config.js @@ -30,7 +30,7 @@ module.exports = function() { slugline: 1, headline: 1, unique_name: 1, story_text: 1, byline: 1, keywords: 1, creator: 1, from_desk: 1, to_desk: 1, spike: 1, scheduled: 1, company_codes: 1, - useDefaultTimezone: 1 + useDefaultTimezone: 1, ingest_provider: 1 }, previewFormats: [{