Merge pull request #68 from akintolga/master

Update Cores for AAP Production 1.0.8 RC4

.gitignore

@@ -31,4 +31,6 @@ include/
 /server/.settings/org.eclipse.core.resources.prefs
 /results/
 /superdesk-content-api/
-/node_modules/
+/node_modules/
+client/index.html
+client/templates-cache.js

.travis.yml

@@ -48,3 +48,6 @@ script:
     - cd server && nosetests && cd ..
     - cd client && grunt build && cd ..
     - cd server && python manage.py users:create -u test -p test -e test@localhost --admin && cd ..
+
+after_script:
+    - rm .npm/*.lock

Dockerfile

@@ -60,3 +60,7 @@ COPY ./server /opt/superdesk
 COPY ./client /opt/superdesk/client
 
 RUN cd ./client && grunt build
+
+# copy git revision informations (used in "about" screen)
+COPY .git/HEAD /opt/superdesk/.git/
+COPY .git/refs/ /opt/superdesk/.git/refs/

client/package.json

@@ -2,7 +2,7 @@
     "name": "superdesk",
     "license": "GPL-3.0",
     "dependencies": {
-        "superdesk-core": "superdesk/superdesk-client-core#ce3238567",
+        "superdesk-core": "superdesk/superdesk-client-core#89bfd3ecb",
         "babel-core": "^6.10.4",
         "babel-loader": "^6.2.4",
         "babel-preset-es2015": "^6.9.0",

server/requirements.txt

@@ -3,4 +3,4 @@ honcho==0.6.6
 pyodbc==3.0.10
 unidecode==0.04.19
 
-git+git://github.com/superdesk/superdesk-core.git@0255d4af5#egg=Superdesk-Core
+git+git://github.com/superdesk/superdesk-core.git@0a979d691#egg=Superdesk-Core

server/settings.py

@@ -81,6 +81,7 @@ def env(variable, fallback_value=None):
     'superdesk.data_updates',
     'superdesk.activity',
     'superdesk.vocabularies',
+    'superdesk.backend_meta',
     'apps.comments',
 
     'superdesk.io',