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

2713 Commity (f0b97c148ac7b2e3686885ac3328e6d581c4caaa)

Autor SHA1 Wiadomość Data
Andreas Kristiansen f0b97c148a
Merge pull request #987 from abarrau/master 
differents updates
 2021-11-04 19:21:52 +01:00
Peter Goodhall a9e1e6a41a
Merge pull request #1256 from Werzi2001/station_logbooks_multi_user_improvements 
improvements to multi user support of stations/logbooks
 2021-11-02 14:19:44 +00:00
Thomas Werzmirzowsky 6f39ce940f - QSO create/edit check that station belongs to user 
- QSO form only shows stations of user
 2021-10-31 10:25:35 +01:00
Thomas Werzmirzowsky 61b41df1d9 created helper methods to check access 2021-10-31 10:17:14 +01:00
Thomas Werzmirzowsky 9ed56e7211 improvements to multi user support of stations/logbooks 
- Set active logbooks checks if logbook belongs to user
- Link station to logbook checks that station and logbook belong to user
- Unlink station from logbook checks that station and logbook belong to user
- Edit of logbook only shows stations of user
- Set active station checks if station belongs to user
- find_active and find_gridsquare of Stations model now check user
 2021-10-31 09:56:45 +01:00
Andreas Kristiansen 10969f7572
Merge pull request #1243 from Werzi2001/station_logbooks_sort 
sort logbook and station list by name
 2021-10-22 14:53:44 +02:00
Thomas Werzmirzowsky 5f39e99d47 sort logbook and station list by name 2021-10-20 21:26:35 +02:00
Andreas Kristiansen 58a2346de6
Merge pull request #1238 from Werzi2001/station_logbooks_wording 
changed wording to station
 2021-10-20 18:05:54 +02:00
Andreas Kristiansen 6898fa2a63
Merge pull request #1237 from Werzi2001/station_logbooks_logbook_list 
added logbook filter to logbook main list
 2021-10-20 18:05:42 +02:00
Thomas Werzmirzowsky e66e2007c0 one more change 2021-10-17 11:45:21 +02:00
Thomas Werzmirzowsky b300106ade changed wording to station 2021-10-17 11:42:33 +02:00
Thomas Werzmirzowsky f510bc314b added logbook filter to logbook main list 2021-10-17 11:25:01 +02:00
Andreas 53e825d885 [Themes] Fixed form in the view 2021-10-16 19:53:22 +02:00
Andreas 9576f576d9 Fixed down in migration script. 2021-10-15 11:14:28 +02:00
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
Peter Goodhall 8f9fad2ca4
Merge pull request #1225 from Werzi2001/station_logbooks_fix_edit_errors 
fixes for station log
 2021-10-12 22:06:21 +01: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
Peter Goodhall 5dde6c2e9a
Merge pull request #1219 from k7tab/dxcc_lookup_exceptions_fix 
Dxcc lookup exceptions fix
 2021-10-09 21:06:04 +01: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 Kristiansen dfe3730e5f
Merge pull request #1217 from AndreasK79:contesting_show_grid_from_station_location 
[Contesting] Fixed so that correct gridsquare was shown in the view. Also removed some unused code in the controller.
 2021-10-07 21:43:05 +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 Kristiansen cfecaa1ce3
Merge pull request #1216 from AndreasK79:adifhelper_export_contest_id 
[ADIF Export] Added contest id to export
 2021-10-07 19:18:14 +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 Kristiansen c5f4897b65
Merge pull request #1215 from AndreasK79/bugfix_mode_form 
[Modes] Fixed form. In certain cases, creating a mode would not work
 2021-10-07 12:15:54 +02:00
Andreas c369cf9647 [Modes] Fixed form. In certain cases, creating a mode would not work 2021-10-07 12:14:17 +02:00
Andreas Kristiansen 292058f2a2
Merge pull request #1214 from AndreasK79/bugfix_contestnames 
[Contesting names] Bugfix in the form for creating contests and stopp…
 2021-10-06 20:24:40 +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 Kristiansen a7694080e3
Update config.php 2021-10-05 20:55:17 +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 Kristiansen d1005e3141
Merge pull request #1206 from Werzi2001/mark_not_required_inconsitent 
"Mark QSL Card Not Required" sets status to Ignore but sets red arrow
 2021-10-04 11:23:13 +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