Merge pull request #128 from mdhaman/1.2

chore(cores):Updating cores for version 1.2
superdesk · Sep 14, 2016 · 6de87ce · 6de87ce
2 parents 5051ebe + 8b658cb
commit 6de87ce
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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/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: [{

diff --git 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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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