jalview.git
9 years agoJAL-845 reduced height to allow for Desktop decorators on Windows
Mungo Carstairs [Thu, 30 Apr 2015 20:12:42 +0000 (21:12 +0100)]
JAL-845 reduced height to allow for Desktop decorators on Windows

9 years agoMerge branch 'bug/JAL-1717_make-pbd-id-case_insensitive' into Release_2_9_Branch
tcofoegbu [Thu, 30 Apr 2015 11:47:58 +0000 (12:47 +0100)]
Merge branch 'bug/JAL-1717_make-pbd-id-case_insensitive' into Release_2_9_Branch

9 years agoJAL-1717 updated the PDBEntry model and updated the method use for its equality test...
tcofoegbu [Thu, 30 Apr 2015 11:47:08 +0000 (12:47 +0100)]
JAL-1717 updated the PDBEntry model and updated the method use for its equality test. Furthermore, a couple of other methods where modified to ensure PDB entries are always unique

9 years agoJAL-1690 preserve scaling in New View, synch id width changes
gmungoc [Wed, 29 Apr 2015 15:00:27 +0000 (16:00 +0100)]
JAL-1690 preserve scaling in New View, synch id width changes

9 years agoJAL-1686 ViewStyle.hashCode implemented
gmungoc [Wed, 29 Apr 2015 08:13:08 +0000 (09:13 +0100)]
JAL-1686 ViewStyle.hashCode implemented

9 years agoMerge branch 'Release_2_9_Branch' of https://source.jalview.org/git/jalview.git into...
gmungoc [Tue, 28 Apr 2015 15:55:30 +0000 (16:55 +0100)]
Merge branch 'Release_2_9_Branch' of https://source.jalview.org/git/jalview.git into Release_2_9_Branch

9 years agoJAL-1684 removed reflection from ViewStyle (to Junit), and removed
gmungoc [Tue, 28 Apr 2015 15:55:17 +0000 (16:55 +0100)]
JAL-1684 removed reflection from ViewStyle (to Junit), and removed
duplications with AlignViewportI

9 years agoMerge branch 'features/JAL-1714_specify-mulitple-id_PDB-query' into Release_2_9_Branch
tcofoegbu [Tue, 28 Apr 2015 10:50:01 +0000 (11:50 +0100)]
Merge branch 'features/JAL-1714_specify-mulitple-id_PDB-query' into Release_2_9_Branch

9 years agoJAL-1711 and JAL-1714 documentation updated
tcofoegbu [Tue, 28 Apr 2015 10:49:30 +0000 (11:49 +0100)]
JAL-1711 and JAL-1714 documentation updated

9 years agoMerge branch 'features/JAL-1714_specify-mulitple-id_PDB-query' into Release_2_9_Branch
tcofoegbu [Tue, 28 Apr 2015 10:46:38 +0000 (11:46 +0100)]
Merge branch 'features/JAL-1714_specify-mulitple-id_PDB-query' into Release_2_9_Branch

9 years agoJAL-1711 and JAL-1714 documentation updated
tcofoegbu [Tue, 28 Apr 2015 10:45:42 +0000 (11:45 +0100)]
JAL-1711 and JAL-1714 documentation updated

9 years agoMerge branch 'bug/JAL-1715_PDB-Search-selection-validation' into Release_2_9_Branch
tcofoegbu [Mon, 27 Apr 2015 16:01:41 +0000 (17:01 +0100)]
Merge branch 'bug/JAL-1715_PDB-Search-selection-validation' into Release_2_9_Branch

9 years agoJAL-1715 implemented selection validation for the new PDB Query interface
tcofoegbu [Mon, 27 Apr 2015 16:00:33 +0000 (17:00 +0100)]
JAL-1715 implemented selection validation for the new PDB Query interface

9 years agoMerge branch 'features/JAL-1714_specify-mulitple-id_PDB-query' into Release_2_9_Branch
tcofoegbu [Mon, 27 Apr 2015 14:56:15 +0000 (15:56 +0100)]
Merge branch 'features/JAL-1714_specify-mulitple-id_PDB-query' into Release_2_9_Branch

9 years agoJAL-1714 improved the new PDB Sequence fetcher by enabling it query multiple PDB...
tcofoegbu [Mon, 27 Apr 2015 14:24:09 +0000 (15:24 +0100)]
JAL-1714 improved the new PDB Sequence fetcher by enabling it query multiple PDB entries in one operation

