Squashed commits '${title}'

.gitlab-ci.yml

@@ -97,7 +97,7 @@ win:package:
       eval $(ssh-agent -s)
       echo "$NR0Q_PRIV" | tr -d '\r' | ssh-add -
       mkdir -p ~/.ssh; chmod 700 ~/.ssh
-      scp -o StrictHostKeyChecking=no mchambers@$NR0Q_SERVER_ADDRESS:~/codecert.spc ./
+      scp -o StrictHostKeyChecking=no -P $NR0Q_SSH_PORT mchambers@$NR0Q_SERVER_ADDRESS:~/codecert.spc ./
   script:
     - |
       # Making our Windows packages 
@@ -299,7 +299,7 @@ uploadtest:
         echo "Calculating MD5 Hash for $FILE"
         md5sum $FILE > $FILE.md5
       done
-      ssh -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT gridtracker@$NR0Q_SERVER_ADDRESS "mkdir ~/$CI_COMMIT_TAG" && scp -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT -r ./* gridtracker@$NR0Q_SERVER_ADDRESS:~/$CI_COMMIT_TAG/ && ssh -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT gridtracker@$NR0Q_SERVER_ADDRESS "rm latest_test && ln -s $CI_COMMIT_TAG latest_test"
+      ssh -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT gridtracker@$NR0Q_SERVER_ADDRESS "mkdir ~/$CI_COMMIT_TAG" && scp -o StrictHostKeyChecking=no -P $NR0Q_SSH_PORT -r ./* gridtracker@$NR0Q_SERVER_ADDRESS:~/$CI_COMMIT_TAG/ && ssh -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT gridtracker@$NR0Q_SERVER_ADDRESS "rm latest_test && ln -s $CI_COMMIT_TAG latest_test"
 
 # copy release assets to NR0Q's server
 uploadrelease:
@@ -321,7 +321,7 @@ uploadrelease:
         echo "Calculating MD5 Hash for $FILE"
         md5sum $FILE > $FILE.md5
       done
-      ssh -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT gridtracker@$NR0Q_SERVER_ADDRESS "mkdir ~/$CI_COMMIT_TAG" && scp -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT -r ./* gridtracker@$NR0Q_SERVER_ADDRESS:~/$CI_COMMIT_TAG/
+      ssh -o StrictHostKeyChecking=no -p $NR0Q_SSH_PORT gridtracker@$NR0Q_SERVER_ADDRESS "mkdir ~/$CI_COMMIT_TAG" && scp -o StrictHostKeyChecking=no -P $NR0Q_SSH_PORT -r ./* gridtracker@$NR0Q_SERVER_ADDRESS:~/$CI_COMMIT_TAG/
 
 # this only creates a "source code release" -- gitlab doesn't specify binaries
 # except as links to external storage, which is suboptimal for now

package.nw/lib/datepicker.js

@@ -1,3 +1,9 @@
+// FIXME ****************************************************************************** //
+// The datepicker's "Time" section doesn't work. This really needs to be fixed before
+// the next big RTTY Roundup or Field Day where there may be a lot of hams that want
+// to use this feature to only reference their log starting when the contest starts.
+// Which isn't always 00:00 UTC.
+// ************************************************************************************ //
 var picker = {
   attach: function (opt)
   {

package.nw/lib/gt.js

@@ -10070,7 +10070,7 @@ function renderStatsBox()
     worker +=
       "<br/> In Section: " +
       scoreSection +
-      "<br/>Error Generating Stats<br/>Please take a screenshot and send to gridtracker@gmail.com";
+      "<br/>Error Generating Stats<br/>Please take a screenshot and send to team@gridtracker.org";
   }
 
   setStatsDiv("statViewDiv", worker);
@@ -11305,7 +11305,13 @@ function pskBandActivityCallback(buffer, flag)
 
   renderBandActivity();
 }
-
+/* FIXME ******************************************************************************
+   Should we somewhere in settings, have a checkbox to enable / disable PSK spots
+   specifically? We can disable the overall spots, both PSK and OAMS, and OAMS has a
+   checkbox in the OAMS tab. I'm thinking for the situation where I only want to
+   pull in OAMS spots and not PSK reporter's spots.
+   ************************************************************************************
+*/
 function pskGetBandActivity()
 {
   if (g_mapSettings.offlineMode == true) return;
@@ -11569,14 +11575,7 @@ function updateBasedOnIni()
   {
     if (typeof nw != "undefined")
     {
-      // lets see if we can find our location the hard way
-      getBuffer(
-        "https://api.ipstack.com/check?access_key=8c9233ec1c09861a707951ab3718a7f6&format=1",
-        ipLocation,
-        null,
-        "https",
-        443
-      );
+      alert("Location not available!\nEither start WSJT-X/JTDX or enter your grid square in the settings ");
     }
   }
 }
@@ -12054,27 +12053,6 @@ function selectElementContents(el)
   }
 }
 
-function ipLocation(buffer, flag)
-{
-  var obj = JSON.parse(buffer);
-  if (
-    typeof obj != "undefined" &&
-    obj != null &&
-    typeof obj.latitude != "undefined"
-  )
-  {
-    g_appSettings.centerGridsquare = latLonToGridSquare(
-      obj.latitude,
-      obj.longitude
-    ).substr(0, 6);
-    if (g_appSettings.centerGridsquare.length > 0)
-    {
-      homeQTHInput.value = g_appSettings.centerGridsquare;
-      if (ValidateGridsquare(homeQTHInput, null)) setCenterGridsquare();
-    }
-  }
-}
-
 function popupNewWindows()
 {
   if (typeof nw != "undefined")