Merge branch 'tagloomis' into 'master'

Disconnect from Tag's infrastructure

See merge request gridtracker.org/gridtracker!25
merge-requests/31/head
Paul Traina 2020-11-17 16:37:30 +00:00
commit 3bf884e498
9 zmienionych plików z 17 dodań i 20 usunięć

2
debian/control vendored
Wyświetl plik

@ -4,7 +4,7 @@ Priority: optional
Maintainer: Paul Traina <216482-pleasantone@users.noreply.gitlab.com>
Build-Depends: debhelper (>= 12.1)
Standards-Version: 4.3.0
Homepage: http://tagloomis.com/
Homepage: http://gridtracker.org/
Package: gridtracker
Architecture: all

2
debian/copyright vendored
Wyświetl plik

@ -1,6 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: GridTracker
Upstream-Contact: Tag Loomis <n0ttl@gridtracker.org>
Upstream-Contact: GridTracker Team <contact@gridtracker.org>
Source: https://gitlab.com/gridtracker.org/gridtracker
Files: *

Wyświetl plik

@ -43,9 +43,9 @@ Run gridtracker, no arguments needed.
.SH COPYRIGHT
.PP
Copyright (c) 2018-2020 Stephen Tag Loomis. All rights reserved.
https://tagloomis.com
Copyright (c) 2020 GridTracker.org. All rights reserved.
Released under BSD 3-Clause License
https://gridtracker.org
.SH
.PP

Wyświetl plik

@ -1064,7 +1064,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</div>
<div>
<br />
<div class="button" onclick="require('nw.gui').Shell.openExternal('https://tagloomis.com/gt/gt_print.html');">
<div
class="button"
onclick="require('nw.gui').Shell.openExternal('https://gridtracker.org/gt/gt_print.html');"
>
Print
</div>
</div>

Wyświetl plik

@ -4953,7 +4953,7 @@
"GT": {
"compiledBy": "N0TTL",
"sponsor": "GridTracker",
"website": "https://tagloomis.com/",
"website": "https://gridtracker.org/",
"qsl_req": "confirmed",
"mixed": [
"160m",

Wyświetl plik

@ -234,8 +234,7 @@ function oqrsValuesChanged() {
function oqrsDownload(fromSettings) {
oqrsUpdatedTd.innerHTML = "<b><i>Downloading...</i></b>";
getBuffer(
"https://dl.dropboxusercontent.com/s/9nycdpbxx5b3bpp/clublog.json?cb=" +
timeNowSec(),
"https://gridtracker.org/gt/clublog.json",
processoqrsCallsigns,
null,
"https",
@ -450,8 +449,7 @@ function ulsDownload() {
ulsUpdatedTd.innerHTML = "<b><i>Downloading...</i></b>";
ulsCountTd.innerHTML = 0;
getChunkedBuffer(
"https://dl.dropboxusercontent.com/s/91iynrvdse7zcf5/callsigns.txt?cb=" +
timeNowSec(),
"https://gridtracker.org/gt/callsigns.txt",
processulsCallsigns,
null,
"https",

Wyświetl plik

@ -9442,7 +9442,7 @@ function newMessageSetting(whichSetting) {
function checkForNewVersion(showUptoDate) {
if (typeof nw != "undefined")
getBuffer(
"https://tagloomis.com/gt/version.txt?lang=" + g_localeString,
"https://gridtracker.org/gt/version.txt?lang=" + g_localeString,
versionCheck,
showUptoDate,
"https",
@ -10799,14 +10799,10 @@ function versionCheck(buffer, flag) {
}
function onExitAppToGoWebsite() {
require("nw.gui").Shell.openExternal("https://tagloomis.com/");
require("nw.gui").Shell.openExternal("https://gridtracker.org/");
saveAndCloseApp();
}
function mailMe() {
require("nw.gui").Shell.openExternal("mailto:tag.loomis@gmail.com");
}
function mailThem(address) {
require("nw.gui").Shell.openExternal("mailto:" + address);
}
@ -13534,7 +13530,7 @@ function pskSpotCheck(timeSec) {
"&senderCallsign=" +
encodeURIComponent(myRawCall) +
"&appcontact=" +
encodeURIComponent("tag.loomis@gmail.com"),
encodeURIComponent("contact@gridtracker.org"),
pskSpotResults,
null,
"https",
@ -13968,7 +13964,7 @@ function updateSpotView(leaveCount = true) {
function gotoDonate() {
var gui = require("nw.gui");
gui.Shell.openExternal("https://tagloomis.com/donations/");
gui.Shell.openExternal("https://gridtracker.org/donations/");
}
function changeRosterTime() {

Wyświetl plik

@ -65,7 +65,7 @@ function gtConnectChat() {
var rnd = parseInt(Math.random() * 10) + 18260;
try {
g_gtState = ChatState.connecting;
g_gtChatSocket = new WebSocket("wss://tagloomis.com:" + rnd);
g_gtChatSocket = new WebSocket("wss://oams.space:" + rnd);
} catch (e) {
g_gtState = ChatState.error;
return;

Wyświetl plik

@ -2661,7 +2661,7 @@ function stateChangedValue(what) {
if (window.opener.g_mapSettings.offlineMode == false) {
var callState = r_currentUSState.replace("CN-", "");
getBuffer(
"https://tagloomis.com/gt/callsigns/" + callState + ".callsigns.json",
"https://gridtracker.org/gt/callsigns/" + callState + ".callsigns.json",
callsignResult,
r_currentUSState,
"https",
@ -2913,7 +2913,7 @@ function init() {
if (window.opener.g_mapSettings.offlineMode == false)
getBuffer(
"https://tagloomis.com/gt/callsigns/manifest.json",
"https://gridtracker.org/gt/callsigns/manifest.json",
manifestResult,
null,
"https",