gmungoc [Thu, 18 May 2017 14:28:54 +0000 (15:28 +0100)]
JAL-2543 html-encode quote characters in feature description
gmungoc [Thu, 18 May 2017 13:57:37 +0000 (14:57 +0100)]
JAL-2490 retrieve visible features only
gmungoc [Thu, 18 May 2017 13:28:18 +0000 (14:28 +0100)]
Merge branch 'develop' into features/JAL-2446NCList
gmungoc [Thu, 18 May 2017 13:15:32 +0000 (14:15 +0100)]
JAL-2541 initial unit tests for edit cut relocate features
gmungoc [Thu, 18 May 2017 13:15:04 +0000 (14:15 +0100)]
JAL-2541 fix to initSeqFrom (and minor code tidy); more tests for
deleteChars
kiramt [Thu, 18 May 2017 13:09:21 +0000 (14:09 +0100)]
JAL-2256 Corrected AllCols/Rows iterator behaviour for single element
Jim Procter [Thu, 18 May 2017 11:18:14 +0000 (12:18 +0100)]
JAL-2418 remove explicit test suite stats
Jim Procter [Wed, 17 May 2017 15:26:52 +0000 (16:26 +0100)]
Merge branch 'develop' into documentation/JAL-2418_release2102
Jim Procter [Wed, 17 May 2017 15:10:15 +0000 (16:10 +0100)]
Merge branch 'bug/JAL-2510amendFeatures' into develop
Jim Procter [Wed, 17 May 2017 14:50:14 +0000 (15:50 +0100)]
JAL-2447 add links to issues.jalview.org for experimental features
Jim Procter [Wed, 17 May 2017 14:41:04 +0000 (15:41 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into develop
Jim Procter [Wed, 17 May 2017 14:39:43 +0000 (15:39 +0100)]
JAL-2447 experimental section in ‘Whats New’
Jim Procter [Wed, 17 May 2017 14:39:17 +0000 (15:39 +0100)]
JAL-2447 JAL-2295 JAL-2296 documenting as experimental features
Jim Procter [Wed, 17 May 2017 13:46:38 +0000 (14:46 +0100)]
Merge branch 'develop' into documentation/JAL-2418_release2102
Jim Procter [Wed, 17 May 2017 13:31:54 +0000 (14:31 +0100)]
Merge branch 'features/JAL-2447experimentalFlag' into develop
Jim Procter [Wed, 17 May 2017 13:28:08 +0000 (14:28 +0100)]
JAL-2418 release notes
gmungoc [Wed, 17 May 2017 12:07:13 +0000 (13:07 +0100)]
JAL-2504 use (and update) defaults for new feature only if not supplied
gmungoc [Wed, 17 May 2017 07:59:07 +0000 (08:59 +0100)]
Merge branch 'develop' into bug/JAL-2510amendFeatures
Conflicts:
resources/lang/Messages.properties
resources/lang/Messages_es.properties
Jim Procter [Tue, 16 May 2017 16:36:01 +0000 (17:36 +0100)]
Merge branch 'documentation/JAL-2418_release2102' into develop
Jim Procter [Tue, 16 May 2017 16:27:35 +0000 (17:27 +0100)]
JAL-2418 release notes
Jim Procter [Tue, 16 May 2017 15:51:31 +0000 (16:51 +0100)]
JAL-384 documentation on custom colours groovy examples
gmungoc [Tue, 16 May 2017 15:47:40 +0000 (16:47 +0100)]
JAL-2505 unreachable code (for many years) removed
Jim Procter [Tue, 16 May 2017 15:35:15 +0000 (16:35 +0100)]
JAL-384 - groovy scripts for conserved/unconserved colourscheme requests
Jim Procter [Tue, 16 May 2017 15:30:07 +0000 (16:30 +0100)]
JAL-2418 release notes
kiramt [Tue, 16 May 2017 15:10:07 +0000 (16:10 +0100)]
JAL-2536 Overview window sizing not subject to min size restrictions
gmungoc [Tue, 16 May 2017 14:38:33 +0000 (15:38 +0100)]
JAL-2505 refactored method removed
gmungoc [Tue, 16 May 2017 14:29:14 +0000 (15:29 +0100)]
Merge branch 'develop' into features/JAL-2446NCList
gmungoc [Tue, 16 May 2017 14:00:41 +0000 (15:00 +0100)]
JAL-2505 set helix number as feature group in SequenceFeature
constructor
Jim Procter [Tue, 16 May 2017 13:54:17 +0000 (14:54 +0100)]
JAL-2418 JAL-2316 added to new features
Jim Procter [Tue, 16 May 2017 13:30:04 +0000 (14:30 +0100)]
JAL-2316 tweaking docs and links in help
gmungoc [Tue, 16 May 2017 13:10:40 +0000 (14:10 +0100)]
JAL-2517 restore complex colour scheme on Cancel in User Defined Colours
Jim Procter [Tue, 16 May 2017 12:46:14 +0000 (13:46 +0100)]
JAL-2418 release 2.10.2 release notes template
Jim Procter [Tue, 16 May 2017 12:45:29 +0000 (13:45 +0100)]
alternative patch for JAL-2339 readability in java-help
gmungoc [Tue, 16 May 2017 12:40:27 +0000 (13:40 +0100)]
JAL-2403 simplify instantiation / configuration of score model for view
gmungoc [Tue, 16 May 2017 11:18:05 +0000 (12:18 +0100)]
Merge branch 'develop' into features/JAL-2446NCList
kiramt [Tue, 16 May 2017 10:34:09 +0000 (11:34 +0100)]
JAL-2522 Missed fix to applet
gmungoc [Tue, 16 May 2017 10:12:04 +0000 (11:12 +0100)]
JAL-2505 refactor to set type and group in SequenceFeature constructor
gmungoc [Tue, 16 May 2017 10:11:25 +0000 (11:11 +0100)]
JAL-2525 put in missing "transcript" feature type
kiramt [Tue, 16 May 2017 09:37:48 +0000 (10:37 +0100)]
JAL-2388 Rationalised hashCode method in HiddenColumns
gmungoc [Tue, 16 May 2017 09:25:28 +0000 (10:25 +0100)]
JAL-2505 additional tests/asserts prior to refactoring
kiramt [Tue, 16 May 2017 09:15:40 +0000 (10:15 +0100)]
Merge branch 'develop' into bug/JAL-2491
kiramt [Tue, 16 May 2017 09:10:03 +0000 (10:10 +0100)]
JAL-2491 Better merge
Jim Procter [Tue, 16 May 2017 08:48:31 +0000 (09:48 +0100)]
Merge branch 'bug/JAL-2507_rnasecstrstockholm' into develop
gmungoc [Tue, 16 May 2017 08:40:39 +0000 (09:40 +0100)]
JAL-2505 set SequenceFeature group in constructor
Jim Procter [Mon, 15 May 2017 18:23:56 +0000 (19:23 +0100)]
JAL-2507 fix test: knockon from capitalisation on secondary structure from stockholm file
Jim Procter [Mon, 15 May 2017 16:37:43 +0000 (17:37 +0100)]
Merge branch 'bug/JAL-2507_rnasecstrstockholm' into develop
Jim Procter [Mon, 15 May 2017 16:37:17 +0000 (17:37 +0100)]
JAL-2311 disable and relocate Jared service tests to Network (prior to their removal)
Jim Procter [Mon, 15 May 2017 16:26:53 +0000 (17:26 +0100)]
JAL-2507 capitalisation for annotation lines generated from stockholm annotation
gmungoc [Mon, 15 May 2017 16:02:55 +0000 (17:02 +0100)]
Merge branch 'develop' into features/JAL-2446NCList
Jim Procter [Mon, 15 May 2017 15:56:06 +0000 (16:56 +0100)]
JAL-2507 case insensitive recognition of annotation type
gmungoc [Mon, 15 May 2017 15:55:54 +0000 (16:55 +0100)]
JAL-2532 new feature types and colour changes from Amend Features
retained after Cancel in Feature Settings
Jim Procter [Mon, 15 May 2017 15:43:12 +0000 (16:43 +0100)]
JAL-2507 - required callers to specify exact ignore flags for StockholmFileTest.testAlignmentEquivalent asserts
Jim Procter [Mon, 15 May 2017 15:26:02 +0000 (16:26 +0100)]
JAL-2535 quick hack to implement posterior probabilities parsing. 0-9 parsed as 0..9, ‘*’ or any other non-whitespace symbol parsed as ’10’.
tcofoegbu [Mon, 15 May 2017 15:07:09 +0000 (16:07 +0100)]
JAL-2520 improvement to use URL leaf name for creating temp file for URL file download
tcofoegbu [Mon, 15 May 2017 14:52:56 +0000 (15:52 +0100)]
JAL-2533 improvement to prune off file extension when imported seqs are named with the data file
kiramt [Mon, 15 May 2017 14:50:28 +0000 (15:50 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
kiramt [Mon, 15 May 2017 14:50:07 +0000 (15:50 +0100)]
JAL-2388 Add missed optimisation
kiramt [Mon, 15 May 2017 11:27:53 +0000 (12:27 +0100)]
JAL-2491 Better merge but not quite right yet
Jim Procter [Mon, 15 May 2017 11:14:20 +0000 (12:14 +0100)]
Merge branch 'features/JAL-2376_add-horizontal-bar' into develop
Jim Procter [Mon, 15 May 2017 11:07:39 +0000 (12:07 +0100)]
JAL-2371 create a default ResidueShader when constructing the viewport
gmungoc [Mon, 15 May 2017 10:59:29 +0000 (11:59 +0100)]
Merge branch 'develop' into features/JAL-2446NCList
Conflicts:
src/jalview/gui/OverviewPanel.java
kiramt [Mon, 15 May 2017 10:42:01 +0000 (11:42 +0100)]
Merge remote-tracking branch 'origin/develop' into bug/JAL-2491
(not working yet)
Conflicts:
src/jalview/appletgui/AlignmentPanel.java
src/jalview/appletgui/OverviewPanel.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/OverviewPanel.java
src/jalview/gui/SeqPanel.java
src/jalview/viewmodel/OverviewDimensions.java
src/jalview/viewmodel/ViewportRanges.java
test/jalview/viewmodel/OverviewDimensionsTest.java
gmungoc [Mon, 15 May 2017 08:43:05 +0000 (09:43 +0100)]
JAL-2490 use findFeatures() for efficient feature overlap lookup
kiramt [Mon, 15 May 2017 08:42:17 +0000 (09:42 +0100)]
JAL-2491 Tests
kiramt [Mon, 15 May 2017 08:23:59 +0000 (09:23 +0100)]
JAL-2491 Tidies
gmungoc [Mon, 15 May 2017 07:46:56 +0000 (08:46 +0100)]
JAL-2480 redundant code (from merge?) removed
gmungoc [Mon, 15 May 2017 07:45:17 +0000 (08:45 +0100)]
JAL-2480 redundant code removed
kiramt [Fri, 12 May 2017 18:33:43 +0000 (19:33 +0100)]
JAL-2491 Tidy
kiramt [Fri, 12 May 2017 18:32:32 +0000 (19:32 +0100)]
JAL-2491 Tidies to Overview panel calls in light of new code
gmungoc [Fri, 12 May 2017 15:59:19 +0000 (16:59 +0100)]
JAL-2490 performant findFeaturesAtRes
gmungoc [Fri, 12 May 2017 15:29:07 +0000 (16:29 +0100)]
JAL-2483 efficient lookup of feature types and groups - applet
gmungoc [Fri, 12 May 2017 15:00:20 +0000 (16:00 +0100)]
JAL-2525 get sequence features for Ontology term(s), tidy feature sort
methods
gmungoc [Fri, 12 May 2017 14:56:33 +0000 (15:56 +0100)]
JAL-2480 more efficient contains check on add; tidied comparators
gmungoc [Fri, 12 May 2017 14:53:29 +0000 (15:53 +0100)]
JAL-2480 java.util.RangeComparator renamed IntRangeComparator
Jim Procter [Fri, 12 May 2017 14:48:16 +0000 (15:48 +0100)]
Merge branch 'features/JAL-2435splitScreenFont' into develop
Jim Procter [Fri, 12 May 2017 14:47:10 +0000 (15:47 +0100)]
JAL-2418 broken help ref
Jim Procter [Fri, 12 May 2017 14:46:27 +0000 (15:46 +0100)]
JAL-2435 documentation and what’s new
Jim Procter [Fri, 12 May 2017 14:42:17 +0000 (15:42 +0100)]
JAL-2435 mention new checkbox in linked cDNA/Protein view documentation
Jim Procter [Fri, 12 May 2017 14:41:45 +0000 (15:41 +0100)]
JAL-2435 mirror antiAlias setting between cDNA and Protein
Jim Procter [Fri, 12 May 2017 14:09:45 +0000 (15:09 +0100)]
Merge branch 'features/JAL-2388OverviewWindow' into develop
Jim Procter [Fri, 12 May 2017 14:01:17 +0000 (15:01 +0100)]
JAL-2388 mention overview popup in documentation
Jim Procter [Fri, 12 May 2017 13:56:21 +0000 (14:56 +0100)]
JAL-2388 checkbox in overview popup for applet
gmungoc [Fri, 12 May 2017 13:32:33 +0000 (14:32 +0100)]
JAL-2480 efficient test for features present on sequence
Jim Procter [Fri, 12 May 2017 13:29:46 +0000 (14:29 +0100)]
Merge branch 'features/JAL-2228_efficient_featurecounts' into develop
Jim Procter [Fri, 12 May 2017 13:29:28 +0000 (14:29 +0100)]
JAL-2228 updated script in help docs, renamed docs, and added note about non-backwards compatibility of feature counter script
gmungoc [Fri, 12 May 2017 13:22:03 +0000 (14:22 +0100)]
JAL-2480 renamed java.util.RangeComparator to IntRangeComparator
kiramt [Fri, 12 May 2017 12:43:16 +0000 (13:43 +0100)]
JAL-2491 Renamed comp scrolling flag for consistency; small tweaks
kiramt [Fri, 12 May 2017 08:39:19 +0000 (09:39 +0100)]
JAL-2491 Added adjustment methods to be called directly
kiramt [Fri, 12 May 2017 08:35:52 +0000 (09:35 +0100)]
JAL-2491 Unit test updates
kiramt [Fri, 12 May 2017 07:13:06 +0000 (08:13 +0100)]
JAL-2491 Tweaks for applet
kiramt [Thu, 11 May 2017 16:24:20 +0000 (17:24 +0100)]
JAL-2491 First port to applet
kiramt [Thu, 11 May 2017 16:23:37 +0000 (17:23 +0100)]
JAL-2491 First port to applet
Jim Procter [Thu, 11 May 2017 15:21:14 +0000 (16:21 +0100)]
Merge branch 'bug/JAL-2507_rnasecstrstockholm' into develop
Jim Procter [Thu, 11 May 2017 15:20:29 +0000 (16:20 +0100)]
JAL-2509 JAL-2507 allow whitespace in GS annotation lines (removed old code for processing GS column annotation into features)
Jim Procter [Thu, 11 May 2017 15:17:29 +0000 (16:17 +0100)]
JAL-2507 JAL-2509 allow whitespace==null for annotation row comparison, and test coverage for Annotation equivalence asserts
Jim Procter [Thu, 11 May 2017 14:29:00 +0000 (15:29 +0100)]
JAL-2507 test if an annotation is ‘whitespace’
Jim Procter [Thu, 11 May 2017 14:28:24 +0000 (15:28 +0100)]
JAL-2507 Annotation.EMPTY_ANNOTATION - non-null whitespace annotation
kiramt [Thu, 11 May 2017 13:30:49 +0000 (14:30 +0100)]
JAL-2491 Unit tests and updates
kiramt [Wed, 10 May 2017 13:53:54 +0000 (14:53 +0100)]
JAL-2491 Make it work with cursor movement
kiramt [Wed, 10 May 2017 13:29:07 +0000 (14:29 +0100)]
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
git://source.jalview.org / jalview.git / log