mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
2 691 Commity
5 Gałęzie
42 Tagi
39 MiB
Wykres commitów

2163 Commity (48a2d3fb7ce3def92d0b0f4e432e0618e28d08cb)

Autor SHA1 Wiadomość Data
Andreas Kristiansen 48a2d3fb7c
Merge pull request #1218 from AndreasK79/small_fixes_for_better_compability 
PHP8 fix and folder not found fix
 2021-10-15 08:54:49 +02:00
Thomas Werzmirzowsky d62ab2e7d4 added check for empty result from list_logbooks_linked 
removed "echo" outputs as then the following redirect is not possible
 2021-10-12 20:03:14 +02:00
Peter Goodhall 2d2a480fbb Merge branch 'station_logbooks' of https://github.com/magicbug/Cloudlog into station_logbooks 2021-10-12 15:19:41 +01:00
Peter Goodhall 87d5c8e1b0 [Station Logbook] Improved edit interface 2021-10-12 15:19:39 +01:00
Andreas d174003518 Merge branch 'station_logbooks' of https://github.com/magicbug/Cloudlog into station_logbooks 2021-10-12 13:20:46 +02:00
Andreas 57e5836193 [Migrations] Added checks to see if things exists. Done to avoid trouble when swapping branches. 2021-10-12 13:20:41 +02:00
Chris Tabor 3b57245cd9 Fix dxcc_lookup query for dxcc_exceptions 2021-10-09 12:34:09 -07:00
Andreas 99379ec213 PHP8 fix and folder not found fix 2021-10-09 15:25:10 +02:00
Andreas Kristiansen 234ec52f1b
Merge branch 'mastettest' into station_logbooks 2021-10-08 11:48:01 +02:00
Andreas e0e80fb680 [Contesting] Fixed so that correct gridsquare was shown in the view. Also removed some unused code in the controller. 2021-10-07 21:42:19 +02:00
Andreas 60536c4d5c [ADIF Export] Added contest id to export 2021-10-07 19:15:08 +02:00
Peter Goodhall c6f9a5a3ae [Search] Fixed incorrectly closed stristr 2021-10-07 15:08:28 +01:00
Andreas c369cf9647 [Modes] Fixed form. In certain cases, creating a mode would not work 2021-10-07 12:14:17 +02:00
Andreas 349f3ee1ca [Contesting names] Bugfix in the form for creating contests and stopped loading of contesting.js when editing contestnames. 2021-10-06 20:24:14 +02:00
Peter Goodhall e46152003f [Migration] Fixes issue when user_id already exists with the api table. 2021-10-06 11:16:54 +01:00
Andreas d998a7f8a2 Changed order of migration script to not cause trouble with migration script in master. 2021-10-06 10:36:50 +02:00
Andreas Kristiansen 7a6bdf3fbc
Merge pull request #1212 from AndreasK79/storing_queries 
Storing queries
 2021-10-06 10:28:19 +02:00
Andreas 7c56741b92 [Advanced search] Changed to migration 71 to not have problems later when merging station_logbooks. 2021-10-06 10:19:45 +02:00
Andreas Kristiansen fa1bb549ee
Merge pull request #694 from jsb2092/master 
Added support for lookups in services for more detailed information when logged in
 2021-10-05 20:58:48 +02:00
Andreas 9365f551a7 Removed lines that should not be there. Problably comes from a merge. 2021-10-05 19:24:50 +02:00
Andreas Kristiansen 4b8e9db1b1
Merge pull request #1205 from Byloth/master 
[FIX] Solved a SQL syntax problem while using the latest MariaDB version.
 2021-10-04 13:25:36 +02:00
Matteo Bilotta c1854515c7
[FIX] Solved a SQL syntax problem while using the latest MariaDB version. 2021-10-04 12:32:20 +02:00
Andreas 3baffed23e [Advanced search] Edit of stored query description can now be done. Formatted code a bit. 2021-10-03 20:06:08 +02:00
Peter Goodhall 2dcd4f3965 Added comments 2021-09-29 22:02:08 +01:00
Peter Goodhall 650c73f4e6 [LoTW] Fixes issue with sync script running 2021-09-29 22:00:42 +01:00
Thomas Werzmirzowsky 43f96fab9d "Mark QSL Card Not Required" sets status to Ignore but sets red arrow 
which reflects status No. Changed color to grey.
 2021-09-29 21:51:42 +02:00
