jalview.git
16 months agoJAL-629 liberal defensive coding, comments about refactoring and DEBUG output for...
James Procter [Thu, 6 Jul 2023 17:17:14 +0000 (18:17 +0100)]
JAL-629 liberal defensive coding, comments about refactoring and DEBUG output for --structureimage

16 months agoJAL-629 make —structure image work again after threading it off
James Procter [Thu, 6 Jul 2023 17:16:24 +0000 (18:16 +0100)]
JAL-629 make —structure image work again after threading it off

16 months agoJAL-4217 catch case when the structure viewer doesn't get added to the desktop window...
James Procter [Thu, 6 Jul 2023 16:35:17 +0000 (17:35 +0100)]
JAL-4217 catch case when the structure viewer doesn't get added to the desktop window (possible knock on for flatlaf JAL-3416)

16 months agoJAL-4217 interruptedExceptions should also break any wait loops
James Procter [Thu, 6 Jul 2023 15:52:29 +0000 (16:52 +0100)]
JAL-4217 interruptedExceptions should also break any wait loops

16 months agoJAL-2292 verify mixed case alignment actually aligns
James Procter [Thu, 6 Jul 2023 15:49:23 +0000 (16:49 +0100)]
JAL-2292 verify mixed case alignment actually aligns

16 months agoJAL-4217 wrap imageExport CLI method's call to imageExport in a separate thread and...
James Procter [Thu, 6 Jul 2023 15:00:03 +0000 (16:00 +0100)]
JAL-4217 wrap imageExport CLI method's call to imageExport in a separate thread and hang around until it completes…

16 months agoJAL-4217 wrap imageExport CLI method's call to imageExport in an invokeAndWait
James Procter [Thu, 6 Jul 2023 14:23:29 +0000 (15:23 +0100)]
JAL-4217 wrap imageExport CLI method's call to imageExport in an invokeAndWait

16 months agoMerge branch 'patch/JAL-2292_caseSensitivePAE' into develop
James Procter [Wed, 5 Jul 2023 12:42:57 +0000 (13:42 +0100)]
Merge branch 'patch/JAL-2292_caseSensitivePAE' into develop

16 months agoMerge branch 'patch/JAL-4213_addref_with_selection' into develop
James Procter [Wed, 5 Jul 2023 12:41:14 +0000 (13:41 +0100)]
Merge branch 'patch/JAL-4213_addref_with_selection' into develop

16 months agoMerge branch 'merge/from_2_11_2_7_to_2_11_3_0' into develop
James Procter [Tue, 4 Jul 2023 11:54:58 +0000 (12:54 +0100)]
Merge branch 'merge/from_2_11_2_7_to_2_11_3_0' into develop

16 months agoJAL-4117 JAL-1551 source licensing
James Procter [Fri, 30 Jun 2023 16:25:46 +0000 (17:25 +0100)]
JAL-4117 JAL-1551 source licensing

16 months agoJAL-4117 Fri June 30th release of 2.11.2.7 with Jalview Plausible analytics
James Procter [Fri, 30 Jun 2023 15:02:43 +0000 (16:02 +0100)]
JAL-4117 Fri June 30th release of 2.11.2.7 with Jalview Plausible analytics

16 months agoJAL-4217 try really hard to shut down and dispose of Desktop resources and any lurkin...
James Procter [Fri, 30 Jun 2023 11:58:55 +0000 (12:58 +0100)]
JAL-4217 try really hard to shut down and dispose of Desktop resources and any lurking threads

16 months agoJAL-4216 release notes
James Procter [Thu, 29 Jun 2023 16:31:00 +0000 (17:31 +0100)]
JAL-4216 release notes

16 months agoJAL-4216 compute size of annotation using start/end of sequence and given length...
James Procter [Thu, 29 Jun 2023 14:38:22 +0000 (15:38 +0100)]
JAL-4216 compute size of annotation using start/end of sequence and given length. This might not work...

16 months agoMerge branch 'task/JAL-4001_Plausible_API' into develop
James Procter [Fri, 30 Jun 2023 10:23:52 +0000 (11:23 +0100)]
Merge branch 'task/JAL-4001_Plausible_API' into develop

16 months agoJAL-4001 Added a random id to User-Agent to ensure separate visits recorded in Plausi... task/JAL-4001_Plausible_API
Ben Soares [Fri, 30 Jun 2023 01:37:20 +0000 (02:37 +0100)]
JAL-4001 Added a random id to User-Agent to ensure separate visits recorded in Plausible.  Changed default URL to self-hosted site

16 months agoMerge branch 'task/JAL-4001_Plausible_API' into develop
James Procter [Thu, 29 Jun 2023 08:55:51 +0000 (09:55 +0100)]
Merge branch 'task/JAL-4001_Plausible_API' into develop

16 months agoJAL-4117 JAL-4001 plausible analytics release notes and privacy docs
James Procter [Wed, 28 Jun 2023 14:29:43 +0000 (15:29 +0100)]
JAL-4117 JAL-4001 plausible analytics release notes and privacy docs

16 months agoJAL-4090 update from 2.11.2.7 JAL-4117 - version bump and release notes for JAL-4116
James Procter [Wed, 25 Jan 2023 15:33:22 +0000 (15:33 +0000)]
JAL-4090 update from 2.11.2.7 JAL-4117 - version bump and release notes for JAL-4116

16 months agoJAL-4001 analytics url provided by https://www.jalview.org/services/config/analytics/url
James Procter [Thu, 29 Jun 2023 07:13:44 +0000 (08:13 +0100)]
JAL-4001 analytics url provided by https://jalview.org/services/config/analytics/url

16 months agoJAL-4001 change Plausible discovery URL
Ben Soares [Wed, 28 Jun 2023 14:46:20 +0000 (15:46 +0100)]
JAL-4001 change Plausible discovery URL

16 months agoJAL-4001 remove headless code from analytics
Ben Soares [Wed, 28 Jun 2023 13:28:33 +0000 (14:28 +0100)]
JAL-4001 remove headless code from analytics

16 months agoJAL-4001 Remove analytics for --headless mode
Ben Soares [Wed, 28 Jun 2023 13:26:11 +0000 (14:26 +0100)]
JAL-4001 Remove analytics for --headless mode

16 months agoJAL-4001 Added useful props information
Ben Soares [Tue, 27 Jun 2023 12:35:30 +0000 (13:35 +0100)]
JAL-4001 Added useful props information

17 months agoMerge branch 'develop' into task/JAL-4001_Plausible_API
Ben Soares [Thu, 22 Jun 2023 20:53:32 +0000 (21:53 +0100)]
Merge branch 'develop' into task/JAL-4001_Plausible_API

17 months agoJAL-4001 Fix default API url
Ben Soares [Thu, 22 Jun 2023 16:09:26 +0000 (17:09 +0100)]
JAL-4001 Fix default API url

17 months agoJAL-4213 don’t pass active selection when actioning the addReferenceAnnotation patch/JAL-4213_addref_with_selection
James Procter [Thu, 22 Jun 2023 15:39:34 +0000 (17:39 +0200)]
JAL-4213 don’t pass active selection when actioning the addReferenceAnnotation

17 months agoJAL-4213 - document the addReferenceAnnotations method’s behaviour when given a selection
James Procter [Thu, 22 Jun 2023 15:38:07 +0000 (17:38 +0200)]
JAL-4213 - document the addReferenceAnnotations method’s behaviour when given a selection

17 months agoJAL-4001 Added 'installation' property.
Ben Soares [Thu, 22 Jun 2023 15:06:40 +0000 (16:06 +0100)]
JAL-4001 Added 'installation' property.

17 months agoJAL-2292 - ensure mapping is built for equal symbols with mismatched case patch/JAL-2292_caseSensitivePAE
James Procter [Thu, 22 Jun 2023 15:00:31 +0000 (17:00 +0200)]
JAL-2292 - ensure mapping is built for equal symbols with mismatched case

17 months agoJAL-4001 Added lookup to https://www.jalview.org/config/analytics/url to check API...
Ben Soares [Thu, 22 Jun 2023 14:52:52 +0000 (15:52 +0100)]
JAL-4001 Added lookup to https://jalview.org/config/analytics/url to check API base url.  Changed terminology to match Plausible API

17 months agoJAL-4019 corrected to '>' to '>=' for percentage comparisons bug/JAL-4125_flatlaf_quithandler_external_structureviewers_not_closed
Ben Soares [Thu, 22 Jun 2023 13:35:12 +0000 (14:35 +0100)]
JAL-4019 corrected to '>' to '>=' for percentage comparisons

17 months agoMerge branch 'patch/JAL-4196_structure_viewer_synchronising' into develop patch/JAL-4196_structure_viewer_synchronising
James Procter [Wed, 21 Jun 2023 11:24:27 +0000 (13:24 +0200)]
Merge branch 'patch/JAL-4196_structure_viewer_synchronising' into develop

