Merge branch 'release/1.7.3'

.gitignore

@@ -10,6 +10,9 @@
 .project
 .settings
 
+# Emacs files
+*~
+
 # Build config and output paths
 .gradle
 .gwt-log
@@ -77,3 +80,7 @@ reports/target
 tests/clojure/akvo-tests/.lein*
 tests/clojure/akvo-tests/bin
 tests/clojure/akvo-tests/target
+
+*.codekit
+*.scssc
+dwsync.xml

Config/instanceConfigurator/src/org/akvo/flow/InstanceConfigurator.java

@@ -192,26 +192,14 @@ public static void main(String[] args) throws Exception {
         Map<String, Object> apkData = new HashMap<String, Object>();
         apkData.put("awsBucket", bucketName);
         apkData.put("awsAccessKeyId", accessKeys.get(apkUser).getAccessKeyId());
-        apkData.put("awsSecretAccessKey", accessKeys.get(apkUser).getSecretAccessKey());
+        apkData.put("awsSecretKey", accessKeys.get(apkUser).getSecretAccessKey());
         apkData.put("serverBase", "https://" + gaeId + ".appspot.com");
         apkData.put("restApiKey", apiKey);
 
         Template t3 = cfg.getTemplate("survey.properties.ftl");
         FileWriter fw = new FileWriter(new File(out, "/survey.properties"));
         t3.process(apkData, fw);
 
-        // UploadConstants.properties
-        Map<String, Object> gaeData = new HashMap<String, Object>();
-        gaeData.put("awsBucket", bucketName);
-        gaeData.put("awsAccessKeyId", accessKeys.get(gaeUser).getAccessKeyId());
-        gaeData.put("awsSecretAccessKey", accessKeys.get(gaeUser).getSecretAccessKey());
-        gaeData.put("serverBase", "https://" + gaeId + ".appspot.com");
-        gaeData.put("apiKey", apiKey);
-
-        Template t4 = cfg.getTemplate("UploadConstants.properties.ftl");
-        FileWriter fw2 = new FileWriter(new File(out, "/UploadConstants.properties"));
-        t4.process(gaeData, fw2);
-
         // appengine-web.xml
         Map<String, Object> webData = new HashMap<String, Object>();
         webData.put("awsBucket", bucketName);

Config/instanceConfigurator/src/org/akvo/flow/templates/appengine-web.xml.ftl

@@ -51,5 +51,6 @@
         <property name="useTabRDRFlag" value="false"/>
         <property name="showStatisticsFeature" value="false"/>
         <property name="showMonitoringFeature" value="false"/>
+        <property name="mandatoryQuestionID" value="false"/>
     </system-properties>
-</appengine-web-app>
+</appengine-web-app>

Config/instanceConfigurator/src/org/akvo/flow/templates/survey.properties.ftl

@@ -1,5 +1,5 @@
 awsBucket = ${awsBucket}
 awsAccessKeyId = ${awsAccessKeyId}
-awsSecretAccessKey = ${awsSecretAccessKey}
+awsSecretKey = ${awsSecretKey}
 serverBase = ${serverBase}
 apiKey = ${restApiKey}

Dashboard/Gemfile.lock

@@ -1,3 +1,11 @@
+GIT
+  remote: https://github.com/wycats/rake-pipeline-web-filters.git
+  revision: 1da44c399c11766064638d58d0348f61c3cc473f
+  specs:
+    rake-pipeline-web-filters (0.6.0)
+      rack
+      rake-pipeline (~> 0.6)
+
 GIT
   remote: https://github.com/livingsocial/rake-pipeline.git
   revision: a75d96fbadcc659a35a0ae59212e0bc60b58cc54
@@ -7,14 +15,6 @@ GIT
       rake (~> 10.1.0)
       thor
 
-GIT
-  remote: https://github.com/wycats/rake-pipeline-web-filters.git
-  revision: 1da44c399c11766064638d58d0348f61c3cc473f
-  specs:
-    rake-pipeline-web-filters (0.6.0)
-      rack
-      rake-pipeline (~> 0.6)
-
 GEM
   remote: https://rubygems.org/
   specs: