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

5271 Commity (a63b38eb0a7ff7c29579bb44c74fb580cb1cbcbc)

Autor SHA1 Wiadomość Data
Peter Goodhall 88a345cc53
Merge pull request #2379 from phl0/couldUseNewlineHere 
Think it should be here :)
 2023-08-06 13:15:42 +01:00
phl0 03af98028d
Think it should be here :) 2023-08-06 13:34:54 +02:00
int2001 9f50106529
commented the code 2023-08-06 08:01:21 +00:00
Andreas 2502a3bacc [Advanced Logbook] Fixed activating print label button when crossing out dialog 2023-08-06 09:58:29 +02:00
int2001 bc76514096
Reload table after each QSO in case of >1 PC used for logging 2023-08-06 07:05:33 +00:00
Andreas bf213b1773 [Advanced Logbook] Enable print label button again if close on dialog 2023-08-05 21:46:03 +02:00
Peter Goodhall e154037e2c
Merge pull request #2374 from int2001/radio_delete_fix 
Delete HW-Radio worked only for admins. Fixed that
 2023-08-05 10:57:18 +01:00
Peter Goodhall 0af6dd2939
Merge pull request #2375 from int2001/label_grid 
Added (optional) grid to label-printing
 2023-08-05 10:57:03 +01:00
Andreas bcff9dd102 Added support for grid when printing from the advanced logbook 2023-08-05 11:42:39 +02:00
int2001 391e9d084c
Added checkbox for Grid (tnx Andreas) 2023-08-05 07:41:06 +00:00
int2001 8c7e4a9a10
Delete HW-Radio worked only for admins. Fixed that 2023-08-05 06:51:54 +00:00
int2001 4ec2a03c33
Added optional Grid and Call-Line to label 2023-08-05 05:49:12 +00:00
Peter Goodhall 22fba830a4
Merge pull request #2372 from AndreasK79/winkey_url_fix 
[Winkeyer] Fixed url when Cloudlog is in a subfolder
 2023-08-04 13:14:40 +01:00
Andreas 05a0f5333d [Winkeyer] Fixed url when Cloudlog is in a subfolder 2023-08-04 13:55:47 +02:00
Peter Goodhall df0b4185b1
Merge pull request #2370 from oh1jw/master 
Finnish update
 2023-08-04 11:23:21 +01:00
Peter Goodhall 10c1c9d06a
Merge branch 'dev' into master 2023-08-04 11:22:01 +01:00
Andreas Kristiansen 0f609593e6
Merge pull request #2371 from AndreasK79/qslprint_mark_as_printed 
[QSLPrint] Fixed js. Added button to mark as sent
 2023-08-04 11:51:32 +02:00
Peter Goodhall efbe85c147
Merge pull request #2369 from int2001/label_inch 
Added inches to papertype / extended logic for inches
 2023-08-04 10:51:19 +01:00
Andreas 9eee9d9751 [QSLPrint] Fixed js. Added button to mark as sent 2023-08-04 10:00:14 +02:00
Juuso_W 4efd9234d2 Finnish update 
Finnish language files, updated from DEV and translated.
Pls check for conflicts (if this causes any) - I had no rights to update to DEV
 2023-08-04 10:47:03 +03:00
int2001 1afb72063a
Changed Header of label to DD.MM.YY UTC 2023-08-04 05:35:43 +00:00
int2001 14cff47f04
Added inches to papertype / extended logic for inches 2023-08-04 04:45:10 +00:00
Peter Goodhall 45e057c261 [Labels] Fixed typo 2023-08-03 14:03:19 +01:00
Peter Goodhall 6cea54bc90 Merge branch 'dev' of https://github.com/magicbug/Cloudlog into dev 2023-08-03 13:59:10 +01:00
Peter Goodhall e6004d0c12 [Account][Winkey] Allows users to enable and disable winkey via their account settings 2023-08-03 13:59:02 +01:00
Andreas Kristiansen cb7aa2c9d0
Merge pull request #2368 from int2001/prefix_fix 
Fixed prefix on SQL
 2023-08-03 14:38:02 +02:00
int2001 ca4c8f6769
Fixed prefix on SQL 2023-08-03 12:36:08 +00:00
Peter Goodhall b5bd9f86f6
Merge pull request #2367 from AndreasK79/labels_paper_types 
Custom paper types for labels
 2023-08-03 13:23:24 +01:00
int2001 f5baeb8fa2
fixed "no active label"-detection 2023-08-03 11:34:29 +00:00
Andreas bf858f31de Added dialog for delete 2023-08-03 13:24:05 +02:00
int2001 126d781baa
Added Station-ID to label-qso-view 2023-08-03 11:15:02 +00:00
Andreas 3974fba6bb Merge branch 'labels_paper_types' of https://github.com/AndreasK79/Cloudlog into labels_paper_types 2023-08-03 12:30:29 +02:00
Andreas 2db344d220 Removed last modified. Also shows portrait/landscape in table 2023-08-03 12:27:17 +02:00
int2001 2824f31ac6
Disabled "use for print" if no paper given, catching error if those label was active 2023-08-03 08:55:16 +00:00
Byt3 1f6817343b
Merge pull request #1 from magicbug/dev 
Dev
 2023-08-03 09:27:48 +02:00
Byt3 eb9ca6b191
Update options_lang.php - Orthografie 
Email <> E-Mail
E-Mail is the correct German word for electronic mail
 2023-08-03 09:22:18 +02:00
Byt3 b905919180
Update menu_lang.php 
US "Grafschaft" is not commonly used in German. It's better to use "County", also because "County" is used elsewhere in the German translation.
 2023-08-03 09:14:22 +02:00
Byt3 ddb7ba0b42
Update lotw_lang.php - Orthografie 
some smaller changes.
Adjusted wording for TQSL instruction to match the most recent version of TQSL
 2023-08-03 09:09:37 +02:00
Byt3 09c13b83ca
Update general_words_lang.php - Orthografie 2023-08-03 09:00:57 +02:00
int2001 85a2299322
Added warning if no paper_type is assigned 2023-08-03 06:53:22 +00:00
Byt3 62f81a2277
Update admin_lang.php - orthography 2023-08-03 08:51:56 +02:00
Andreas dc7018def0 Merge branch 'labels_paper_types' of https://github.com/AndreasK79/Cloudlog into labels_paper_types 2023-08-03 08:16:16 +02:00
Andreas 95dda89fc6 Updated migration script to update on down, and failsafe for papertype 2023-08-03 08:16:13 +02:00
int2001 262cca5465
Added orientation and usage count to view/controller/model 2023-08-03 06:15:51 +00:00
int2001 9aa82ad3af
drop old col paper_type after migration from label_types 2023-08-03 04:42:51 +00:00
int2001 6d2c4b1b76
Switched from paper_name to paper_id 2023-08-03 04:37:25 +00:00
int2001 bc62c97c65
Merge branch 'labels_paper_types' of github.com:AndreasK79/Cloudlog into labels_paper_types 2023-08-03 03:39:58 +00:00
Andreas c57c636068 Changed paper type templates to have user_id -1 2023-08-02 19:14:18 +02:00
Andreas d1d602a941 Added error message when saving or editing a paper type with duplicate name 2023-08-02 19:10:35 +02:00
Andreas e0977ea3d7 Updated script number 2023-08-02 18:25:04 +02:00