17 months agoJAL-4001 Rationalise user-agent string into HttpUtils
Ben Soares [Wed, 21 Jun 2023 11:01:34 +0000 (12:01 +0100)]
JAL-4001 Rationalise user-agent string into HttpUtils

17 months agoJAL-4001 Change wording from google to plausible or generic analytics
Ben Soares [Wed, 21 Jun 2023 07:42:33 +0000 (08:42 +0100)]
JAL-4001 Change wording from google to plausible or generic analytics

17 months agoJAL-4001 rename the init method
Ben Soares [Tue, 20 Jun 2023 22:10:36 +0000 (23:10 +0100)]
JAL-4001 rename the init method

17 months agoJAL-4001 Working Plausible analytics
Ben Soares [Tue, 20 Jun 2023 17:53:21 +0000 (18:53 +0100)]
JAL-4001 Working Plausible analytics

17 months agoJAL-4001 Plausible class
Ben Soares [Tue, 20 Jun 2023 15:33:20 +0000 (16:33 +0100)]
JAL-4001 Plausible class

17 months agoJAL-4001 Added a genuine client_id (from gtag). Added /debug/mp/collect with respons... task/JAL-4001_migrate_googleanalytics_to_GA4
Ben Soares [Tue, 20 Jun 2023 09:17:33 +0000 (10:17 +0100)]
JAL-4001 Added a genuine client_id (from gtag).  Added /debug/mp/collect with response content

17 months agoJAL-4001 Check --nousagestats before doing analytics in headless mode
Ben Soares [Sat, 17 Jun 2023 21:19:20 +0000 (22:19 +0100)]
JAL-4001 Check --nousagestats before doing analytics in headless mode

17 months agoJAL-4001 Add a _geo=1 to query string and JSON. Add a headless flag to path and...
Ben Soares [Fri, 16 Jun 2023 14:22:52 +0000 (15:22 +0100)]
JAL-4001 Add a _geo=1 to query string and JSON.  Add a headless flag to path and JSON, and send analytics in headless mode if USAGESTATS=true.

17 months agoJAL-4001 Remove jgoogleanalytics code and jar
Ben Soares [Fri, 16 Jun 2023 14:21:06 +0000 (15:21 +0100)]
JAL-4001 Remove jgoogleanalytics code and jar

17 months agoJAL-4001 make page_location the same encoding as the old jgoogleanalytics
Ben Soares [Fri, 16 Jun 2023 09:09:12 +0000 (10:09 +0100)]
JAL-4001 make page_location the same encoding as the old jgoogleanalytics

17 months agoJAL-4001 Changed for Java 8 compatibility
Ben Soares [Thu, 15 Jun 2023 19:20:15 +0000 (20:20 +0100)]
JAL-4001 Changed for Java 8 compatibility

17 months agoJAL-4001 Trying to see extra information in GA dashboard
Ben Soares [Wed, 14 Jun 2023 22:21:02 +0000 (23:21 +0100)]
JAL-4001 Trying to see extra information in GA dashboard

17 months agoMerge branch 'develop' into task/JAL-4001_migrate_googleanalytics_to_GA4
Ben Soares [Wed, 14 Jun 2023 12:41:36 +0000 (13:41 +0100)]
Merge branch 'develop' into task/JAL-4001_migrate_googleanalytics_to_GA4

17 months agoJAL-3599 Tidyup for all OS to use ScheduledExecutor
Ben Soares [Tue, 13 Jun 2023 11:16:10 +0000 (12:16 +0100)]
JAL-3599 Tidyup for all OS to use ScheduledExecutor

17 months agoJAL-3599 replaced a build dependency for jalviewjsLaunchTest
Ben Soares [Mon, 12 Jun 2023 08:14:10 +0000 (09:14 +0100)]
JAL-3599 replaced a build dependency for jalviewjsLaunchTest

17 months agoJAL-3599 Cater for macOS. ScheduledExecutor timeout implemented
Ben Soares [Sun, 11 Jun 2023 18:11:35 +0000 (19:11 +0100)]
JAL-3599 Cater for macOS. ScheduledExecutor timeout implemented

17 months agoJAL-3599 Cater for macOS. --timeout not working yet
Ben Soares [Sun, 11 Jun 2023 14:38:17 +0000 (15:38 +0100)]
JAL-3599 Cater for macOS. --timeout not working yet

