Merge pull request #721 from MarkLark86/1.28

Update cores 1.28.10-RC3
superdesk · May 17, 2019 · 59cbd0b · 59cbd0b
2 parents 30c1d7e + 97f351a
commit 59cbd0b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/client/package.json b/client/package.json
@@ -3,7 +3,7 @@
     "license": "GPL-3.0",
     "dependencies": {
         "superdesk-core": "superdesk/superdesk-client-core#b343032",
-        "superdesk-planning": "superdesk/superdesk-planning#48bf53e",
-        "superdesk-analytics": "superdesk/superdesk-analytics#b64edcd"
+        "superdesk-planning": "superdesk/superdesk-planning#666a824",
+        "superdesk-analytics": "superdesk/superdesk-analytics#7ab8937"
     }
 }
diff --git a/server/requirements.txt b/server/requirements.txt
@@ -13,5 +13,5 @@ protobuf3-to-dict==0.1.5
 requests<2.22
 
 git+git://github.com/superdesk/superdesk-core.git@2d7ed4d#egg=Superdesk-Core
-git+git://github.com/superdesk/superdesk-planning.git@48bf53e#egg=superdesk-planning
-git+git://github.com/superdesk/superdesk-analytics.git@b64edcd#egg=superdesk-analytics
+git+git://github.com/superdesk/superdesk-planning.git@666a824#egg=superdesk-planning
+git+git://github.com/superdesk/superdesk-analytics.git@7ab8937#egg=superdesk-analytics
diff --git a/server/templates/outlook_planning_template.html b/server/templates/outlook_planning_template.html
@@ -1,4 +1,4 @@
 {% for item in items %}
-<p>{% if item.get('place') %}{{ item.get('place')|join(', ') }} - {% endif %}{% if item.get('description_text') %}{{ item.description_text }}, {% endif %}{% if (item.get('event') or {}).get('location') %}{{ item.event.location[0].name }}
-{% endif %}{% if item.get('schedule') %}{{ ', ' + item.schedule }} {% endif %}({{ item.slugline }}) - {{ item.get('assignees')|join(', ') }}</p>
+<p>{% if item.get('place') %}{{ item.get('place')|join(', ') }} - {% endif %}{% if item.get('description_text') %}{{ item.description_text }}, {% endif %}{% if (item.get('event') or {}).get('location') %}{{ item.event.location[0].name }},
+{% endif %}{% if item.get('schedule') %}{{ item.schedule }} {% endif %}({{ item.slugline }}) - {{ item.get('assignees')|join(', ') }}</p>
 {% endfor %}