Merge pull request #686 from mdhaman/1.28

(chore): Update cores 1.28
superdesk · Mar 18, 2019 · 573cf26 · 573cf26
2 parents 91efa50 + 0e26e52
commit 573cf26
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/client/package.json b/client/package.json
@@ -2,8 +2,8 @@
     "name": "superdesk",
     "license": "GPL-3.0",
     "dependencies": {
-        "superdesk-core": "superdesk/superdesk-client-core#b4f03ef3",
-        "superdesk-planning": "superdesk/superdesk-planning#f49a9b3",
+        "superdesk-core": "superdesk/superdesk-client-core#fcf6672dd",
+        "superdesk-planning": "superdesk/superdesk-planning#7cd8d7f",
         "superdesk-analytics": "superdesk/superdesk-analytics#ea2ae6e"
     }
 }
diff --git a/server/requirements.txt b/server/requirements.txt
@@ -11,6 +11,6 @@ pyasn1==0.3.7
 gtfs-realtime-bindings==0.0.5
 protobuf3-to-dict==0.1.5
 
-git+git://github.com/superdesk/superdesk-core.git@b315477d#egg=Superdesk-Core
-git+git://github.com/superdesk/superdesk-planning.git@f49a9b3#egg=superdesk-planning
+git+git://github.com/superdesk/superdesk-core.git@50ab5e104#egg=Superdesk-Core
+git+git://github.com/superdesk/superdesk-planning.git@7cd8d7f#egg=superdesk-planning
 git+git://github.com/superdesk/superdesk-analytics.git@ea2ae6e#egg=superdesk-analytics
diff --git a/server/settings.py b/server/settings.py
@@ -339,3 +339,5 @@ def env(variable, fallback_value=None):
 QLD_TRAFFIC_API_KEY = env('QLD_TRAFFIC_API_KEY', '')
 
 PLANNING_AUTO_ASSIGN_TO_WORKFLOW = strtobool(env('PLANNING_AUTO_ASSIGN_TO_WORKFLOW', 'false'))
+
+LONG_EVENT_DURATION_THRESHOLD = int(env('LONG_EVENT_DURATION_THRESHOLD', 4))
Original file line number	Diff line number	Diff line change
Expand Up		@@ -339,3 +339,5 @@ def env(variable, fallback_value=None):
		QLD_TRAFFIC_API_KEY = env('QLD_TRAFFIC_API_KEY', '')

		PLANNING_AUTO_ASSIGN_TO_WORKFLOW = strtobool(env('PLANNING_AUTO_ASSIGN_TO_WORKFLOW', 'false'))

		LONG_EVENT_DURATION_THRESHOLD = int(env('LONG_EVENT_DURATION_THRESHOLD', 4))