17 months agoJAL-3599 Make jalviewjs dependOn jalviewjsLaunchTest. Change jalviewjsLaunchTest...
Ben Soares [Fri, 9 Jun 2023 16:32:34 +0000 (17:32 +0100)]
JAL-3599 Make jalviewjs dependOn jalviewjsLaunchTest. Change jalviewjsLaunchTest to only stop the task (not trigger a failure) if chrome not found. Remove deliberate NPE.

17 months agoJAL-3599 Deliberate NPE to see if build plan fails
Ben Soares [Fri, 9 Jun 2023 15:48:32 +0000 (16:48 +0100)]
JAL-3599 Deliberate NPE to see if build plan fails

17 months agoJAL-3599 fixed placement of 'First Run' file for chromium profile
Ben Soares [Fri, 9 Jun 2023 14:12:51 +0000 (15:12 +0100)]
JAL-3599 fixed placement of 'First Run' file for chromium profile

17 months agoJAL-3599 --no-sandbox --disable-gpu and Thorium flatpak on build server
Ben Soares [Fri, 9 Jun 2023 11:21:46 +0000 (12:21 +0100)]
JAL-3599 --no-sandbox --disable-gpu and Thorium flatpak on build server

17 months agoJAL-3599 STDOUT and STDERR saved and sent to System.out/err
Ben Soares [Fri, 9 Jun 2023 10:15:17 +0000 (11:15 +0100)]
JAL-3599 STDOUT and STDERR saved and sent to System.out/err

17 months agoJAL-3599 Not redirecting STDOUT or STDERR just for build server debuggin
Ben Soares [Fri, 9 Jun 2023 10:02:34 +0000 (11:02 +0100)]
JAL-3599 Not redirecting STDOUT or STDERR just for build server debuggin

17 months agoJAL-3599 More stderr/stdout output to logs when anything
Ben Soares [Fri, 9 Jun 2023 09:48:43 +0000 (10:48 +0100)]
JAL-3599 More stderr/stdout output to logs when anything

17 months agoJAL-3599 More stderr/stdout output to logs when failed
Ben Soares [Fri, 9 Jun 2023 09:38:54 +0000 (10:38 +0100)]
JAL-3599 More stderr/stdout output to logs when failed

