From: James Procter Date: Tue, 4 Jul 2023 11:54:58 +0000 (+0100) Subject: Merge branch 'merge/from_2_11_2_7_to_2_11_3_0' into develop X-Git-Tag: Release_2_11_4_0~255 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=dc39f665e7095040ecc56b0833c0a1960f4020e3;hp=74c36ac68e07e85da17fc5897ddb3bda4075084a;p=jalview.git Merge branch 'merge/from_2_11_2_7_to_2_11_3_0' into develop --- diff --git a/help/help/html/privacy.html b/help/help/html/privacy.html index 73138f6..8704ce8 100644 --- a/help/help/html/privacy.html +++ b/help/help/html/privacy.html @@ -53,9 +53,10 @@ job data (input data and results) after about two weeks.
  • Usage Analytics
    Since Jalview 2.11.2.7, the - Jalview Desktop records usage data with Plausible.io via a custom - GPLv3 client developed by Ben Soares. Prir to this, Jalview versions - as far back as 2.4 recorded application launces via Plausible.io via a + custom GPLv3 client developed by Ben Soares. Prior to this, Jalview + versions as far back as 2.4 recorded application launches via JGoogleAnalytics .
    Usage logs for Jalview record the fact that the application was started, and details about the OS, installed Jalview diff --git a/help/markdown/releases/release-2_11_2_7.md b/help/markdown/releases/release-2_11_2_7.md index 9cbae38..361d39a 100644 --- a/help/markdown/releases/release-2_11_2_7.md +++ b/help/markdown/releases/release-2_11_2_7.md @@ -1,6 +1,6 @@ --- version: 2.11.2.7 -date: 2023-06-29 +date: 2023-06-30 channel: "release" --- diff --git a/help/markdown/whatsnew/whatsnew-2_11_2_7.md b/help/markdown/whatsnew/whatsnew-2_11_2_7.md index a5e5a79..f884134 100644 --- a/help/markdown/whatsnew/whatsnew-2_11_2_7.md +++ b/help/markdown/whatsnew/whatsnew-2_11_2_7.md @@ -1,3 +1,5 @@ -Jalview 2.11.2.7 is a rapid patch patch release. +Jalview 2.11.2.7 is a minor patch release - it includes patches affecting efficiency when importing structures and a small revision to the import processing of structures with negative residue numbering. + +With this release, Jalview usage statistics are now collected by a jalview.org hosted instance of the open source privacy-preserving analytics stack, Plausible.io. diff --git a/src/jalview/analytics/Plausible.java b/src/jalview/analytics/Plausible.java index 3d7f1cd..ab2de77 100644 --- a/src/jalview/analytics/Plausible.java +++ b/src/jalview/analytics/Plausible.java @@ -1,3 +1,23 @@ +/* + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors + * + * This file is part of Jalview. + * + * Jalview is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. + * + * Jalview is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. + */ package jalview.analytics; import java.io.BufferedReader; diff --git a/src/jalview/api/RotatableCanvasI.java b/src/jalview/api/RotatableCanvasI.java index c6eb6de..1646d89 100644 --- a/src/jalview/api/RotatableCanvasI.java +++ b/src/jalview/api/RotatableCanvasI.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. *