9 years agoJAL-1645 Release_2_9 branch build tag
Jim Procter [Mon, 27 Apr 2015 10:28:04 +0000 (11:28 +0100)]
JAL-1645 Release_2_9 branch build tag

9 years agoMerge branch 'Release_2_8_3_Branch' of https://source.jalview.org/git/jalview.git...
gmungoc [Mon, 27 Apr 2015 10:04:05 +0000 (11:04 +0100)]
Merge branch 'Release_2_8_3_Branch' of https://source.jalview.org/git/jalview.git into Release_2_8_3_Branch

9 years agoJAL-1691 more stable linked scrolling across split frame (+javadoc)
gmungoc [Mon, 27 Apr 2015 10:03:48 +0000 (11:03 +0100)]
JAL-1691 more stable linked scrolling across split frame (+javadoc)

9 years agoMerge branch 'features/JAL-1711_PDB-specify-chain' into Release_2_8_3_Branch
tcofoegbu [Fri, 24 Apr 2015 15:06:38 +0000 (16:06 +0100)]
Merge branch 'features/JAL-1711_PDB-specify-chain' into Release_2_8_3_Branch

9 years agoMerge branch 'Release_2_8_3_Branch' of https://source.jalview.org/git/jalview into...
tcofoegbu [Fri, 24 Apr 2015 15:06:05 +0000 (16:06 +0100)]
Merge branch 'Release_2_8_3_Branch' of https://source.jalview.org/git/jalview into Release_2_8_3_Branch

9 years agoJAL-1710, JAL-1711 Bug fix for exception thrown when a request containing a colon...
tcofoegbu [Fri, 24 Apr 2015 15:05:24 +0000 (16:05 +0100)]
JAL-1710, JAL-1711 Bug fix for exception thrown when a request containing a colon (:) is sent to the PDB Rest API and Implementation to allow selection of a specific PDB chain

9 years agoJAL-1691 prevent propagation of scrolling on mouseover follow highlight
gmungoc [Fri, 24 Apr 2015 14:42:10 +0000 (15:42 +0100)]
JAL-1691 prevent propagation of scrolling on mouseover follow highlight

9 years agoMerge branch 'bug/JAL-1707_retrieve-pdb-structure-for-rna' into Release_2_8_3_Branch
tcofoegbu [Fri, 24 Apr 2015 13:53:01 +0000 (14:53 +0100)]
Merge branch 'bug/JAL-1707_retrieve-pdb-structure-for-rna' into Release_2_8_3_Branch

9 years agoJAL-1707 bug fix - also search using sequence name
tcofoegbu [Fri, 24 Apr 2015 13:51:32 +0000 (14:51 +0100)]
JAL-1707 bug fix - also search using sequence name

9 years agoJAL-1702 corrected check for 'no colours selected'
gmungoc [Thu, 23 Apr 2015 10:44:50 +0000 (11:44 +0100)]
JAL-1702 corrected check for 'no colours selected'

9 years agoJAL-1706 distinguish between 'font too small' and 'font does not have
gmungoc [Thu, 23 Apr 2015 09:47:30 +0000 (10:47 +0100)]
JAL-1706 distinguish between 'font too small' and 'font does not have
letters'

9 years agoJAL-1681 create mappings before AlignFrame to ensure cDNA consensus
gmungoc [Thu, 23 Apr 2015 08:24:02 +0000 (09:24 +0100)]
JAL-1681 create mappings before AlignFrame to ensure cDNA consensus
added

9 years agoJAL-845 only 'follow' sort command in coding complement alignment
gmungoc [Thu, 23 Apr 2015 08:23:17 +0000 (09:23 +0100)]
JAL-845 only 'follow' sort command in coding complement alignment

9 years agoJAL-845 set split frame divider safely for eXpand Views
gmungoc [Thu, 23 Apr 2015 08:21:53 +0000 (09:21 +0100)]
JAL-845 set split frame divider safely for eXpand Views

9 years agoMerge branch 'Release_2_8_3_Branch' of https://source.jalview.org/git/jalview.git...
gmungoc [Thu, 23 Apr 2015 08:10:15 +0000 (09:10 +0100)]
Merge branch 'Release_2_8_3_Branch' of https://source.jalview.org/git/jalview.git into Release_2_8_3_Branch

