jalview.git
5 years agoMerge branch 'tasks/JAL-3035_remove_dasobert_dependency' into Jalview-BH/JAL-3026
Jim Procter [Tue, 26 Jun 2018 15:38:14 +0000 (16:38 +0100)]
Merge branch 'tasks/JAL-3035_remove_dasobert_dependency' into Jalview-BH/JAL-3026

5 years agoJAL-3035 - jalview-das is no more !
Jim Procter [Tue, 26 Jun 2018 15:16:15 +0000 (16:16 +0100)]
JAL-3035 - jalview-das is no more !
 - jsdas lib removed
 - DAS settings panel deleted (Feature settings pane has no tabs now)
 - all code for wrapping DAS sources and retrieving sequences and features from them is gone
 - test methods/main methods have been de-dasified or removed if their only purpose was to test DAS source discovery
 - fancy sorting code to account for DAS sequence source names has been removed

5 years agoJAL-3035 (unrelated) random XML error in nbbuild.xml
Jim Procter [Tue, 26 Jun 2018 15:09:45 +0000 (16:09 +0100)]
JAL-3035 (unrelated) random XML error in nbbuild.xml

5 years agoJAL-3032 updateOverviewImage on construction
gmungoc [Tue, 26 Jun 2018 15:08:50 +0000 (16:08 +0100)]
JAL-3032 updateOverviewImage on construction

5 years agoMerge branch 'Jalview-BH/JAL-3026' into task/JAL-3033_jalviewjs_ant
Jim Procter [Tue, 26 Jun 2018 09:29:09 +0000 (10:29 +0100)]
Merge branch 'Jalview-BH/JAL-3026' into task/JAL-3033_jalviewjs_ant

