Merge branch 'dev' into cypress-end-to-end-testing

application/config/migration.php

@@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE;
 |
 */
 
-$config['migration_version'] = 175;
+$config['migration_version'] = 176;
 
 /*
 |--------------------------------------------------------------------------

application/language/german/general_words_lang.php

@@ -74,6 +74,10 @@ $lang['general_word_invalid_ignore'] = 'Ungültig (Ignorieren)';
 $lang['general_word_qslcard'] = 'QSL Karte';
 $lang['general_word_qslcard_management'] = 'QSL Verwaltung';
 $lang['general_word_qslcards'] = 'QSL Karten';
+$lang['general_word_sstv_management'] = 'SSTV Management';
+$lang['general_word_sstvimages'] = 'SSTV Bilder';
+$lang['general_sstv_upload'] = 'Hochgeladene SSTV Bilder';
+$lang['general_sstv_upload_button'] = 'Lade SSTV Bild(er) hoch';
 $lang['general_word_qslcard_direct'] = 'Direkt';
 $lang['general_word_qslcard_bureau'] = 'Büro';
 $lang['general_word_qslcard_electronic'] = 'Elektronisch';

application/language/german/menu_lang.php

@@ -17,6 +17,7 @@ $lang['menu_post_contest_logging'] = 'Zeitversetztes Contest Logging';
 $lang['menu_bandmap'] = 'Bandmap';
 $lang['menu_view_qsl'] = 'QSL Ansicht';
 $lang['menu_view_eqsl'] = 'eQSL Ansicht';
+$lang['menu_view_sstv'] = 'SSTV Bilder';
 
 $lang['menu_notes'] = 'Notizen';
 

application/language/german/sstv_lang.php

@@ -2,4 +2,4 @@
 
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-$lang['sstv_string_disk_space'] = 'of disk space to store SSTV image assets';
+$lang['sstv_string_disk_space'] = 'an Speicherplatz, um SSTV-Bilder zu speichern';

application/migrations/176_tag_2_6_8.php

@@ -0,0 +1,30 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/*
+*   Tag Cloudlog as 2.6.8
+*/
+
+class Migration_tag_2_6_8 extends CI_Migration {
+
+    public function up()
+    {
+    
+        // Tag Cloudlog 2.6.3
+        $this->db->where('option_name', 'version');
+        $this->db->update('options', array('option_value' => '2.6.8'));
+
+        // Trigger Version Info Dialog
+        $this->db->where('option_type', 'version_dialog');
+        $this->db->where('option_name', 'confirmed');
+        $this->db->update('user_options', array('option_value' => 'false'));
+
+    }
+
+    public function down()
+    {
+        $this->db->where('option_name', 'version');
+        $this->db->update('options', array('option_value' => '2.6.7'));
+    }
+}

application/views/awards/wwff/index.php

@@ -4,10 +4,10 @@
         <div id="awardInfoButton">
             <script>
             var lang_awards_info_button = "<?php echo lang('awards_info_button'); ?>";
-            var lang_award_info_ln1 = "<?php echo lang('awards_dok_description_ln1'); ?>";
-            var lang_award_info_ln2 = "<?php echo lang('awards_dok_description_ln2'); ?>";
-            var lang_award_info_ln3 = "<?php echo lang('awards_dok_description_ln3'); ?>";
-            var lang_award_info_ln4 = "<?php echo lang('awards_dok_description_ln4'); ?>";
+            var lang_award_info_ln1 = "<?php echo lang('awards_wwff_description_ln1'); ?>";
+            var lang_award_info_ln2 = "<?php echo lang('awards_wwff_description_ln2'); ?>";
+            var lang_award_info_ln3 = "<?php echo lang('awards_wwff_description_ln3'); ?>";
+            var lang_award_info_ln4 = "<?php echo lang('awards_wwff_description_ln4'); ?>";
             </script>
             <h2><?php echo $page_title; ?></h2>
             <button type="button" class="btn btn-sm btn-primary me-1" id="displayAwardInfo"><?php echo lang('awards_info_button'); ?></button>

application/views/map/custom_date.php

@@ -94,6 +94,6 @@
 </div>
 
 <!-- Map -->
-<div id="custommap" class="map-leaflet mt-2" style="width: 100%; height: calc(100vh - 390px); max-height: 900px;"></div>
+<div id="custommap" class="map-leaflet mt-2" style="width: 100%; height: 1000px;"></div>
 
 <div class="alert alert-success" role="alert">Showing QSOs for Custom Date for Active Logbook <?php echo $logbook_name ?></div>