jalview.git
9 years agoJAL-1683 replace year/version strings with tokens in source
Jim Procter [Fri, 6 Mar 2015 15:26:45 +0000 (15:26 +0000)]
JAL-1683 replace year/version strings with tokens in source

9 years agoreassign features already created/documented for 2.9 to 2.8.3 JAL-1682
Jim Procter [Fri, 6 Mar 2015 15:13:51 +0000 (15:13 +0000)]
reassign features already created/documented for 2.9 to 2.8.3 JAL-1682

9 years agoMerge commit 'ab43013b7e357b84b4abade0dba949668dfb2a0e' into develop
Jim Procter [Fri, 6 Mar 2015 14:44:39 +0000 (14:44 +0000)]
Merge commit 'ab43013b7e357b84b4abade0dba949668dfb2a0e' into develop

9 years agoMerge commit '6797d65989b01c8fa5bdeaf6a66e35279b66a7f7' into develop
Jim Procter [Fri, 6 Mar 2015 14:42:01 +0000 (14:42 +0000)]
Merge commit '6797d65989b01c8fa5bdeaf6a66e35279b66a7f7' into develop

9 years agoJAL-1678 fix replace token for launchApp in a buildwq
Jim Procter [Thu, 5 Mar 2015 15:48:04 +0000 (15:48 +0000)]
JAL-1678 fix replace token for launchApp in a buildwq

9 years agoJAL-1678 fix replace token for launchApp in a buildwq
Jim Procter [Thu, 5 Mar 2015 15:05:31 +0000 (15:05 +0000)]
JAL-1678 fix replace token for launchApp in a buildwq

9 years agoJAL-1213 JAL-1395 add Jmol to JalviewLite classpath - need to find a way around this...
Jim Procter [Thu, 5 Mar 2015 14:36:18 +0000 (14:36 +0000)]
JAL-1213 JAL-1395 add Jmol to JalviewLite classpath - need to find a way around this in the future

9 years agoJAL-1678 add version parameter to example files in publish phase
Jim Procter [Thu, 5 Mar 2015 14:26:38 +0000 (14:26 +0000)]
JAL-1678 add version parameter to example files in publish phase

9 years agoJAL-1678 add version parameter to example files in publish phase
Jim Procter [Thu, 5 Mar 2015 14:22:21 +0000 (14:22 +0000)]
JAL-1678 add version parameter to example files in publish phase

9 years agoMerge branch 'bug/JAL-1643_File-chooser-improvement' into develop
Jim Procter [Thu, 5 Mar 2015 13:28:35 +0000 (13:28 +0000)]
Merge branch 'bug/JAL-1643_File-chooser-improvement' into develop

9 years agoJAL-1643 add quaqua libs as OSX specific resources bug/JAL-1643_File-chooser-improvement
Jim Procter [Thu, 5 Mar 2015 13:28:00 +0000 (13:28 +0000)]
JAL-1643 add quaqua libs as OSX specific resources

9 years agoMerge branch 'bug/addcustomlaunchdesktopparams' into develop
Jim Procter [Fri, 27 Feb 2015 17:01:25 +0000 (17:01 +0000)]
Merge branch 'bug/addcustomlaunchdesktopparams' into develop

9 years agoJAL-1678 - patch to make sure we only compare positions of the last / or ?
Jim Procter [Fri, 27 Feb 2015 17:01:08 +0000 (17:01 +0000)]
JAL-1678 - patch to make sure we only compare positions of the last / or ?

9 years agofix for JAL-1678
Jim Procter [Fri, 27 Feb 2015 16:58:45 +0000 (16:58 +0000)]
fix for JAL-1678

9 years agoJAL-1350 added to 2.9 release notes
Jim Procter [Thu, 12 Feb 2015 17:20:51 +0000 (17:20 +0000)]
JAL-1350 added to 2.9 release notes

9 years agoJAL-1350 document changed behaviour
Jim Procter [Thu, 12 Feb 2015 17:16:04 +0000 (17:16 +0000)]
JAL-1350 document changed behaviour

9 years agoJAL-1350 forgot to remove empty test
Jim Procter [Thu, 12 Feb 2015 17:10:45 +0000 (17:10 +0000)]
JAL-1350 forgot to remove empty test

9 years agoJAL-1350 pass the columnselection rather then selected sequence strings if column...
Jim Procter [Thu, 12 Feb 2015 16:50:31 +0000 (16:50 +0000)]
JAL-1350 pass the columnselection rather then selected sequence strings if column-selection exists.