5 years agoMerge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git...
hansonr [Tue, 26 Jun 2018 09:13:07 +0000 (10:13 +0100)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026

5 years agoJAL-3033 force overwrite for .classpath from .classpath.js
Jim Procter [Tue, 26 Jun 2018 09:13:03 +0000 (10:13 +0100)]
JAL-3033 force overwrite for .classpath from .classpath.js

5 years agosynchronize fixed
hansonr [Tue, 26 Jun 2018 09:11:25 +0000 (10:11 +0100)]
synchronize fixed

5 years agoMerge branch 'Jalview-BH/JAL-3026' into task/JAL-3033_jalviewjs_ant
Jim Procter [Tue, 26 Jun 2018 08:59:28 +0000 (09:59 +0100)]
Merge branch 'Jalview-BH/JAL-3026' into task/JAL-3033_jalviewjs_ant

5 years agoJAL-3033 fail if the transpiler isn’t updated from swingjs/…
Jim Procter [Tue, 26 Jun 2018 08:57:14 +0000 (09:57 +0100)]
JAL-3033 fail if the transpiler isn’t updated from swingjs/…

5 years agoJAL-3033 local build server path for eclipse
Jim Procter [Tue, 26 Jun 2018 08:56:51 +0000 (09:56 +0100)]
JAL-3033 local build server path for eclipse

5 years agoMerge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git...
gmungoc [Tue, 26 Jun 2018 07:50:54 +0000 (08:50 +0100)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026

5 years agoJAL-3032 don't place desktop at negative x or y position
gmungoc [Tue, 26 Jun 2018 07:49:32 +0000 (08:49 +0100)]
JAL-3032 don't place desktop at negative x or y position

5 years agoJAL-3033 more copy/git debugging of task
Jim Procter [Mon, 25 Jun 2018 16:03:49 +0000 (17:03 +0100)]
JAL-3033 more copy/git debugging of task

5 years agoJAL-3033 copy the right .classpath.js !
Jim Procter [Mon, 25 Jun 2018 15:53:54 +0000 (16:53 +0100)]
JAL-3033 copy the right .classpath.js !

5 years agoMerge branch 'Jalview-BH/JAL-3026' into task/JAL-3033_jalviewjs_ant
Jim Procter [Mon, 25 Jun 2018 15:50:05 +0000 (16:50 +0100)]
Merge branch 'Jalview-BH/JAL-3026' into task/JAL-3033_jalviewjs_ant

5 years agoJAL-3033 update the eclipse project before building, edit class path, and copy artefa...
Jim Procter [Mon, 25 Jun 2018 15:48:00 +0000 (16:48 +0100)]
JAL-3033 update the eclipse project before building, edit class path, and copy artefacts from eclipse project back to build directory

5 years agoJAL-3033 custom .classpath for eclipse build
Jim Procter [Mon, 25 Jun 2018 15:40:45 +0000 (16:40 +0100)]
JAL-3033 custom .classpath for eclipse build

5 years agomenu enable/disable for radio and checkbox items
hansonr [Mon, 25 Jun 2018 14:27:41 +0000 (15:27 +0100)]
menu enable/disable for radio and checkbox items

5 years agoString.concat$S missing
hansonr [Mon, 25 Jun 2018 14:08:10 +0000 (15:08 +0100)]
String.concat$S missing

5 years agofix for fix for Character.toTitleCase
hansonr [Mon, 25 Jun 2018 13:55:15 +0000 (14:55 +0100)]
fix for fix for Character.toTitleCase

5 years agoCollections difference Apache vs Oracle
hansonr [Mon, 25 Jun 2018 13:44:02 +0000 (14:44 +0100)]
Collections difference Apache vs Oracle

<E> vs <T> for SingletonList

5 years agoCollections difference Apache vs Oracle
hansonr [Mon, 25 Jun 2018 13:37:13 +0000 (14:37 +0100)]
Collections difference Apache vs Oracle

<E> vs <T> for SingletonList

5 years agoJAL-3033 try to configure eclipse workspace via property
Jim Procter [Mon, 25 Jun 2018 12:23:20 +0000 (13:23 +0100)]
JAL-3033 try to configure eclipse workspace via property

5 years agoJAL-3033 working ant target for headless build of jalviewjs
Jim Procter [Mon, 25 Jun 2018 12:03:12 +0000 (13:03 +0100)]
JAL-3033 working ant target for headless build of jalviewjs

5 years agoadds MouseEvent.preciseWheelRotation
hansonr [Mon, 25 Jun 2018 11:48:56 +0000 (12:48 +0100)]
adds MouseEvent.preciseWheelRotation

5 years agoJAL-3033 comment about testing if eclipse build completed
Jim Procter [Mon, 25 Jun 2018 11:47:50 +0000 (12:47 +0100)]
JAL-3033 comment about testing if eclipse build completed

5 years agoJAL-3033 configure dropins, run eclipse build and copy in resources in a single task
Jim Procter [Mon, 25 Jun 2018 11:46:14 +0000 (12:46 +0100)]
JAL-3033 configure dropins, run eclipse build and copy in resources in a single task

5 years agosynchronized() fix; to/isTitleCase() as ...UpperCase()
hansonr [Mon, 25 Jun 2018 11:20:58 +0000 (12:20 +0100)]
synchronized() fix; to/isTitleCase() as ...UpperCase()

5 years agoMerge branch 'Jalview-BH/JAL-3026' into tasks/JAL-3033_jalviewjs_ant
Jim Procter [Mon, 25 Jun 2018 10:48:11 +0000 (11:48 +0100)]
Merge branch 'Jalview-BH/JAL-3026' into tasks/JAL-3033_jalviewjs_ant

5 years agonew SwingJS-site.zip and net.sf.j2s.core.jar
hansonr [Mon, 25 Jun 2018 10:07:38 +0000 (11:07 +0100)]
new SwingJS-site.zip and net.sf.j2s.core.jar

fixes synchronized()
fixes new int[] {'a'}

5 years ago// BH 6/24/2018 -- synchronized
hansonr [Mon, 25 Jun 2018 05:47:42 +0000 (06:47 +0100)]
// BH 6/24/2018 -- synchronized

synchronized(a = new Object()) {...} ---> ...; only if an assignment or
not a simple function call to Object.getTreeLock()

5 years agoJMenu/JMenuItem enable/disable
hansonr [Sun, 24 Jun 2018 22:56:52 +0000 (23:56 +0100)]
JMenu/JMenuItem enable/disable

uses

$(node).[add/remove]Class("ui-menu-disabled ui-state-disabled");

5 years agoDialog motif:
hansonr [Sun, 24 Jun 2018 18:13:41 +0000 (19:13 +0100)]
Dialog motif:

    // BH 2018 -- providing a callback for SwingJS
    // dialogOption is just a simple way to provide
    // context for the modal-like response.
    // The only requirement is that desktop implement
    // PropertyChangeListener, which is used already in Java
    // for changes in input value and such within the dialogs.

    String dialogOption = "label.input_alignment_from_url";
    desktop.dialogData = new Object[] { dialogOption, viewport, history
};
    desktop.onDialogReturn(
            JvOptionPane.showInternalConfirmDialog(desktop, panel,
            MessageManager.getString(dialogOption),
            JvOptionPane.OK_CANCEL_OPTION));

    // no code may follow this, as SwingJS will not block
    // callback in JavaScript comes via a property change event,
    // thus going into desktop.onDialogReturn(int) just the same as
    // in Java.

5 years agoasynchronous modal dialogs using PropertyChangeListener for JavaScript
hansonr [Sun, 24 Jun 2018 10:28:43 +0000 (11:28 +0100)]
asynchronous modal dialogs using PropertyChangeListener for JavaScript

5 years agoJFrame fix for Window->JComponent
hansonr [Sun, 24 Jun 2018 08:58:19 +0000 (09:58 +0100)]
JFrame fix for Window->JComponent

5 years agoJAL-3032
hansonr [Sun, 24 Jun 2018 07:13:44 +0000 (08:13 +0100)]
JAL-3032

Update complete for

- menubar background
- direct running of Jalview.main(args)
- InternalFrame production

5 years agoAlignmentFrame opacity set to TRUE for JavaScript.
hansonr [Sun, 24 Jun 2018 07:11:53 +0000 (08:11 +0100)]
AlignmentFrame opacity set to TRUE for JavaScript.

This seems to be some sort of JavaScript fluke, because if you set the
background color of an internal div to opaque but then set the
background color of that div's parent to transparent, then it goes
transparent.

5 years agodefault MenuBar menu background color
hansonr [Sun, 24 Jun 2018 07:09:48 +0000 (08:09 +0100)]
default MenuBar menu background color

set to lighter grey to match Frame color (#EEEEEE) in
HTMLLookAndFeel.java

5 years agotypo in swingjs/plaf/HTML5LookAndFeel.java
hansonr [Sun, 24 Jun 2018 05:47:41 +0000 (06:47 +0100)]
typo in swingjs/plaf/HTML5LookAndFeel.java

5 years agotypo in synchronized() fix
hansonr [Sun, 24 Jun 2018 05:05:08 +0000 (06:05 +0100)]
typo in synchronized() fix

5 years agoorg.json.simple
hansonr [Sat, 23 Jun 2018 23:00:33 +0000 (00:00 +0100)]
org.json.simple

5 years agoJAL-3032 BrowserLauncher simplified for JS
hansonr [Sat, 23 Jun 2018 23:00:07 +0000 (00:00 +0100)]
JAL-3032 BrowserLauncher simplified for JS

window.open(url)

5 years agomoving SwingJS-site.zip to /swingjs/
hansonr [Sat, 23 Jun 2018 22:59:19 +0000 (23:59 +0100)]
moving SwingJS-site.zip to /swingjs/

5 years agoRELATIVE_URL
hansonr [Sat, 23 Jun 2018 17:01:20 +0000 (18:01 +0100)]
RELATIVE_URL

5 years agoMerge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git...
hansonr [Sat, 23 Jun 2018 16:59:46 +0000 (17:59 +0100)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026

5 years agoJAL-3026 JDesktop/JInternalFrames support + relative URL file loading
hansonr [Sat, 23 Jun 2018 16:57:20 +0000 (17:57 +0100)]
JAL-3026 JDesktop/JInternalFrames support + relative URL file loading

- preliminary
- no minimization to JDesktopIcon
- no maximization
- z-order not checked

See JalviewJS2.java

new SwingJS-site.zip

AlignFrame.java:

JS bypass for addServiceListeners()

AppletFormatAdapter.java:
DataSourceType.java:
FileParse.java:

adds DataSourceType.RELATIVE_URL

for indicating files relative to the HTML page.

Desktop.java:

JS bypass for Console, Dialog Thread, News, Vamsas, and URL links

Jalview.java

JS bypass forparsing h, help, nodisplay, nogui, jabaws, startup example.

5 years agoJAL-3032 avoid assignments on the same line as synchronized
gmungoc [Fri, 22 Jun 2018 15:06:37 +0000 (16:06 +0100)]
JAL-3032 avoid assignments on the same line as synchronized

5 years agoMerge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git...
gmungoc [Fri, 22 Jun 2018 13:49:22 +0000 (14:49 +0100)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026

5 years agoJAL-3030 size split frame taller
gmungoc [Fri, 22 Jun 2018 13:49:17 +0000 (14:49 +0100)]
JAL-3030 size split frame taller

5 years agoMerge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git...
hansonr [Fri, 22 Jun 2018 13:45:53 +0000 (14:45 +0100)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026

5 years agofix for no access-control-origin on jalview site
hansonr [Fri, 22 Jun 2018 13:45:10 +0000 (14:45 +0100)]
fix for no access-control-origin on jalview site

5 years agoJAL-3033 formatting
Jim Procter [Fri, 22 Jun 2018 13:34:00 +0000 (14:34 +0100)]
JAL-3033 formatting

5 years agoJAL-3033 WIP ant tasks for jalviewjs
Jim Procter [Fri, 22 Jun 2018 13:33:50 +0000 (14:33 +0100)]
JAL-3033 WIP ant tasks for jalviewjs

5 years agoJAL-3032 more informative failure message
gmungoc [Fri, 22 Jun 2018 10:04:04 +0000 (11:04 +0100)]
JAL-3032 more informative failure message

5 years agoJInternalFrame implemented as such; no need for JSInternalFrame
hansonr [Fri, 22 Jun 2018 09:00:54 +0000 (10:00 +0100)]
JInternalFrame implemented as such; no need for JSInternalFrame

5 years agoJAL-3032 adds JSInternalFrame
hansonr [Fri, 22 Jun 2018 07:26:06 +0000 (08:26 +0100)]
JAL-3032 adds JSInternalFrame

JSInternalFrame extends JFrame.

Motif involves coercing a JInternalFrame in Java to a JSInternalFrame in
JavaScript:

<code>
JInternalFrame f;

/**
 * @j2sNative
 *
 * f = Clazz.new_('javax.swing.JSInternalFrame');
 *
 */
{
 f = new JInternalFrame();
}
</code>

5 years agoMerge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git...
hansonr [Thu, 21 Jun 2018 22:30:09 +0000 (23:30 +0100)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026

5 years agoJAL-3032 transpiler and runtime fixes
hansonr [Thu, 21 Jun 2018 22:29:40 +0000 (23:29 +0100)]
JAL-3032 transpiler and runtime fixes

for(final int xxx....)
regex Matcher charSequence.subSequence$I$I

5 years agoJAL-3030 allow uncaught exceptions (for easier JS debuggin)
gmungoc [Thu, 21 Jun 2018 15:52:49 +0000 (16:52 +0100)]
JAL-3030 allow uncaught exceptions (for easier JS debuggin)

5 years agoJAL-3030 try to open a split frame if file and file2 are supplied
gmungoc [Thu, 21 Jun 2018 11:37:33 +0000 (12:37 +0100)]
JAL-3030 try to open a split frame if file and file2 are supplied

5 years agoMerge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git...
hansonr [Thu, 21 Jun 2018 11:35:03 +0000 (12:35 +0100)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026

5 years agoToolTip fixed.
hansonr [Thu, 21 Jun 2018 11:34:37 +0000 (12:34 +0100)]
ToolTip fixed.

new SwingJS-site.zip
new Transpiler "for var var"

5 years agoJAL-3032 round Quality score for tooltip (as it becomes double in JalviewJS!)
gmungoc [Thu, 21 Jun 2018 09:22:24 +0000 (10:22 +0100)]
JAL-3032 round Quality score for tooltip (as it becomes double in JalviewJS!)

5 years agoJAL-3032 new SwingJS-site.zip
hansonr [Thu, 21 Jun 2018 08:15:27 +0000 (09:15 +0100)]
JAL-3032 new SwingJS-site.zip

JToolTip (still issues with HTML)

5 years agocore_jalview creation
hansonr [Thu, 21 Jun 2018 00:24:25 +0000 (01:24 +0100)]
core_jalview creation

5 years agoJAL-3032 for (var var
hansonr [Wed, 20 Jun 2018 23:38:30 +0000 (00:38 +0100)]
JAL-3032 for (var var

5 years agotemporary JSProgressBarUI
hansonr [Wed, 20 Jun 2018 22:49:10 +0000 (23:49 +0100)]
temporary JSProgressBarUI

5 years agofixes menubar closer issue
hansonr [Wed, 20 Jun 2018 22:31:01 +0000 (23:31 +0100)]
fixes menubar closer issue

5 years agoJS fix for JTooltip popup cache class error - new SwingJS-site.zip
hansonr [Wed, 20 Jun 2018 22:13:42 +0000 (23:13 +0100)]
JS fix for JTooltip popup cache class error - new SwingJS-site.zip

5 years agoSeqCanvas and OverviewCanvas
hansonr [Wed, 20 Jun 2018 17:51:07 +0000 (18:51 +0100)]
SeqCanvas and OverviewCanvas

It's important for us that these extend JPanel, not JComponent. This is
because we have slipped in a new subclass, JSComponent, that extends
JComponent and is a superclass of all Swing components in SwingJS.

5 years agoMerge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git...
hansonr [Wed, 20 Jun 2018 16:08:05 +0000 (17:08 +0100)]
Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026

5 years agofixes broken MissingResourceException
hansonr [Wed, 20 Jun 2018 16:07:29 +0000 (17:07 +0100)]
fixes broken MissingResourceException

new SinwgJS-site.zip

5 years agoJAL-3032 simplified _LoadFileWaitTillLoaded with no thread
gmungoc [Wed, 20 Jun 2018 15:47:19 +0000 (16:47 +0100)]
JAL-3032 simplified _LoadFileWaitTillLoaded with no thread

5 years agonew SwingJS-site.zip
hansonr [Wed, 20 Jun 2018 13:01:30 +0000 (14:01 +0100)]
new SwingJS-site.zip

5 years agoJAL-3032 FileLoader fixes for SwingJS
hansonr [Wed, 20 Jun 2018 12:01:23 +0000 (13:01 +0100)]
JAL-3032 FileLoader fixes for SwingJS

SwingJS-site.zip for java.util.concurrent.locks.*

swingjs/j2s/java/awt/KeyboardFocusManager.js
was not found. (in JInternalFrame)

5 years agoadd java.util.concurrent.locks
hansonr [Wed, 20 Jun 2018 11:57:30 +0000 (12:57 +0100)]
add java.util.concurrent.locks

5 years agoupdate of javajs package; adds org.apache.harmony, org.xml.sax.helpers
hansonr [Wed, 20 Jun 2018 10:40:46 +0000 (11:40 +0100)]
update of javajs package; adds org.apache.harmony, org.xml.sax.helpers

File format identified as Fasta

5 years agoBob first commit JAL-3032
hansonr [Wed, 20 Jun 2018 09:59:05 +0000 (10:59 +0100)]
Bob first commit JAL-3032

- jalview/bin/cache.java
 propsAreReadable true for JS
 authordetails, builddetails "xxx" for JS for now
- org.apache.log4j -> jalview.javascript.log4j (minimal)
- jalview/util/MessageManager switch to org.apache.log4j

JavaScript Status:

jalview.io.FileFormatException: Failed to read data from source: CANNOT
ACCESS DATA AT URL 'http://www.jalview.org/examples/uniref50.fa'
((intermediate value).toBIS$O is not a function

5 years agoMessageManager logger to log4j
hansonr [Wed, 20 Jun 2018 09:38:38 +0000 (10:38 +0100)]
MessageManager logger to log4j

5 years agoJAL-3032 load properties as "java.properties"
gmungoc [Wed, 20 Jun 2018 09:31:40 +0000 (10:31 +0100)]
JAL-3032 load properties as "java.properties"

5 years agoJAL-3030 suppress change that goes with JAL-3031
gmungoc [Wed, 20 Jun 2018 08:59:30 +0000 (09:59 +0100)]
JAL-3030 suppress change that goes with JAL-3031

5 years agoJAL-3030 reads features file, properties file
gmungoc [Wed, 20 Jun 2018 08:26:51 +0000 (09:26 +0100)]
JAL-3030 reads features file, properties file

5 years agoJAL-3030 added menu bar
gmungoc [Tue, 19 Jun 2018 11:16:22 +0000 (12:16 +0100)]
JAL-3030 added menu bar

5 years agoJAL-3030 first cut of JalviewJS.main entry point accepting 'file' parameter
gmungoc [Tue, 19 Jun 2018 11:02:52 +0000 (12:02 +0100)]
JAL-3030 first cut of JalviewJS.main entry point accepting 'file' parameter

5 years agoJAL-3026 adding javajs package
hansonr [Mon, 18 Jun 2018 14:18:02 +0000 (16:18 +0200)]
JAL-3026 adding javajs package

adding a general utility package for Java or JavaScript.

5 years agoJAL-3026 - adding README-BH
hansonr [Mon, 18 Jun 2018 11:36:44 +0000 (13:36 +0200)]
JAL-3026 - adding README-BH

first commit

5 years agoJAL-2755 correct Javadoc and error handling
gmungoc [Thu, 7 Jun 2018 14:40:11 +0000 (15:40 +0100)]
JAL-2755 correct Javadoc and error handling

5 years agoJAL-3013 ensure Chimera as a symlink gets resolved
gmungoc [Wed, 6 Jun 2018 14:16:50 +0000 (15:16 +0100)]
JAL-3013 ensure Chimera as a symlink gets resolved

5 years agoJAL-2808 update test for revised treatment of 'mixed type' attribute values
gmungoc [Mon, 4 Jun 2018 19:42:53 +0000 (20:42 +0100)]
JAL-2808 update test for revised treatment of 'mixed type' attribute values

5 years agoJAL-3019 correctly form toRange of 'traversed' MapList
gmungoc [Mon, 4 Jun 2018 19:40:07 +0000 (20:40 +0100)]
JAL-3019 correctly form toRange of 'traversed' MapList

5 years agoJAL-3018 updated REST versions to 6.3
gmungoc [Mon, 4 Jun 2018 14:06:21 +0000 (15:06 +0100)]
JAL-3018 updated REST versions to 6.3

5 years agoJAL-2808 don't capture or report min-max for mixed text/numeric attribute
gmungoc [Thu, 31 May 2018 13:20:50 +0000 (14:20 +0100)]
JAL-2808 don't capture or report min-max for mixed text/numeric attribute

5 years agoJAL-2808 pre-fill numeric inequality filter with min/max range value
gmungoc [Thu, 31 May 2018 10:43:40 +0000 (11:43 +0100)]
JAL-2808 pre-fill numeric inequality filter with min/max range value

5 years agoMerge branch 'bug/JAL-797' into develop
gmungoc [Mon, 28 May 2018 08:23:26 +0000 (09:23 +0100)]
Merge branch 'bug/JAL-797' into develop

5 years agoMerge remote-tracking branch 'origin/releases/Release_2_10_4_Branch' into develop
gmungoc [Mon, 28 May 2018 08:19:40 +0000 (09:19 +0100)]
Merge remote-tracking branch 'origin/releases/Release_2_10_4_Branch' into develop

Conflicts:
src/jalview/io/FeaturesFile.java

5 years agoJAL-2999 release date for 2.10.4b1 set for 27th May 2018
Jim Procter [Sat, 26 May 2018 12:36:41 +0000 (13:36 +0100)]
JAL-2999 release date for 2.10.4b1 set for 27th May 2018

5 years agoMerge branch 'documentation/JAL-2999_r2104b1' into releases/Release_2_10_4_Branch
Jim Procter [Fri, 25 May 2018 12:58:10 +0000 (13:58 +0100)]
Merge branch 'documentation/JAL-2999_r2104b1' into releases/Release_2_10_4_Branch

5 years agoMerge branch 'bug/JAL-2992panelHeight' into releases/Release_2_10_4_Branch
Jim Procter [Fri, 25 May 2018 12:58:01 +0000 (13:58 +0100)]
Merge branch 'bug/JAL-2992panelHeight' into releases/Release_2_10_4_Branch

5 years agoMerge branch 'bug/JAL-1460_dragndropWindows' into releases/Release_2_10_4_Branch
Jim Procter [Fri, 25 May 2018 12:56:34 +0000 (13:56 +0100)]
Merge branch 'bug/JAL-1460_dragndropWindows' into releases/Release_2_10_4_Branch