From 23c0e0115aabaedcb1e64fe50aa15679237b99f3 Mon Sep 17 00:00:00 2001
From: whyIsMyNameUsed <83971710+whyIsMyNameUsed@users.noreply.github.com>
Date: Mon, 10 May 2021 17:59:51 +0200
Subject: [PATCH 1/5] Update Qrz.php

Not all character works for the qrz-password without urlencode.
---
 application/libraries/Qrz.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/libraries/Qrz.php b/application/libraries/Qrz.php
index dd0c995d..1359a8c9 100755
--- a/application/libraries/Qrz.php
+++ b/application/libraries/Qrz.php
@@ -10,7 +10,7 @@ class Qrz {
 	// Return session key
 	public function session($username, $password) {
 		// URL to the XML Source
-		$xml_feed_url = 'http://xmldata.qrz.com/xml/current/?username='.$username.';password='.$password.';agent=cloudlog';
+		$xml_feed_url = 'http://xmldata.qrz.com/xml/current/?username='.$username.';password='.urlencode($password).';agent=cloudlog';
 		
 		// CURL Functions
 		$ch = curl_init();
@@ -33,7 +33,7 @@ class Qrz {
 		$ci = & get_instance();
 		
 		// URL to the XML Source
-		$xml_feed_url = 'http://xmldata.qrz.com/xml/current/?username='.$username.';password='.$password.';agent=cloudlog';
+		$xml_feed_url = 'http://xmldata.qrz.com/xml/current/?username='.$username.';password='.urlencode($password).';agent=cloudlog';
 		
 		// CURL Functions
 		$ch = curl_init();

From 0e0e37dcf4d7e02b8f253167f9af730694fe96e5 Mon Sep 17 00:00:00 2001
From: ve1cwj <67641637+ve1cwj@users.noreply.github.com>
Date: Thu, 13 May 2021 08:00:47 -0300
Subject: [PATCH 2/5] Update satellite_data.json

Added JO-97 U/V linear transponder
---
 assets/json/satellite_data.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/assets/json/satellite_data.json b/assets/json/satellite_data.json
index 6e6a714d..887cd65d 100644
--- a/assets/json/satellite_data.json
+++ b/assets/json/satellite_data.json
@@ -239,6 +239,18 @@
          ]
       }
    },
+   "JO-97":{
+      "Modes":{
+         "U/V":[
+            {
+               "Uplink_Mode":"LSB",
+               "Uplink_Freq":"435110000",
+               "Downlink_Mode":"USB",
+               "Downlink_Freq":"145865000"
+            }
+         ]
+      }
+   },
    "Lilacsat-1":{
       "Modes":{
          "V/U":[

From ded6a142caaa5772a55d47987db05fa8cd534a64 Mon Sep 17 00:00:00 2001
From: Leroy Diaz <leroydiazg@gmail.com>
Date: Mon, 17 May 2021 18:54:56 +0100
Subject: [PATCH 3/5] Translate account_lang to Spanish

---
 application/language/spanish/account_lang.php | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 application/language/spanish/account_lang.php

diff --git a/application/language/spanish/account_lang.php b/application/language/spanish/account_lang.php
new file mode 100644
index 00000000..1545a6e7
--- /dev/null
+++ b/application/language/spanish/account_lang.php
@@ -0,0 +1,10 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+$lang['account_logbook_fields'] = 'Campos a mostrar en el Logbook';
+$lang['account_column1_text'] = 'Columna 1';
+$lang['account_column2_text'] = 'Columna 2';
+$lang['account_column3_text'] = 'Columna 3';
+$lang['account_column4_text'] = 'Columna 4';
+$lang['account_column5_text'] = 'Columna 5 (solo en logbook)';

From 604178e1e87dfd52c3d4dd48a62f13f7a2bf5d5e Mon Sep 17 00:00:00 2001
From: Leroy Diaz <leroydiazg@gmail.com>
Date: Mon, 17 May 2021 18:59:57 +0100
Subject: [PATCH 4/5] Update Spanish general_words lang file

For "translating" column headers added in
https://github.com/magicbug/Cloudlog/pull/1019
---
 application/language/spanish/general_words_lang.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/application/language/spanish/general_words_lang.php b/application/language/spanish/general_words_lang.php
index 37e69cad..2d9f47d5 100644
--- a/application/language/spanish/general_words_lang.php
+++ b/application/language/spanish/general_words_lang.php
@@ -90,6 +90,9 @@ $lang['gen_hamradio_usa_state'] = 'Estado USA';
 $lang['gen_hamradio_iota_reference'] = 'Referencia IOTA';
 $lang['gen_hamradio_sota_reference'] = 'Referencia SOTA';
 $lang['gen_hamradio_dok'] = 'DOK';
+$lang['gen_hamradio_state'] = 'Estado';
+$lang['gen_hamradio_iota'] = 'IOTA';
+$lang['gen_hamradio_gridsquare'] = 'Gridsquare';
 
 $lang['gen_hamradio_sig'] = 'Señal';
 $lang['gen_hamradio_sig_info'] = 'Información de señal';

From 164a395b761b634ddaf0c557f2877bfdc221aea6 Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Sat, 22 May 2021 08:47:24 +0200
Subject: [PATCH 5/5] [Award US counties] A small SQL fix if when
 sql_mode=only_full_group_by is on. Fixed #1037

---
 application/models/Counties.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/models/Counties.php b/application/models/Counties.php
index 7df46527..7d6c55c3 100644
--- a/application/models/Counties.php
+++ b/application/models/Counties.php
@@ -47,7 +47,7 @@ class Counties extends CI_Model
             " and COL_DXCC in ('291', '6', '110')
                 and coalesce(COL_CNTY, '') <> ''
                 and COL_BAND != 'SAT'
-                group by thcv.COL_STATE
+                group by thcv.COL_STATE, countycountconfirmed
                 order by thcv.COL_STATE";
 
         $query = $this->db->query($sql);