9 years agoJAL-1706 fixed to correctly restore the last dialog selection after
gmungoc [Thu, 23 Apr 2015 08:09:57 +0000 (09:09 +0100)]
JAL-1706 fixed to correctly restore the last dialog selection after
warning

9 years agoJAL-1667_1668 updated help doc
tcofoegbu [Wed, 22 Apr 2015 15:56:20 +0000 (16:56 +0100)]
JAL-1667_1668 updated help doc

9 years agoMerge branch 'features/JAL-1667_1668-documentation' into Release_2_8_3_Branch
tcofoegbu [Wed, 22 Apr 2015 15:47:55 +0000 (16:47 +0100)]
Merge branch 'features/JAL-1667_1668-documentation' into Release_2_8_3_Branch

9 years agoJAL-1667_1668 added help documentation for PDB Sequence fetcher
tcofoegbu [Wed, 22 Apr 2015 15:46:46 +0000 (16:46 +0100)]
JAL-1667_1668 added help documentation for PDB Sequence fetcher

9 years agoJAL-845 fix SplitFrame sizing on eXpand Views
gmungoc [Wed, 22 Apr 2015 14:21:22 +0000 (15:21 +0100)]
JAL-845 fix SplitFrame sizing on eXpand Views

9 years ago'Test' added to help identify "too small" font families/sizes
gmungoc [Wed, 22 Apr 2015 13:28:44 +0000 (14:28 +0100)]
'Test' added to help identify "too small" font families/sizes

9 years agoJAL-1690 fix NPE on Cancel when not in split frame
gmungoc [Wed, 22 Apr 2015 12:21:59 +0000 (13:21 +0100)]
JAL-1690 fix NPE on Cancel when not in split frame

9 years agoJAL-1667_1668 Updated documentation
tcofoegbu [Tue, 21 Apr 2015 15:42:28 +0000 (16:42 +0100)]
JAL-1667_1668 Updated documentation

9 years agoJAL-1693 mappings added back to the original alignment
gmungoc [Tue, 21 Apr 2015 12:54:13 +0000 (13:54 +0100)]
JAL-1693 mappings added back to the original alignment

9 years agoJAL-1702 wording improved; also some duplicate entries removed
gmungoc [Tue, 21 Apr 2015 11:45:53 +0000 (12:45 +0100)]
JAL-1702 wording improved; also some duplicate entries removed

9 years agoJAL-1667_1668 Documentation - Added a separate help file for the Structure Chooser...
tcofoegbu [Tue, 21 Apr 2015 10:28:48 +0000 (11:28 +0100)]
JAL-1667_1668 Documentation - Added a separate help file for the Structure Chooser interface

9 years agoJAL-1690 shorter text to fit in FontChooser dialog
gmungoc [Mon, 20 Apr 2015 14:41:58 +0000 (15:41 +0100)]
JAL-1690 shorter text to fit in FontChooser dialog

9 years agoJAL-1701 first draft of help page for Split View (not linked in)
gmungoc [Mon, 20 Apr 2015 14:41:27 +0000 (15:41 +0100)]
JAL-1701 first draft of help page for Split View (not linked in)

9 years agoMerge branch 'bug/JAL-1697_browse-local-structures' into Release_2_8_3_Branch
tcofoegbu [Fri, 17 Apr 2015 15:35:03 +0000 (16:35 +0100)]
Merge branch 'bug/JAL-1697_browse-local-structures' into Release_2_8_3_Branch

9 years agoJAL-1697 added ablity to select/view cached structures in the new structure chooser... bug/JAL-1697_browse-local-structures
tcofoegbu [Fri, 17 Apr 2015 15:33:52 +0000 (16:33 +0100)]
JAL-1697 added ablity to select/view cached structures in the new structure chooser interface

9 years agoMerge branch 'bug/JAL-1698_Append-Structures' into Release_2_8_3_Branch
tcofoegbu [Fri, 17 Apr 2015 09:39:13 +0000 (10:39 +0100)]
Merge branch 'bug/JAL-1698_Append-Structures' into Release_2_8_3_Branch