Peter Goodhall 6bf7d97df8 Removed test function. 2021-09-28 17:21:56 +01:00
Peter Goodhall 8b1770feab [API][CAT] Fixes issue where user_id isn't getting added to the hardware entry 2021-09-28 17:18:04 +01:00
Peter Goodhall 0f57e62a84 Revert "Correct user date formating on QSO pages (Live/Post)" 
This reverts commit 77a99780cb.
 2021-09-28 16:09:47 +01:00
Peter Goodhall 5f10c52323 Went through logbook and logbook model changing things to logbook linked profiles 2021-09-28 11:21:12 +01:00
Peter Goodhall f765a1c169 [QSO Entry] Changed worked_grid_before in Logbooks.php to use All station locations 2021-09-28 11:12:35 +01:00
Peter Goodhall 7651517e74
Merge pull request #1190 from AndreasK79/custom_maps_station_logbooks 
Custom maps station logbooks
 2021-09-27 15:09:21 +01:00
Peter Goodhall e8be6f8620 Only create the fields in db if they arent there 2021-09-27 15:07:38 +01:00
Andreas 62402c02a4 [QSLPrint] Added QSL-status to the QSOList 2021-09-27 10:49:18 +02:00
Andreas 7979431d95 [Advanced search] Added migration script. 2021-09-25 20:13:06 +02:00
Andreas 97b5b1b2c8 [Advanced search] Polished things up a bit by using alert and dialog to convey messages. 2021-09-25 20:06:14 +02:00
Andreas 17170433e0 [Advanced search] Only run a query which contains select, but not delete or update. Done for safety precautions. 2021-09-25 19:49:28 +02:00
Andreas 0717fa74ff [Advanced search] When saving a query, we add this to the dropdown. 2021-09-25 18:08:31 +02:00
Andreas d71ba5a0c6 [Advanced search] When deleting a query, it will be removed from the dropdown. 2021-09-25 17:46:08 +02:00
Andreas 223ba0ca21 [Advanced search] You can now save a query for re-use. 2021-09-25 17:40:15 +02:00
Andreas 915a470d8c [Advanced search] Adif export for search result. 2021-09-23 20:18:47 +02:00
Andreas Kristiansen 99b7290412
Merge pull request #1194 from T012m3n7oR/QSO-custom-date-format 
Correct user date formating on QSO pages (Live/Post)
 2021-09-23 10:22:30 +02:00
Andreas Kristiansen b5ac0952ed
Merge pull request #1193 from AndreasK79/uploadpath 
@mattmelling configurable updates folder
 2021-09-22 14:21:36 +02:00
KT3PJ 77a99780cb Correct user date formating on QSO pages (Live/Post) 
The date field will now be populated from the user's preferences, if
this is not set it will fallback to the file config setting.

-Move date format detection to earlier in the index.php file to allow a
single lookup of the format for the entire file.
-Convert hardcode date string to format selection in index.php to allow
the custom format to show on the Post QSO page.
-Convert php format string to jclock format string in footer.php to
allow the custom format to show on the Live QSO page.
 2021-09-22 08:18:58 -04:00
Andreas Kristiansen a2da3753ed
Merge pull request #1111 from T012m3n7oR/master 
Add the gridsquare from LotW QSL to the logbook
 2021-09-22 13:38:41 +02:00
Andreas 9a6b6263bb [Custom Map] Cleaned up the code a little bit. Swapped station profile name to logbook name in the view. 2021-09-20 22:03:39 +02:00
Andreas Kristiansen 92e45d6735
Merge branch 'station_logbooks' into add_userid_to_api 2021-09-20 19:34:19 +02:00
Andreas Kristiansen 345c753d13
Merge branch 'station_logbooks' into userid_hardware 2021-09-20 19:33:31 +02:00
Andreas Kristiansen ad045a1a8d
Merge pull request #1187 from AndreasK79/notes_assign_to_user 
Notes assign to user
 2021-09-20 19:32:59 +02:00
Andreas 51fba79397 [Hardware] Changed page title to be the same as the menu name 2021-09-20 19:32:41 +02:00