Merge branch 'release/1.7.1'

Dashboard/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org/'
 
 gem 'colored'
 

Dashboard/Gemfile.lock

@@ -1,66 +1,72 @@
 GIT
   remote: https://github.com/livingsocial/rake-pipeline.git
-  revision: 543f4322fe70facee9572d29ddabf7f090dad68a
+  revision: a75d96fbadcc659a35a0ae59212e0bc60b58cc54
   specs:
-    rake-pipeline (0.6.0)
-      rake (~> 0.9.0)
+    rake-pipeline (0.8.0)
+      json
+      rake (~> 10.1.0)
       thor
 
 GIT
   remote: https://github.com/wycats/rake-pipeline-web-filters.git
-  revision: 81a22fb0808dfdeab8ed92d5d8c898ad198b9938
+  revision: 1da44c399c11766064638d58d0348f61c3cc473f
   specs:
     rake-pipeline-web-filters (0.6.0)
       rack
       rake-pipeline (~> 0.6)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    POpen4 (0.1.4)
-      Platform (>= 0.4.0)
-      open4
-    Platform (0.4.0)
-    chunky_png (1.2.5)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    chunky_png (1.3.1)
+    coderay (1.1.0)
     colored (1.2)
-    compass (0.12.1)
+    compass (0.12.6)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
-      sass (~> 3.1)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    ffi (1.0.11)
-    fssm (0.2.9)
-    guard (1.1.1)
-      listen (>= 0.4.2)
-      thor (>= 0.14.6)
-    guard-rake (0.0.5)
+      sass (~> 3.2.19)
+    execjs (2.2.1)
+    ffi (1.9.3)
+    formatador (0.2.5)
+    fssm (0.2.10)
+    guard (2.6.1)
+      formatador (>= 0.2.4)
+      listen (~> 2.7)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-rake (0.0.9)
       guard
       rake
-    i18n-docs (0.0.4)
-      bundler
+    i18n-docs (0.0.7)
       rake
-    listen (0.4.7)
-      rb-fchange (~> 0.0.5)
-      rb-fsevent (~> 0.9.1)
-      rb-inotify (~> 0.8.8)
-    multi_json (1.3.6)
-    open4 (1.3.0)
-    rack (1.4.1)
-    rack-rewrite (1.2.1)
-    rake (0.9.2.2)
-    rb-fchange (0.0.5)
-      ffi
-    rb-fsevent (0.9.1)
-    rb-inotify (0.8.8)
+    json (1.8.1)
+    listen (2.7.9)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.9)
+    method_source (0.8.2)
+    pry (0.10.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.5.2)
+    rack-rewrite (1.5.0)
+    rake (10.1.1)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    sass (3.1.19)
-    thor (0.15.2)
-    uglifier (1.2.4)
+    sass (3.2.19)
+    slop (3.5.0)
+    thor (0.19.1)
+    timers (1.1.0)
+    uglifier (2.5.1)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
-    yui-compressor (0.9.6)
-      POpen4 (>= 0.1.4)
+      json (>= 1.8.0)
+    yui-compressor (0.12.0)
 
 PLATFORMS
   ruby

Dashboard/app/js/lib/models/store_def-common.js

@@ -1,12 +1,11 @@
-var host = "http://" + window.location.host;
 FLOW.store = DS.Store.create({
   revision: 10,
   adapter: DS.FLOWRESTAdapter.create({
     bulkCommit: false,
     namespace: "rest",
-    url: host
+    url: window.location.protocol + "//" + window.location.hostname +
+         (window.location.port ? ':' + window.location.port : '')
   })
-  //adapter: DS.FixtureAdapter
 });
 
 DS.JSONTransforms.array = {

Dashboard/app/js/lib/views/reports/export-reports-views.js

@@ -64,7 +64,7 @@ FLOW.ReportLoader = Ember.Object.create({
       criteria.opts.locale = FLOW.reportLanguageControl.get('selectedLanguage').get('value');
     }
 
-    criteria.opts.lastCollection = '' + (exportType === 'RAW_DATA' && !!FLOW.editControl.lastCollection);
+    criteria.opts.lastCollection = '' + (exportType === 'RAW_DATA' && FLOW.selectedControl.get('selectedSurveyGroup').get('monitoringGroup') && !!FLOW.editControl.lastCollection);
 
     this.set('criteria', criteria);
     FLOW.savingMessageControl.numLoadingChange(1);
@@ -84,7 +84,7 @@ FLOW.ReportLoader = Ember.Object.create({
       FLOW.savingMessageControl.numLoadingChange(-1);
       this.set('processing', false);
       this.set('criteria', null);
-      $('#downloader').attr('src', FLOW.Env.flowServices.split(":3001")[0] + '/report/' + resp.file);
+      $('#downloader').attr('src', FLOW.Env.flowServices + '/report/' + resp.file);
     }
   },
 

GAE/appletBuild.xml

@@ -43,7 +43,8 @@
     </path>
 
     <target name="compile" depends="makedir">
-        <javac classpathref="project.classpath" srcdir="${src}" destdir="${build}" debug="true" source="1.5" encoding="utf-8">
+        <javac source="1.7" target="1.7" encoding="UTF8" includeantruntime="false"
+               classpathref="project.classpath" srcdir="${src}" destdir="${build}" debug="true">
             <include name="com/gallatinsystems/gis/app/**" />
             <include name="com/gallatinsystems/framework/dataexport/**" />
             <include name="com/gallatinsystems/framework/gwt/dto/client/**" />

GAE/build.properties.template

@@ -1,4 +1,4 @@
-sdk.dir=/usr/local/sdk/gae/java-sdk-1.7.6
+sdk.dir=/usr/local/sdk/gae/java-sdk-1.9.7
 gwtlibs.dir=/usr/local/sdk/gwt/2.5.1
 [email protected]
 keystore.password=[some_password]

GAE/build.xml

@@ -121,7 +121,7 @@
 				<exclude name="**/*.java" />
 			</fileset>
 		</copy>
-		<javac source="1.6" target="1.6" encoding="UTF8" srcdir="src" destdir="${app_classes_dir}"
+		<javac source="1.7" target="1.7" encoding="UTF8" srcdir="src" destdir="${app_classes_dir}"
 			   classpathref="project.classpath" debug="on" includeantruntime="false" />
 	</target>
 
@@ -165,13 +165,14 @@
 			<fileset dir="${app_dir}/deploy" includes="**/*.symbolMap"/>
 		</delete>
 
-		<delete file="war/PlacemarksNewLook.vm" failonerror="false" />
-
 		<echo message="Rebuilding Dashboard..." />
 
-		<exec dir="../Dashboard" executable="rake" failonerror="true">
+		<exec dir="../Dashboard" executable="bundle" failonerror="true">
 		    <env key="RAKEP_MODE" value="production" />
+		    <arg value="exec" />
+		    <arg value="rake" />
 		    <arg value="build" />
+		    <arg value="--trace" />
 		</exec>
 
 		<exec dir="../" executable="git" outputproperty="app.version">
@@ -180,12 +181,12 @@
 
 		<replace file="./war/admin/js/app.js" token="__VERSION__" value="${app.version}" />
 
-		<exec dir="." executable="sh">
+		<exec dir="." executable="sh" failonerror="true">
 		    <arg value="-c" />
 		    <arg value="${sdk.dir}/bin/appcfg.sh --enable_jar_splitting --email=${email.address} --passin &lt; ${pwd} update war" />
 		</exec>
 
-		<exec dir="." executable="sh">
+		<exec dir="." executable="sh" failonerror="true">
 		    <arg value="-c" />
 		    <arg value="${sdk.dir}/bin/appcfg.sh backends war update" />
 		</exec>
@@ -197,6 +198,10 @@
 
 	<target name="rollback" depends="datanucleusenhance" description="Rolls back an interrupted application update.">
 		<appcfg action="rollback" war="war" />
+		<exec dir="." executable="sh" failonerror="true">
+		    <arg value="-c" />
+		    <arg value="${sdk.dir}/bin/appcfg.sh backends rollback war" />
+		</exec>
 	</target>
 
 	<target name="request_logs" description="Downloads log data from App Engine for the application.">

GAE/src/com/gallatinsystems/instancecreator/app/InstanceConfigurator.java

@@ -61,8 +61,8 @@
  * 
  * derived quantities are: * s3bucket - the root directory on S3 for this instance - assumed to be
  * same as instance name * dataUploadUrl - url used for data uploads (assumed to be the root of the
- * S3 account ... http://instanceName.s3.amazonaws.com/) * serverBase - base url for the instance
- * (assumed to be http://instanceName.appspot.com)
+ * S3 account ... https://instanceName.s3.amazonaws.com/) * serverBase - base url for the instance
+ * (assumed to be https://instanceName.appspot.com)
  */
 public class InstanceConfigurator {
     private VelocityEngine engine = null;
@@ -87,19 +87,19 @@ public static void main(String[] args) {
         ic.addAttribute("s3Id", args[1]);
         ic.addAttribute("signingKey", args[5]);
         ic.addAttribute("instanceName", instanceName);
-        ic.addAttribute("dataUploadUrl", "http://" + instanceName + ".s3.amazonaws.com");
-        ic.addAttribute("serverBase", "http://" + instanceName + ".appspot.com");
-        ic.addAttribute("surveyS3Url", "http://" + instanceName + ".s3.amazonaws.com/surveys");
-        ic.addAttribute("s3urldevicezip", "http://" + instanceName + ".s3.amazonaws.com/devicezip");
+        ic.addAttribute("dataUploadUrl", "https://" + instanceName + ".s3.amazonaws.com");
+        ic.addAttribute("serverBase", "https://" + instanceName + ".appspot.com");
+        ic.addAttribute("surveyS3Url", "https://" + instanceName + ".s3.amazonaws.com/surveys");
+        ic.addAttribute("s3urldevicezip", "https://" + instanceName + ".s3.amazonaws.com/devicezip");
         ic.addAttribute("storepass", args[6]);
         ic.addAttribute("keypass", args[7]);
         ic.addAttribute("alias", args[8]);
         ic.addAttribute("alais", args[8]);
         ic.addAttribute("reportsEmailAddress", args[9]);
         ic.addAttribute("scoreAPFlag", args[10]);
         ic.addAttribute("organization", args[11]);
-        ic.addAttribute("s3Url", "http://" + instanceName + ".s3.amazonaws.com");
-        ic.addAttribute("s3url", "http://" + instanceName + ".s3.amazonaws.com");
+        ic.addAttribute("s3Url", "https://" + instanceName + ".s3.amazonaws.com");
+        ic.addAttribute("s3url", "https://" + instanceName + ".s3.amazonaws.com");
         String localLocation = args[12];
         ic.addAttribute("keystore", args[13]);
         ic.addAttribute("mapsApiKey", args[14]);