9 years agoJAL-1698 bug fix to enable addition of a single structure to an already launched... bug/JAL-1698_Append-Structures
tcofoegbu [Fri, 17 Apr 2015 09:34:35 +0000 (10:34 +0100)]
JAL-1698 bug fix to enable addition of a single structure to an already launched structure viewer

9 years agoJAL-1668 updated documentation
tcofoegbu [Fri, 17 Apr 2015 09:19:52 +0000 (10:19 +0100)]
JAL-1668 updated documentation

9 years agoJAL-1693 generate multiple exon sequences for 1-many dna-protein
gmungoc [Tue, 14 Apr 2015 19:56:29 +0000 (20:56 +0100)]
JAL-1693 generate multiple exon sequences for 1-many dna-protein
mappings

9 years agoMerge branch 'bug/Jal-1696_disable-pdb_id-field-settings' into Release_2_8_3_Branch
tcofoegbu [Tue, 14 Apr 2015 13:28:04 +0000 (14:28 +0100)]
Merge branch 'bug/Jal-1696_disable-pdb_id-field-settings' into Release_2_8_3_Branch

9 years agoJAL-1696 disabled editing of PDB Id field from settings bug/Jal-1696_disable-pdb_id-field-settings
tcofoegbu [Tue, 14 Apr 2015 13:26:29 +0000 (14:26 +0100)]
JAL-1696 disabled editing of PDB Id field from settings

9 years agoMerge branch 'Release_2_8_3_Branch' of https://source.jalview.org/git/jalview into...
tcofoegbu [Tue, 14 Apr 2015 08:54:31 +0000 (09:54 +0100)]
Merge branch 'Release_2_8_3_Branch' of https://source.jalview.org/git/jalview into Release_2_8_3_Branch

9 years agoJAL-1695 enableSplitFrame=true for applet example
gmungoc [Mon, 13 Apr 2015 15:57:16 +0000 (16:57 +0100)]
JAL-1695 enableSplitFrame=true for applet example

9 years agoJAL-1690 adjusted wording
gmungoc [Mon, 13 Apr 2015 15:36:31 +0000 (16:36 +0100)]
JAL-1690 adjusted wording

9 years agoJAL-1693 make exon alignment for get-xref splitframe (with CDS xref)
gmungoc [Mon, 13 Apr 2015 15:22:35 +0000 (16:22 +0100)]
JAL-1693 make exon alignment for get-xref splitframe (with CDS xref)

9 years agoJAL-1681 work around ConcurrentModificationException on startup
gmungoc [Mon, 13 Apr 2015 15:03:23 +0000 (16:03 +0100)]
JAL-1681 work around ConcurrentModificationException on startup

9 years agoJAL-1690 show 'scale protein' in protein _and_ dna menus; default true
gmungoc [Mon, 13 Apr 2015 14:59:59 +0000 (15:59 +0100)]
JAL-1690 show 'scale protein' in protein _and_ dna menus; default true

9 years agoJAL-1695 new property ENABLE_SPLIT_FRAME
gmungoc [Mon, 13 Apr 2015 14:58:02 +0000 (15:58 +0100)]
JAL-1695 new property ENABLE_SPLIT_FRAME

9 years agoJAL-1695 parameter controls whether SplitFrame is enabled
gmungoc [Mon, 13 Apr 2015 14:56:31 +0000 (15:56 +0100)]
JAL-1695 parameter controls whether SplitFrame is enabled

9 years agoJAL-1684 adjusting parameters for split frame applet example
gmungoc [Wed, 8 Apr 2015 14:24:29 +0000 (15:24 +0100)]
JAL-1684 adjusting parameters for split frame applet example

9 years agoJAL-1690 scaleProteinAsCdna new applet parameter documented
gmungoc [Wed, 8 Apr 2015 14:23:17 +0000 (15:23 +0100)]
JAL-1690 scaleProteinAsCdna new applet parameter documented

9 years agoJAL-1270 protection against NullPointer when run as JUnit
gmungoc [Wed, 8 Apr 2015 14:22:08 +0000 (15:22 +0100)]
JAL-1270 protection against NullPointer when run as JUnit

9 years agoJAL-1691 applet SplitFrame scrolling; pull up of 5 fields to
gmungoc [Wed, 8 Apr 2015 14:21:23 +0000 (15:21 +0100)]
JAL-1691 applet SplitFrame scrolling; pull up of 5 fields to
AlignmentViewport

