Merge remote-tracking branch 'origin/master' into dev

# Conflicts: # .travis.yml
patou · Dec 20, 2016 · 3682f11 · 3682f11
2 parents 6e4028d + 8c4a3aa
commit 3682f11
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -17,5 +17,5 @@ after_success:
   - cd liste-envies-war
   - echo ${GOOGLE_CLIENT_SECRET} > client-secret.json
   - echo ${GOOGLE_CLIENT_SECRET_TEST} > client-secret-test.json
-  - test ${TRAVIS_BRANCH} != "master" && appcfg.sh --service_account_json_key_file=client-secret-test.json -A ${CLOUDSDK_TEST_PROJECT} -V ${TRAVIS_BRANCH//_/-} update target/liste-envies-war-2016-SNAPSHOT
+  - test ${TRAVIS_BRANCH} != "master" && appcfg.sh --service_account_json_key_file=client-secret-test.json -A ${CLOUDSDK_TEST_PROJECT} -V ${TRAVIS_BRANCH/_/-/g} update target/liste-envies-war-2016-SNAPSHOT
   - test ${TRAVIS_BRANCH} = "master" && appcfg.sh --service_account_json_key_file=client-secret.json -A ${CLOUDSDK_CORE_PROJECT} -V master update target/liste-envies-war-2016-SNAPSHOT
diff --git a/liste-envies-war/src/main/webapp/index.html b/liste-envies-war/src/main/webapp/index.html
@@ -187,6 +187,16 @@ <h4>la seule liste de d'envies que vous pouvez partagez de manière privés avec
 <script src="js/controllers/headerCtrl.js"></script>
 <script src="js/controllers/homeCtrl.js"></script>
 <script src="js/controllers/envieCtrl.js"></script>
+<script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+            (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-88754823-1', 'auto');
+    ga('send', 'pageview');
+
+</script>
 </body>
 
 </html>