Commit ef80cc12 authored by Matija Obreza's avatar Matija Obreza
Browse files

Merge branch '16-release-1-2' into 'master'

Resolve "Release 1.2"

Closes #16

See merge request !14
parents fdab4f0a 368ab799
# changelog # Changelog
## Anno 1.2
- fdab4f0 Column background colors updated
- 2f184e0 Repaint table view if RDF term changes
- b646529 Use Java 8
- 3156922 Improved Excel source
- ca43613 Client ID label
- 70fa3e1 Repaint SheetView after Automap/Unmap
- 16ab91b Reset mapping button
- 58b20e9 Fixed jump-bug on column selection
- 38729c9 Highlight selected column
- e61372b Troubleshooting: JRE auto-detection on Windows
- bd97471 Include INSTCODE and ACCENUMB in error message
- 4eee61d Anno manual updates by Paul Cox, Scriptoria
## Anno 1.1 ## Anno 1.1
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.genesys-pgr</groupId> <groupId>org.genesys-pgr</groupId>
<artifactId>anno</artifactId> <artifactId>anno</artifactId>
<version>1.2-SNAPSHOT</version> <version>1.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>anno-docs</artifactId> <artifactId>anno-docs</artifactId>
<name>Genesys Uploader documentation</name> <name>Genesys Uploader documentation</name>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>org.genesys-pgr</groupId> <groupId>org.genesys-pgr</groupId>
<artifactId>anno</artifactId> <artifactId>anno</artifactId>
<version>1.2-SNAPSHOT</version> <version>1.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>anno-gui-macosx</artifactId> <artifactId>anno-gui-macosx</artifactId>
<name>Anno for MacOSX</name> <name>Anno for MacOSX</name>
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<dependency> <dependency>
<groupId>org.genesys-pgr</groupId> <groupId>org.genesys-pgr</groupId>
<artifactId>anno-gui</artifactId> <artifactId>anno-gui</artifactId>
<version>1.2-SNAPSHOT</version> <version>1.3-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.swt</groupId> <groupId>org.eclipse.swt</groupId>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>org.genesys-pgr</groupId> <groupId>org.genesys-pgr</groupId>
<artifactId>anno</artifactId> <artifactId>anno</artifactId>
<version>1.2-SNAPSHOT</version> <version>1.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>anno-gui-package</artifactId> <artifactId>anno-gui-package</artifactId>
<build> <build>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<dependency> <dependency>
<groupId>org.genesys-pgr</groupId> <groupId>org.genesys-pgr</groupId>
<artifactId>anno-gui</artifactId> <artifactId>anno-gui</artifactId>
<version>1.2-SNAPSHOT</version> <version>1.3-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.swt</groupId> <groupId>org.eclipse.swt</groupId>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>org.genesys-pgr</groupId> <groupId>org.genesys-pgr</groupId>
<artifactId>anno</artifactId> <artifactId>anno</artifactId>
<version>1.2-SNAPSHOT</version> <version>1.3-SNAPSHOT</version>
</parent> </parent>
<artifactId>anno-gui</artifactId> <artifactId>anno-gui</artifactId>
<name>Data annotator GUI</name> <name>Data annotator GUI</name>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.genesys-pgr</groupId> <groupId>org.genesys-pgr</groupId>
<artifactId>anno</artifactId> <artifactId>anno</artifactId>
<version>1.2-SNAPSHOT</version> <version>1.3-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Data annotator</name> <name>Data annotator</name>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment