Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to graphANNIS 3.3.2 #863

Merged
merged 2 commits into from
Jul 4, 2024
Merged

Update to graphANNIS 3.3.2 #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08626c9
Update to graphANNIS 3.3.2
thomaskrause Jul 4, 2024
a3c0e89
Recompiled CSS files
thomaskrause Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
when the "layer" is not specified in the resolver configuration. Before this
fix, the layer name was not checked, but the node still needed to be part of a
layer.
- Updated to graphANNIS 3.3.2 which fixes an issue where a backup folder in the
database might not be loaded correctly.

## [4.12.2] - 2024-06-04

Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<vaadin.version>8.14.3</vaadin.version>
<vaadin.productionMode>true</vaadin.productionMode>
<start-class>org.corpus_tools.annis.gui.AnnisUiApplication</start-class>
<graphannis.version>3.3.1</graphannis.version>
<graphannis.version>3.3.2</graphannis.version>
<antlr4.version>4.7.2</antlr4.version>
<spring.profiles.active>server</spring.profiles.active>
<swagger-core-version>1.5.24</swagger-core-version>
Expand Down Expand Up @@ -261,7 +261,7 @@
https://github.com/korpling/graphANNIS/releases/download/v${graphannis.version}/graphannis-webservice-x86_64-unknown-linux-gnu.tar.xz</url>
<outputDirectory>
${project.build.directory}/native/</outputDirectory>
<sha256>63cd880aee2eda2fe95f5dff74dc3dd7162b042e893c51925bee56c094c89e4c</sha256>
<sha256>be451a640653d267d9d1fc8bdb66d5793ae4412523288a90da41a0b54cb34cb3</sha256>
<unpack>true</unpack>
</configuration>
</execution>
Expand All @@ -276,7 +276,7 @@
https://github.com/korpling/graphANNIS/releases/download/v${graphannis.version}/graphannis-webservice-x86_64-pc-windows-msvc.zip</url>
<outputDirectory>
${project.build.directory}/native/win32-x86-64/</outputDirectory>
<sha256>28884c784073b407e692b55873f60f59d687f5241af1d09b1fcdc1e77af8cd99</sha256>
<sha256>d8433a00ffe985ff2147d103061d113c6efc185f682f07dd1b6069362c013fd5</sha256>
<unpack>true</unpack>
</configuration>
</execution>
Expand All @@ -291,7 +291,7 @@
https://github.com/korpling/graphANNIS/releases/download/v${graphannis.version}/graphannis-webservice-x86_64-apple-darwin.tar.xz</url>
<outputDirectory>
${project.build.directory}/native/</outputDirectory>
<sha256>ac9d33f70865781c956d977e952ab5051360137811179dddb715fc496556539d</sha256>
<sha256>bab9dc86c413fd85c369ff8d4feeb9c76ef1adb81343a2edb8b5633794c6b0a2</sha256>
<unpack>true</unpack>
</configuration>
</execution>
Expand Down
1 change: 0 additions & 1 deletion src/main/webapp/VAADIN/help/css/general.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
:root {
/* Browser default font-size is 16px, this way 1 rem = 10px */
font-size: 62.5%;
color-scheme: var(--color-scheme);
}

html {
Expand Down
8 changes: 8 additions & 0 deletions src/main/webapp/VAADIN/help/css/print.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@
overflow-y: initial;
}

code {
background-color: #666666;
border-radius: 5px;

/* Force background to be printed in Chrome */
-webkit-print-color-adjust: exact;
}

pre > .buttons {
z-index: 2;
}
Expand Down
10 changes: 0 additions & 10 deletions src/main/webapp/VAADIN/help/css/variables.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@
--searchresults-border-color: #888;
--searchresults-li-bg: #252932;
--search-mark-bg: #e3b171;

--color-scheme: dark;
}

.coal {
Expand Down Expand Up @@ -92,8 +90,6 @@
--searchresults-border-color: #98a3ad;
--searchresults-li-bg: #2b2b2f;
--search-mark-bg: #355c7d;

--color-scheme: dark;
}

.light {
Expand Down Expand Up @@ -134,8 +130,6 @@
--searchresults-border-color: #888;
--searchresults-li-bg: #e4f2fe;
--search-mark-bg: #a2cff5;

--color-scheme: light;
}

.navy {
Expand Down Expand Up @@ -176,8 +170,6 @@
--searchresults-border-color: #5c5c68;
--searchresults-li-bg: #242430;
--search-mark-bg: #a2cff5;

--color-scheme: dark;
}

.rust {
Expand Down Expand Up @@ -218,8 +210,6 @@
--searchresults-border-color: #888;
--searchresults-li-bg: #dec2a2;
--search-mark-bg: #e69f67;

--color-scheme: light;
}

@media (prefers-color-scheme: dark) {
Expand Down
Loading