9 years agoJAL-1350 cloned method and tested equivalence for using column selection to subdivide...
Jim Procter [Thu, 12 Feb 2015 16:49:32 +0000 (16:49 +0000)]
JAL-1350 cloned method and tested equivalence for using column selection to subdivide groups

9 years agoJAL-1115 switch to lists in SequenceGroup
Jim Procter [Thu, 12 Feb 2015 16:47:49 +0000 (16:47 +0000)]
JAL-1115 switch to lists in SequenceGroup

9 years agoJAL-1115 typecast
Jim Procter [Thu, 12 Feb 2015 16:47:18 +0000 (16:47 +0000)]
JAL-1115 typecast

9 years agojavadoc
Jim Procter [Thu, 12 Feb 2015 16:46:57 +0000 (16:46 +0000)]
javadoc

9 years agoJAL-1115 List rather than vector for sequence groups (minimal additional synchronized...
Jim Procter [Thu, 12 Feb 2015 16:46:44 +0000 (16:46 +0000)]
JAL-1115 List rather than vector for sequence groups (minimal additional synchronized clauses added)

9 years agoMerge branch 'bug/JAL-1643_File-chooser-improvement' into develop
Jim Procter [Fri, 6 Feb 2015 10:59:33 +0000 (10:59 +0000)]
Merge branch 'bug/JAL-1643_File-chooser-improvement' into develop

Conflicts:
.classpath

9 years agomerge commit
Charles Ofoegbu [Thu, 5 Feb 2015 17:10:39 +0000 (17:10 +0000)]
merge commit

9 years agoJAL-1643 jarred up the quaqua native libraries and added nativelib
Jim Procter [Thu, 5 Feb 2015 10:51:18 +0000 (10:51 +0000)]
JAL-1643 jarred up the quaqua native libraries and added nativelib
resource tags for Mac OS X

9 years agoJAL-1643 added quaqua filechooser and jni libraries to the InstallAnywhere distribution
Jim Procter [Thu, 5 Feb 2015 10:33:04 +0000 (10:33 +0000)]
JAL-1643 added quaqua filechooser and jni libraries to the InstallAnywhere distribution

9 years agoJAL-1643 correct version of quaqua (8) plus THIRDPARTYLIB details
Jim Procter [Thu, 5 Feb 2015 10:23:39 +0000 (10:23 +0000)]
JAL-1643 correct version of quaqua (8) plus THIRDPARTYLIB details

9 years agoJAL-1643 renamed quaqua library to add version number
Jim Procter [Thu, 5 Feb 2015 10:19:07 +0000 (10:19 +0000)]
JAL-1643 renamed quaqua library to add version number

9 years agoJAL-1643 modified jalviewFileChooser to retain default behaviour on other non-mac...
Charles Ofoegbu [Wed, 4 Feb 2015 06:04:47 +0000 (06:04 +0000)]
JAL-1643 modified jalviewFileChooser to retain default behaviour on other non-mac platforms

9 years agoJAL-1643 Modified JalviewFileChooser to have a more native laf on mac
Charles Ofoegbu [Wed, 4 Feb 2015 05:39:03 +0000 (05:39 +0000)]
JAL-1643 Modified JalviewFileChooser to have a more native laf on mac

9 years agoMerge branch 'bug/JAL-1644_Finder-logic-improvement' into develop
Charles Ofoegbu [Mon, 2 Feb 2015 20:35:48 +0000 (20:35 +0000)]
Merge branch 'bug/JAL-1644_Finder-logic-improvement' into develop

9 years agoJAL-1644 added null check for sequence description field
Charles Ofoegbu [Mon, 2 Feb 2015 20:34:32 +0000 (20:34 +0000)]
JAL-1644 added null check for sequence description field

9 years agoMerge commit
Charles Ofoegbu [Mon, 2 Feb 2015 15:49:53 +0000 (15:49 +0000)]
Merge commit

9 years agoJAL-1644 revised Finder's implementation to use a flag to enalbe searching an alignme...
Charles Ofoegbu [Mon, 2 Feb 2015 15:45:32 +0000 (15:45 +0000)]
JAL-1644 revised Finder's implementation to use a flag to enalbe searching an alignment's sequences description field

9 years agoMerge branch 'bug/JAL-1644_Finder-logic-improvement' into develop
Charles Ofoegbu [Mon, 2 Feb 2015 10:32:14 +0000 (10:32 +0000)]
Merge branch 'bug/JAL-1644_Finder-logic-improvement' into develop

9 years agoJAL-1644 improvment of finder logic to include the sequence description field
Charles Ofoegbu [Mon, 2 Feb 2015 10:30:13 +0000 (10:30 +0000)]
JAL-1644 improvment of finder logic to include the sequence description field

9 years agoJAL-1565 automatically mark query sequence as the sequence reference and hide any...
Jim Procter [Wed, 28 Jan 2015 15:29:32 +0000 (15:29 +0000)]
JAL-1565 automatically mark query sequence as the sequence reference and hide any insertions to it

9 years ago JAL-674 patch to make Mapping.compareTransferredToRefPDBAnnot test
Jim Procter [Wed, 28 Jan 2015 11:13:47 +0000 (11:13 +0000)]
JAL-674 patch to make Mapping.compareTransferredToRefPDBAnnot test
    pass
        otherwise addAll throws an index not found exception with
inspos==-1

9 years agoJAL-674 JAL-1270 added settings to ensure temperature and secondary
Jim Procter [Tue, 27 Jan 2015 17:18:05 +0000 (17:18 +0000)]
JAL-674 JAL-1270 added settings to ensure temperature and secondary
structure are propagated and finer grain checks on presence of annotation

9 years agoJAL-1588 new class renamed
gmungoc [Tue, 27 Jan 2015 08:58:12 +0000 (08:58 +0000)]
JAL-1588 new class renamed

9 years agoMerge branch 'features/JAL-1588saveChimeraSession' into develop
gmungoc [Mon, 26 Jan 2015 16:45:29 +0000 (16:45 +0000)]
Merge branch 'features/JAL-1588saveChimeraSession' into develop

9 years agoJAL-1588 restoring saved Chimera session(s)
gmungoc [Mon, 26 Jan 2015 16:42:56 +0000 (16:42 +0000)]
JAL-1588 restoring saved Chimera session(s)

9 years agoMerge branch 'features/JAL-1553_improvement-select-column-by-annotation-row-query...
Charles Ofoegbu [Fri, 23 Jan 2015 16:49:49 +0000 (16:49 +0000)]
Merge branch 'features/JAL-1553_improvement-select-column-by-annotation-row-query-interface' into develop

9 years agoJAL-1588 first working (?) restore of Chimera session incl bindings
gmungoc [Fri, 23 Jan 2015 16:49:19 +0000 (16:49 +0000)]
JAL-1588 first working (?) restore of Chimera session incl bindings

9 years agoJAL-1553 added help documentation and updated AnnotationColumnChooser to exclude... features/JAL-1553_improvement-select-column-by-annotation-row-query-interface
Charles Ofoegbu [Fri, 23 Jan 2015 16:47:20 +0000 (16:47 +0000)]
JAL-1553 added help documentation and updated AnnotationColumnChooser to exclude MigLayout as it is not supported in applets

9 years agoMerge branch 'feature_29/JAL-1372_referenceseq' into develop
Jim Procter [Fri, 23 Jan 2015 15:40:14 +0000 (15:40 +0000)]
Merge branch 'feature_29/JAL-1372_referenceseq' into develop

9 years agoJAL-1541 changed assert to JUnit assert - test now fails for current version of BioJS...
Jim Procter [Fri, 23 Jan 2015 15:33:06 +0000 (15:33 +0000)]
JAL-1541 changed assert to JUnit assert - test now fails for current version of BioJS export method

9 years agoJAL-1551 formatting
Jim Procter [Fri, 23 Jan 2015 15:32:05 +0000 (15:32 +0000)]
JAL-1551 formatting

9 years agoJAL-1286 don't print an exception if a non-gzip stream is attempted to be opened...
Jim Procter [Fri, 23 Jan 2015 15:31:26 +0000 (15:31 +0000)]
JAL-1286 don't print an exception if a non-gzip stream is attempted to be opened as gzip

9 years agoJAL-1551 crlf changes
Jim Procter [Fri, 23 Jan 2015 15:17:26 +0000 (15:17 +0000)]
JAL-1551 crlf changes

9 years agoJAL-969 hasHiddenRows is now an interface method
Jim Procter [Fri, 23 Jan 2015 14:11:14 +0000 (14:11 +0000)]
JAL-969 hasHiddenRows is now an interface method

9 years agoJAL-969 drop the hiddenColumns flag in favour of checking current state of columnSele...
Jim Procter [Fri, 23 Jan 2015 14:10:20 +0000 (14:10 +0000)]
JAL-969 drop the hiddenColumns flag in favour of checking current state of columnSelection

9 years agoMerge branch 'develop' into feature_29/JAL-1372_referenceseq
Jim Procter [Fri, 23 Jan 2015 14:06:11 +0000 (14:06 +0000)]
Merge branch 'develop' into feature_29/JAL-1372_referenceseq
finessing between two branches where bugs are patched twice
Conflicts:
src/jalview/appletgui/ScalePanel.java
src/jalview/appletgui/SeqCanvas.java
src/jalview/datamodel/ColumnSelection.java

9 years agoJAL-1628 tweak signature of core annotation printer for outputting hidden columns...
Jim Procter [Fri, 23 Jan 2015 13:14:58 +0000 (13:14 +0000)]
JAL-1628 tweak signature of core annotation printer for outputting hidden columns and view names via VIEW_HIDECOLS and VIEW_DEF

9 years agoJAL-1551 formatting/imports
Jim Procter [Fri, 23 Jan 2015 13:13:44 +0000 (13:13 +0000)]
JAL-1551 formatting/imports

9 years agoJAL-1551 JAL-962 formatting and code change ripples from changing HiddenColumns ...
Jim Procter [Fri, 23 Jan 2015 13:13:03 +0000 (13:13 +0000)]
JAL-1551 JAL-962 formatting and code change ripples from changing HiddenColumns & accessor from Vector to List<int[]>

9 years agoMerge branch 'features/JAL-1553_improvement-select-column-by-annotation-row-query...
Charles Ofoegbu [Fri, 23 Jan 2015 10:38:46 +0000 (10:38 +0000)]
Merge branch 'features/JAL-1553_improvement-select-column-by-annotation-row-query-interface' into develop

9 years agoMerge branch 'develop' of https://source.jalview.org/git/jalview into develop
Charles Ofoegbu [Fri, 23 Jan 2015 10:37:58 +0000 (10:37 +0000)]
Merge branch 'develop' of https://source.jalview.org/git/jalview into develop

9 years agoJAL-1553 fixed null pointer exception thrown in SeqCanvas and ScalePanel of jalview...
Charles Ofoegbu [Fri, 23 Jan 2015 10:37:09 +0000 (10:37 +0000)]
JAL-1553 fixed null pointer exception thrown in SeqCanvas and ScalePanel of jalview applet while attempting to redraw the panels when hidden columns no longer exists

9 years agoJAL-1551 source code formatting
Jim Procter [Fri, 23 Jan 2015 09:05:17 +0000 (09:05 +0000)]
JAL-1551 source code formatting

9 years agoJAL-969 javadoc and mark interface overrides for clarity
Jim Procter [Fri, 23 Jan 2015 09:04:27 +0000 (09:04 +0000)]
JAL-969 javadoc and mark interface overrides for clarity

9 years agoJAL-1628 drop getShowAnnotation accessor in favour of isShowAnnotation in AlignViewpo...
Jim Procter [Fri, 23 Jan 2015 08:59:19 +0000 (08:59 +0000)]
JAL-1628 drop getShowAnnotation accessor in favour of isShowAnnotation in AlignViewportI and change method signature for printing annotation files to allow view (for column selection) and alignment object to be accessed

9 years agoMerge branch 'features/JAL-1553_improvement-select-column-by-annotation-row-query...
Charles Ofoegbu [Thu, 22 Jan 2015 18:34:45 +0000 (18:34 +0000)]
Merge branch 'features/JAL-1553_improvement-select-column-by-annotation-row-query-interface' into develop

9 years agoJAL-1553 added applet support for the select-column-by-annotation-row feature
Charles Ofoegbu [Thu, 22 Jan 2015 18:33:43 +0000 (18:33 +0000)]
JAL-1553 added applet support for the select-column-by-annotation-row feature

9 years agoJAL-1372 JAL-1169 documentation for new commands HIDE_INSERTIONS AND VIEW_SETREF
Jim Procter [Thu, 22 Jan 2015 17:28:43 +0000 (17:28 +0000)]
JAL-1372 JAL-1169 documentation for new commands HIDE_INSERTIONS AND VIEW_SETREF

9 years agoMerge branch 'develop' into feature_29/JAL-1372_referenceseq
Jim Procter [Wed, 21 Jan 2015 15:04:37 +0000 (15:04 +0000)]
Merge branch 'develop' into feature_29/JAL-1372_referenceseq

9 years agotidy up class files that shouldn't be in repo
Jim Procter [Wed, 21 Jan 2015 10:36:38 +0000 (10:36 +0000)]
tidy up class files that shouldn't be in repo

9 years agoMerge branch 'features/JAL-1553_improvement-select-column-by-annotation-row-query...
Charles Ofoegbu [Tue, 20 Jan 2015 17:28:21 +0000 (17:28 +0000)]
Merge branch 'features/JAL-1553_improvement-select-column-by-annotation-row-query-interface' into develop

9 years agoclean up
Charles Ofoegbu [Tue, 20 Jan 2015 17:27:26 +0000 (17:27 +0000)]
clean up

9 years agoclean up
Charles Ofoegbu [Tue, 20 Jan 2015 17:25:35 +0000 (17:25 +0000)]
clean up

9 years agoMerge branch 'features/JAL-1553_improvement-select-column-by-annotation-row-query...
Charles Ofoegbu [Tue, 20 Jan 2015 17:22:45 +0000 (17:22 +0000)]
Merge branch 'features/JAL-1553_improvement-select-column-by-annotation-row-query-interface' into develop

9 years agoFurther abstractions and clean up
Charles Ofoegbu [Tue, 20 Jan 2015 17:20:40 +0000 (17:20 +0000)]
Further abstractions and clean up

9 years agoMerge branch 'features/JAL-1553_improvement-select-column-by-annotation-row-query...
Charles Ofoegbu [Tue, 20 Jan 2015 15:04:37 +0000 (15:04 +0000)]
Merge branch 'features/JAL-1553_improvement-select-column-by-annotation-row-query-interface' into develop

9 years agobasic house keeping
Charles Ofoegbu [Tue, 20 Jan 2015 15:02:05 +0000 (15:02 +0000)]
basic house keeping

9 years agoJAL-1304 revamped annotation file documentation structure to make it more usable
Jim Procter [Tue, 20 Jan 2015 14:31:36 +0000 (14:31 +0000)]
JAL-1304 revamped annotation file documentation structure to make it more usable

9 years agoMerge branch 'features/JAL-1553_improvement-select-column-by-annotation-row-query...
Charles Ofoegbu [Tue, 20 Jan 2015 12:17:37 +0000 (12:17 +0000)]
Merge branch 'features/JAL-1553_improvement-select-column-by-annotation-row-query-interface' into develop

9 years agoJAL-1553 enhancement of column selection by annotation row to include the query filte...
Charles Ofoegbu [Tue, 20 Jan 2015 12:16:27 +0000 (12:16 +0000)]
JAL-1553 enhancement of column selection by annotation row to include the query filter interface and ability to perform further actions like hide/select on the filterd columns

9 years agoJAL-1372 i18n and tweaking set/unset representative sequence
Jim Procter [Sun, 18 Jan 2015 15:45:29 +0000 (15:45 +0000)]
JAL-1372 i18n and tweaking set/unset representative sequence

9 years agoJAL-1628 formatting
Jim Procter [Sun, 18 Jan 2015 15:44:04 +0000 (15:44 +0000)]
JAL-1628 formatting

9 years agoJAL-1628 employ new AnnotationFile reader method to allow the current view's ColumnSe...
Jim Procter [Sun, 18 Jan 2015 15:43:17 +0000 (15:43 +0000)]
JAL-1628 employ new AnnotationFile reader method to allow the current view's ColumnSelection to be modified

9 years agoJAL-1628 new entry point for reading annotation files that modify column visibility...
Jim Procter [Sun, 18 Jan 2015 15:41:40 +0000 (15:41 +0000)]
JAL-1628 new entry point for reading annotation files that modify column visibility and implementation and test+data for VIEW_SETREF and HIDE_INSERTIONS

9 years agoJAL-1628 formatting and javadoc
Jim Procter [Sun, 18 Jan 2015 15:38:57 +0000 (15:38 +0000)]
JAL-1628 formatting and javadoc

9 years agoJAL-1628 method to hide insertions to current sequence selection
Jim Procter [Sun, 18 Jan 2015 15:36:14 +0000 (15:36 +0000)]
JAL-1628 method to hide insertions to current sequence selection

9 years agoJAL-1628 wrappers for common checks on ColumnSelection
Jim Procter [Sun, 18 Jan 2015 15:32:30 +0000 (15:32 +0000)]
JAL-1628 wrappers for common checks on ColumnSelection

9 years agoJAL-1628 ColumnSelection method to hide insertions for a given sequence
Jim Procter [Sun, 18 Jan 2015 15:29:57 +0000 (15:29 +0000)]
JAL-1628 ColumnSelection method to hide insertions for a given sequence

9 years agoJAL-1628 new method to get a list of insertions in a SequenceI
Jim Procter [Sun, 18 Jan 2015 15:21:00 +0000 (15:21 +0000)]
JAL-1628 new method to get a list of insertions in a SequenceI

9 years agoalways use interface rather than field access
Jim Procter [Sun, 18 Jan 2015 15:17:37 +0000 (15:17 +0000)]
always use interface rather than field access

9 years agoJAL-1372 JAL-1114 JAL-1628 tidy sequenceI/sequence
Jim Procter [Sun, 18 Jan 2015 11:27:30 +0000 (11:27 +0000)]
JAL-1372 JAL-1114 JAL-1628 tidy sequenceI/sequence

9 years agoJAL-1629 .jar option removed from Alignment File Save As dialog.
gmungoc [Wed, 14 Jan 2015 13:26:46 +0000 (13:26 +0000)]
JAL-1629 .jar option removed from Alignment File Save As dialog.

9 years agoMerge branch 'features/JAL-1553_select-columns-by-annotation' into develop
Charles Ofoegbu [Wed, 14 Jan 2015 12:53:54 +0000 (12:53 +0000)]
Merge branch 'features/JAL-1553_select-columns-by-annotation' into develop

9 years agoModified AnnotationColumnChooser to maintain state of previous selection when current... features/JAL-1553_select-columns-by-annotation
Charles Ofoegbu [Wed, 14 Jan 2015 11:21:57 +0000 (11:21 +0000)]
Modified AnnotationColumnChooser to maintain state of previous selection when current operation is canceled

9 years agoMerge branch 'features/JAL-1553_select-columns-by-annotation' into develop
Charles Ofoegbu [Tue, 13 Jan 2015 15:55:37 +0000 (15:55 +0000)]
Merge branch 'features/JAL-1553_select-columns-by-annotation' into develop

9 years agoRefactored AnnotationColumnChoser and AnnotationColorChooser to apply the DRY principle
Charles Ofoegbu [Tue, 13 Jan 2015 15:21:45 +0000 (15:21 +0000)]
Refactored AnnotationColumnChoser and AnnotationColorChooser to apply the DRY principle

9 years agoJAL-1553 merge commit
Charles Ofoegbu [Sat, 10 Jan 2015 14:38:01 +0000 (14:38 +0000)]
JAL-1553 merge commit

9 years agoJAL-1553 implementation of column selection by annotation and threshold queries
Charles Ofoegbu [Sat, 10 Jan 2015 14:29:31 +0000 (14:29 +0000)]
JAL-1553 implementation of column selection by annotation and threshold queries

9 years agoMerge branch 'JAL-1372_referenceseq' into feature_29/JAL-1372_referenceseq
Jim Procter [Fri, 9 Jan 2015 17:12:04 +0000 (17:12 +0000)]
Merge branch 'JAL-1372_referenceseq' into feature_29/JAL-1372_referenceseq
merge forward to implement support for reference sequences in 2.9
Conflicts:
resources/lang/Messages.properties
src/jalview/appletgui/APopupMenu.java
src/jalview/datamodel/Alignment.java
src/jalview/gui/PopupMenu.java

9 years agoMerge branch 'features/JAL-1605_html-svg-export' into develop
Charles Ofoegbu [Fri, 9 Jan 2015 15:11:09 +0000 (15:11 +0000)]
Merge branch 'features/JAL-1605_html-svg-export' into develop

9 years agoMerge branch 'JAL-1483_29dev' into develop
Jim Procter [Fri, 9 Jan 2015 11:11:18 +0000 (11:11 +0000)]
Merge branch 'JAL-1483_29dev' into develop

9 years agoJAL-1483 formatting
Jim Procter [Fri, 9 Jan 2015 11:10:51 +0000 (11:10 +0000)]
JAL-1483 formatting