Merge branch 'develop' into taggle_user_study

# Conflicts: # src/style.scss
Caleydo · Sep 10, 2018 · 8fb3c96 · 8fb3c96
2 parents 237c7c3 + 293c1bc
commit 8fb3c96
Show file tree

Hide file tree

Showing 26 changed files with 9,146 additions and 18,170 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -23,15 +23,19 @@ jobs:
       - run: #update build doc and readme
           name: update api
           command: |
-            if [ "${CIRCLE_BRANCH}" == "master" ] ; then
+            if [ "${CIRCLE_BRANCH}" == "master" ] || [ "${CIRCLE_BRANCH}" == "develop" ] ; then
                 git clone [email protected]:datavisyn/lineup.js.org.git
                 cd lineup.js.org
-                rm -rf "app/"
-                mv ../build "app"
+                appdir=app
+                if [ "${CIRCLE_BRANCH}" == "develop" ] ; then
+                  appdir=app_develop
+                fi
+                rm -rf "${appdir}/"
+                mv ../build "${appdir}"
                 git config user.email "[email protected]"
                 git config user.name "Samuel Gratzl"
                 git add -A
-                git commit -m "auto updating app" -m "trigger: ${CIRCLE_BUILD_URL}"
+                git commit -m "auto updating ${appdir}" -m "trigger: ${CIRCLE_BUILD_URL}"
                 git push origin master
             fi
 

diff --git a/karma.conf.js b/karma.conf.js