17 months agoJAL-3599 increase real and virtual time chrome runs for to 60s (in real-time this...
Ben Soares [Fri, 9 Jun 2023 08:14:02 +0000 (09:14 +0100)]
JAL-3599 increase real and virtual time chrome runs for to 60s (in real-time this is still about 3s)

17 months agoJAL-3599 gradle tasks to test JalviewJS launches in a chrome or chromium browser
Ben Soares [Thu, 8 Jun 2023 19:58:49 +0000 (20:58 +0100)]
JAL-3599 gradle tasks to test JalviewJS launches in a chrome or chromium browser

17 months agoJAL-4001 Only send defaultParams for application_launch event
Ben Soares [Thu, 8 Jun 2023 16:37:13 +0000 (17:37 +0100)]
JAL-4001 Only send defaultParams for application_launch event

17 months agoMerge branch 'develop' into task/JAL-4001_migrate_googleanalytics_to_GA4
Ben Soares [Thu, 8 Jun 2023 16:21:28 +0000 (17:21 +0100)]
Merge branch 'develop' into task/JAL-4001_migrate_googleanalytics_to_GA4

17 months agoMerge branch 'develop' into patch/JAL-4196_structure_viewer_synchronising
James Procter [Thu, 8 Jun 2023 14:17:37 +0000 (15:17 +0100)]
Merge branch 'develop' into patch/JAL-4196_structure_viewer_synchronising

17 months agoJAL-4196 make very sure we avoid CME by defensively copying the Map.values() to anoth...
James Procter [Thu, 8 Jun 2023 10:54:51 +0000 (11:54 +0100)]
JAL-4196 make very sure we avoid CME by defensively copying the Map.values() to another list and synchronising on it

17 months agoJAL-4196 report an error if structure view doesn’t get created (for whatever reason...
James Procter [Thu, 8 Jun 2023 10:33:35 +0000 (11:33 +0100)]
JAL-4196 report an error if structure view doesn’t get created (for whatever reason) during CLI arg processing, and wait around until the viewer has finished importing before doing anything

17 months agoJAL-4196 structure view cli tests wait using new jalview.Desktop.instance.operationsA...
James Procter [Thu, 8 Jun 2023 10:30:55 +0000 (11:30 +0100)]
JAL-4196 structure view cli tests wait using new jalview.Desktop.instance.operationsAreInProgress() returns true if any desktop windows have a progress indicator still active

17 months agoJAL-3416 FlatLaf SystemInfo failing in JalviewJS. Look and Feel not relevant to...
Ben Soares [Thu, 8 Jun 2023 10:12:17 +0000 (11:12 +0100)]
JAL-3416 FlatLaf SystemInfo failing in JalviewJS.  Look and Feel not relevant to JalviewJS so setLookAndFeel commented out for j2s with @j2sIgnore

17 months agoMerge branch 'develop' into task/JAL-4001_migrate_googleanalytics_to_GA4
Ben Soares [Thu, 8 Jun 2023 07:16:06 +0000 (08:16 +0100)]
Merge branch 'develop' into task/JAL-4001_migrate_googleanalytics_to_GA4

17 months agoMerge branch 'patch/JAL-4195_cli_eps_export_npe' into develop
James Procter [Thu, 8 Jun 2023 07:09:46 +0000 (08:09 +0100)]
Merge branch 'patch/JAL-4195_cli_eps_export_npe' into develop

17 months agoJAL-4001 Javadoc for the method to use
Ben Soares [Wed, 7 Jun 2023 21:30:30 +0000 (22:30 +0100)]
JAL-4001 Javadoc for the method to use

17 months agoJAL-4195 add exception handling for all image output ops - still need to refactor...
James Procter [Wed, 7 Jun 2023 19:59:59 +0000 (20:59 +0100)]
JAL-4195 add exception handling for all image output ops - still need to refactor messaging to the UI

17 months agoMerge branch 'patch/JAL-4195_cli_eps_export_npe' into develop
James Procter [Wed, 7 Jun 2023 16:16:01 +0000 (17:16 +0100)]
Merge branch 'patch/JAL-4195_cli_eps_export_npe' into develop

17 months agoJAL-4195 catch thrown exceptions (if any) during image export and report as an error.
James Procter [Wed, 7 Jun 2023 16:13:55 +0000 (17:13 +0100)]
JAL-4195 catch thrown exceptions (if any) during image export and report as an error.

17 months agoMerge branch 'develop' into task/JAL-4001_migrate_googleanalytics_to_GA4
Ben Soares [Wed, 7 Jun 2023 15:52:00 +0000 (16:52 +0100)]
Merge branch 'develop' into task/JAL-4001_migrate_googleanalytics_to_GA4

17 months agoMerge branch 'develop' into improvement/JAL-4193_cl_arg_prevent_startup_file improvement/JAL-4193_cl_arg_prevent_startup_file
Ben Soares [Wed, 7 Jun 2023 15:41:37 +0000 (16:41 +0100)]
Merge branch 'develop' into improvement/JAL-4193_cl_arg_prevent_startup_file

17 months agoJAL-4001 Added more params for application_launch
Ben Soares [Wed, 7 Jun 2023 14:37:22 +0000 (15:37 +0100)]
JAL-4001 Added more params for application_launch

17 months agoJAL-4001 removed a test param
Ben Soares [Wed, 7 Jun 2023 13:41:16 +0000 (14:41 +0100)]
JAL-4001 removed a test param

17 months agoMerge branch 'develop' into task/JAL-4001_migrate_googleanalytics_to_GA4
Ben Soares [Wed, 7 Jun 2023 13:40:14 +0000 (14:40 +0100)]
Merge branch 'develop' into task/JAL-4001_migrate_googleanalytics_to_GA4

17 months agoMerge branch 'develop' into task/JAL-4001_migrate_googleanalytics_to_GA4
Ben Soares [Wed, 7 Jun 2023 13:39:56 +0000 (14:39 +0100)]
Merge branch 'develop' into task/JAL-4001_migrate_googleanalytics_to_GA4

17 months agoJAL-4001 GA4 tracking is now ENABLED. Currently logging a page_view like the website...
Ben Soares [Wed, 7 Jun 2023 13:39:49 +0000 (14:39 +0100)]
JAL-4001 GA4 tracking is now ENABLED.  Currently logging a page_view like the website with a schemeless, domainless path the same as the UA tracking, as well as a custom application_launch event with the path_location, separate app_name and version parameters

17 months agoJAL-4195 tidy up desktop instances after creating them
James Procter [Wed, 7 Jun 2023 13:02:11 +0000 (14:02 +0100)]
JAL-4195 tidy up desktop instances after creating them

17 months agoJAL-4195 report full stack trace for exceptions raised when exporting an image
James Procter [Tue, 6 Jun 2023 17:42:42 +0000 (18:42 +0100)]
JAL-4195 report full stack trace for exceptions raised when exporting an image

17 months agoJAL-4160 --colour can now take user defined scheme names and colour scheme-spec defin...
James Procter [Tue, 6 Jun 2023 17:38:02 +0000 (18:38 +0100)]
JAL-4160 --colour can now take user defined scheme names and colour scheme-spec definition lines as its value

17 months agoJAL-4160 JAL-4195 wait around until alignFrame calculators are finished before trying...
James Procter [Tue, 6 Jun 2023 16:59:35 +0000 (17:59 +0100)]
JAL-4160 JAL-4195 wait around until alignFrame calculators are finished before trying to output an image

17 months agoJAL-1551 formatting and javadoc for ArgParser rather than // comments
James Procter [Tue, 6 Jun 2023 16:58:18 +0000 (17:58 +0100)]
JAL-1551 formatting and javadoc for ArgParser rather than // comments

17 months agoJAL-629 - remove TODO from jalview.bin.Jalview since it is now done via jalview.bin...
James Procter [Tue, 6 Jun 2023 16:49:18 +0000 (17:49 +0100)]
JAL-629 - remove TODO from jalview.bin.Jalview since it is now done via jalview.bin.Commands

17 months agoJAL-4195 Debug message indicating creation of an image file should come before we...
James Procter [Tue, 6 Jun 2023 15:31:03 +0000 (16:31 +0100)]
JAL-4195 Debug message indicating creation of an image file should come before we make the call to create the file !

17 months agoJAL-1551 a bit of javadoc for Jalview.testoutput methods
James Procter [Tue, 6 Jun 2023 15:30:04 +0000 (16:30 +0100)]
JAL-1551 a bit of javadoc for Jalview.testoutput methods

17 months agoJAL-4001 debugging statements
Ben Soares [Mon, 5 Jun 2023 19:26:42 +0000 (20:26 +0100)]
JAL-4001 debugging statements

17 months agoJAL-4001 untested GA4 client code
Ben Soares [Mon, 5 Jun 2023 17:34:58 +0000 (18:34 +0100)]
JAL-4001 untested GA4 client code

17 months agoJAL-4001 most of google analytics client
Ben Soares [Mon, 5 Jun 2023 14:17:45 +0000 (15:17 +0100)]
JAL-4001 most of google analytics client

17 months agoJAL-4001 start of GA4 client class
Ben Soares [Mon, 5 Jun 2023 10:30:39 +0000 (11:30 +0100)]
JAL-4001 start of GA4 client class

17 months agoJAL-4090 update 2.11.3.0 release notes for recent merges
James Procter [Fri, 2 Jun 2023 11:13:36 +0000 (12:13 +0100)]
JAL-4090 update 2.11.3.0 release notes for recent merges

17 months agoJAL-3521 Updated debian build.gradle in utils/debian/debian_build.gradle and patch...
Ben Soares [Fri, 2 Jun 2023 10:10:03 +0000 (11:10 +0100)]
JAL-3521 Updated debian build.gradle in utils/debian/debian_build.gradle and patch file

17 months agoJAL-4001 Spanish translation
Ben Soares [Fri, 2 Jun 2023 08:57:01 +0000 (09:57 +0100)]
JAL-4001 Spanish translation

17 months agoMerge branch 'develop' into task/JAL-4001_migrate_googleanalytics_to_GA4
Ben Soares [Fri, 2 Jun 2023 08:05:38 +0000 (09:05 +0100)]
Merge branch 'develop' into task/JAL-4001_migrate_googleanalytics_to_GA4

17 months agoMerge branch 'develop' into improvement/JAL-4193_cl_arg_prevent_startup_file
Ben Soares [Thu, 1 Jun 2023 17:16:56 +0000 (18:16 +0100)]
Merge branch 'develop' into improvement/JAL-4193_cl_arg_prevent_startup_file

17 months agoJAL-629 changes merged in from develop fixed it. Deleted duplicate example PAE file.
Ben Soares [Thu, 1 Jun 2023 16:10:08 +0000 (17:10 +0100)]
JAL-629 changes merged in from develop fixed it.  Deleted duplicate example PAE file.

17 months agoMerge branch 'develop' into features/r2_11_2_alphafold/JAL-629
Ben Soares [Thu, 1 Jun 2023 16:01:58 +0000 (17:01 +0100)]
Merge branch 'develop' into features/r2_11_2_alphafold/JAL-629