9 years agoJAL-1270 separated standalone tests out of Jws2ParamView, interactive
gmungoc [Wed, 8 Apr 2015 14:17:55 +0000 (15:17 +0100)]
JAL-1270 separated standalone tests out of Jws2ParamView, interactive
test marked @Ignore

9 years agoJAL-1270 test added
gmungoc [Tue, 7 Apr 2015 08:18:49 +0000 (09:18 +0100)]
JAL-1270 test added

9 years agoJAL-1691 linked scrollling in split frame (Desktop)
gmungoc [Tue, 7 Apr 2015 08:18:26 +0000 (09:18 +0100)]
JAL-1691 linked scrollling in split frame (Desktop)

9 years agoJAL-1691 defensive check for null
gmungoc [Tue, 7 Apr 2015 08:17:00 +0000 (09:17 +0100)]
JAL-1691 defensive check for null

9 years agoJAL-1690 'scale protein as cDNA' options in Preferences, FontChooser
gmungoc [Thu, 2 Apr 2015 14:37:06 +0000 (15:37 +0100)]
JAL-1690 'scale protein as cDNA' options in Preferences, FontChooser

9 years agoJAL-845 fixed start/end range of a mapped SequenceGroup
gmungoc [Wed, 1 Apr 2015 13:59:27 +0000 (14:59 +0100)]
JAL-845 fixed start/end range of a mapped SequenceGroup

9 years agoJAL-1264 reinstate Show annotations menu item
gmungoc [Wed, 1 Apr 2015 13:57:24 +0000 (14:57 +0100)]
JAL-1264 reinstate Show annotations menu item

9 years agoJAL-1264 remove broken applet build dependencies
gmungoc [Mon, 30 Mar 2015 14:18:25 +0000 (15:18 +0100)]
JAL-1264 remove broken applet build dependencies

9 years agoJAL-1270 fall back on compbio if no localhost:8080/jabaws
gmungoc [Mon, 30 Mar 2015 09:57:40 +0000 (10:57 +0100)]
JAL-1270 fall back on compbio if no localhost:8080/jabaws

9 years agoJAL-1596 refactoring to allow unit tests to start and shut down Chimera
gmungoc [Mon, 30 Mar 2015 09:05:22 +0000 (10:05 +0100)]
JAL-1596 refactoring to allow unit tests to start and shut down Chimera

9 years agoJAL-1270 Cache.logger initialisation added
gmungoc [Mon, 30 Mar 2015 09:01:02 +0000 (10:01 +0100)]
JAL-1270 Cache.logger initialisation added

9 years agoMerge branch 'merge/JAL-1667_PDBe_Search_API' into Release_2_8_3_Branch
tcofoegbu [Fri, 27 Mar 2015 13:23:42 +0000 (13:23 +0000)]
Merge branch 'merge/JAL-1667_PDBe_Search_API' into Release_2_8_3_Branch

9 years agoJAL-1667 updated the collection type for searchSummaryFields and structureSummaryFiel...
tcofoegbu [Fri, 27 Mar 2015 13:22:09 +0000 (13:22 +0000)]
JAL-1667 updated the collection type for searchSummaryFields and structureSummaryFields preferences

9 years agoMerge branch 'merge/JAL-1667_PDBe_Search_API' into Release_2_8_3_Branch
tcofoegbu [Fri, 27 Mar 2015 11:43:50 +0000 (11:43 +0000)]
Merge branch 'merge/JAL-1667_PDBe_Search_API' into Release_2_8_3_Branch

9 years agomerge commit
tcofoegbu [Fri, 27 Mar 2015 11:37:34 +0000 (11:37 +0000)]
merge commit

9 years agoJAL-1667 updated parseJsonExceptionString method in PDBRestClient.java and its equiva... features/JAL-1667_PDBe_Search_API
tcofoegbu [Thu, 26 Mar 2015 15:15:39 +0000 (15:15 +0000)]
JAL-1667 updated parseJsonExceptionString method in PDBRestClient.java and its equivalent test case in PDBRestClientTest.java

9 years agoUpdated BioJsHTMLOutputTest asserts to include error messages for failed Assertions
tcofoegbu [Thu, 26 Mar 2015 12:49:15 +0000 (12:49 +0000)]
Updated BioJsHTMLOutputTest asserts to include error messages for failed Assertions

9 years agoMerge branch 'Release_2_8_3_Branch' of https://source.jalview.org/git/jalview into...
tcofoegbu [Thu, 26 Mar 2015 12:25:43 +0000 (12:25 +0000)]
Merge branch 'Release_2_8_3_Branch' of https://source.jalview.org/git/jalview into Release_2_8_3_Branch

9 years agoModified BioJsHTMLOutputTest to test specific json object values rather than comparin...
tcofoegbu [Thu, 26 Mar 2015 12:25:12 +0000 (12:25 +0000)]
Modified BioJsHTMLOutputTest to test specific json object values rather than comparing the raw json string values which are not usually ordered

9 years agoMerge develop to Release_2_8_3_Branch
gmungoc [Thu, 26 Mar 2015 11:14:54 +0000 (11:14 +0000)]
Merge develop to Release_2_8_3_Branch

9 years agoJAL-1688 compiler warnings removed
gmungoc [Thu, 26 Mar 2015 09:57:03 +0000 (09:57 +0000)]
JAL-1688 compiler warnings removed

9 years agoJAL-1665 getSequenceFeatures; Desktop.getAlignFrames camel-cased
gmungoc [Thu, 26 Mar 2015 09:52:09 +0000 (09:52 +0000)]
JAL-1665 getSequenceFeatures; Desktop.getAlignFrames camel-cased

9 years agoJAL-1270 System.exit(0) changed to fail() so as not to abort test suite
gmungoc [Wed, 25 Mar 2015 14:06:58 +0000 (14:06 +0000)]
JAL-1270 System.exit(0) changed to fail() so as not to abort test suite

9 years agoJAL-1667 clean up commented codes in PopupMenu.java and StructureChooser.java
tcofoegbu [Wed, 25 Mar 2015 10:27:43 +0000 (10:27 +0000)]
JAL-1667 clean up commented codes in PopupMenu.java and StructureChooser.java

9 years agoJAL-1668 Tab for summary config, auto refresh after config and table column sorting
tcofoegbu [Wed, 25 Mar 2015 09:39:53 +0000 (09:39 +0000)]
JAL-1668 Tab for summary config, auto refresh after config and table column sorting

9 years agoJAL-1668 finally clean up
tcofoegbu [Thu, 19 Mar 2015 14:50:29 +0000 (14:50 +0000)]
JAL-1668 finally clean up

9 years agoJAL-1668 house keeping
Charles Ofoegbu [Wed, 18 Mar 2015 17:05:03 +0000 (17:05 +0000)]
JAL-1668 house keeping

9 years agoJAL-1668 added PDBDocFieldPreference for configuring rest response summary fields
Charles Ofoegbu [Wed, 18 Mar 2015 10:58:26 +0000 (10:58 +0000)]
JAL-1668 added PDBDocFieldPreference for configuring rest response summary fields

9 years agoJAL-1668 added validation for manual entry of pdb structures
Charles Ofoegbu [Mon, 16 Mar 2015 17:31:16 +0000 (17:31 +0000)]
JAL-1668 added validation for manual entry of pdb structures

9 years agoJAL-1667 updated test and internationalization messages
Charles Ofoegbu [Sun, 15 Mar 2015 15:10:40 +0000 (15:10 +0000)]
JAL-1667 updated test and internationalization messages

9 years agoMerge branch 'features/JAL-1565_jpred4' into Release_2_8_3_Branch
Jim Procter [Mon, 9 Mar 2015 12:52:11 +0000 (12:52 +0000)]
Merge branch 'features/JAL-1565_jpred4' into Release_2_8_3_Branch

9 years agoJAL-1565 loading a concise file causes insertions to be automatically hidden in desktop
Jim Procter [Mon, 9 Mar 2015 12:51:46 +0000 (12:51 +0000)]
JAL-1565 loading a concise file causes insertions to be automatically hidden in desktop

9 years agoJAL-1668 added filtering and sorting capabilites
Charles Ofoegbu [Fri, 6 Mar 2015 19:17:14 +0000 (19:17 +0000)]
JAL-1668 added filtering and sorting capabilites

9 years agoJAL-1683 bump version for r2.8.3 branch
Jim Procter [Fri, 6 Mar 2015 15:29:03 +0000 (15:29 +0000)]
JAL-1683 bump version for r2.8.3 branch

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