Skip to content

Commit

Permalink
Merge pull request #296 from JasonHHouse/bugfix/toolbar_fix
Browse files Browse the repository at this point in the history
0.10.2
  • Loading branch information
JasonHHouse authored Mar 11, 2022
2 parents d622d81 + b14c4f7 commit 38fecbd
Show file tree
Hide file tree
Showing 18 changed files with 61 additions and 80 deletions.
2 changes: 1 addition & 1 deletion Core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>Gaps</artifactId>
<groupId>com.jasonhhouse</groupId>
<version>0.10.1</version>
<version>0.10.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/app

WORKDIR /usr/app

COPY GapsWeb/target/GapsWeb-0.10.1.jar /usr/app/gaps.jar
COPY GapsWeb/target/GapsWeb-0.10.2.jar /usr/app/gaps.jar

COPY start.sh /usr/app/

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.riscv64
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/app

WORKDIR /usr/app

COPY GapsWeb/target/GapsWeb-0.10.1.jar /usr/app/gaps.jar
COPY GapsWeb/target/GapsWeb-0.10.2.jar /usr/app/gaps.jar

COPY start.sh /usr/app/

Expand Down
2 changes: 1 addition & 1 deletion GapsAsJar/gaps.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ RMDIR /r $INSTDIR
SectionEnd

# name the installer
OutFile "gaps-0.10.1-installer.exe"
OutFile "gaps-0.10.2-installer.exe"
2 changes: 1 addition & 1 deletion GapsWeb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>Gaps</artifactId>
<groupId>com.jasonhhouse</groupId>
<version>0.10.1</version>
<version>0.10.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion GapsWeb/src/main/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ info:
app:
name: Gaps
description: Gaps searches through your Plex Server for all movies, then queries for known movies in the same collection. If those movies don't exist in your library, Gaps will recommend getting those movies, legally of course.
version: 0.10.1
version: 0.10.2
storageFolder: /usr/data
properties:
rssFeed: rssFeed.json
Expand Down
2 changes: 1 addition & 1 deletion GapsWeb/src/main/resources/templates/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<img loading="lazy" th:src="@{/images/final-2.svg}" alt="Gaps Logo" style="width:50%;height:50%;" class="center">

<h3 class="top-margin">About</h3>
<h4 class="top-margin text-primary">v0.10.1</h4>
<h4 class="top-margin text-primary">v0.10.2</h4>

<p class="text-muted">Gaps searches through your Plex Server. It then queries
for known
Expand Down
2 changes: 1 addition & 1 deletion GapsWeb/src/main/resources/templates/fragments/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</head>
<body>
<header th:fragment="navBar">
<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
<nav class="navbar navbar-expand navbar-expand-lg navbar-dark bg-primary">
<a class="" th:href="@{/}">
<img alt="" class="d-inline-block align-top" height="96" th:src="@{/images/final-gaps.svg}" width="96">
</a>
Expand Down
2 changes: 1 addition & 1 deletion GapsWeb/src/main/resources/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<div class="container bottom-margin">
<img loading="lazy" th:src="@{/images/final-2.svg}" alt="Gaps Logo" style="width:50%;height:50%;" class="center">

<h3 class="top-margin">v0.10.1</h3>
<h3 class="top-margin">v0.10.2</h3>

<p class="text-muted">Gaps searches through your Plex Server. It then queries
for known
Expand Down
7 changes: 7 additions & 0 deletions GapsWeb/src/main/resources/templates/updates.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@
<div class="container">
<img loading="lazy" th:src="@{/images/final-2.svg}" alt="Gaps Logo" style="width:50%;height:50%;" class="center">

<h3 class="top-margin">Updates</h3>
<h4 class="top-margin text-primary">v0.10.2</h4>
<ul class="text-muted">
<li>Updating spring boot and cypress</li>
<li>Fixed toolbar icons disappearing when resizing to smaller width</li>
</ul>

<h3 class="top-margin">Updates</h3>
<h4 class="top-margin text-primary">v0.10.1</h4>
<ul class="text-muted">
Expand Down
2 changes: 1 addition & 1 deletion Plex/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>Gaps</artifactId>
<groupId>com.jasonhhouse</groupId>
<version>0.10.1</version>
<version>0.10.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion RadarrV3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>Gaps</artifactId>
<groupId>com.jasonhhouse</groupId>
<version>0.10.1</version>
<version>0.10.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion application-custom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ info:
app:
name: Gaps
description: Gaps searches through your Plex Server for all movies, then queries for known movies in the same collection. If those movies don't exist in your library, Gaps will recommend getting those movies, legally of course.
version: 0.10.1
version: 0.10.2
storageFolder: /{CUSTOM_FOLDER} #Change to folder that gaps has permission to read, write, and delete in.
properties:
rssFeed: rssFeed.json
Expand Down
2 changes: 1 addition & 1 deletion build
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
##

set -e
VERSION=0.10.1
VERSION=0.10.2
JAR_VERSION="GapsWeb/target/GapsWeb-$VERSION.jar"
ZIP_VERSION="GapsAsJar-$VERSION.zip"
npm ci
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/about/about.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe('Verify About Page', () => {
.should('have.text', 'About');

cy.get('.container > :nth-child(3)')
.should('have.text', 'v0.10.1');
.should('have.text', 'v0.10.2');

cy.get('.container > :nth-child(6)')
.should('have.text', 'Software');
Expand Down
96 changes: 35 additions & 61 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gaps",
"version": "0.10.1",
"version": "0.10.2",
"description": "Gaps searches through your Plex Server for all movies, then queries for known movies in the same collection. If those movies don't exist in your library, Gaps will recommend getting those movies, legally of course.",
"main": "/",
"dependencies": {
Expand All @@ -16,7 +16,7 @@
"@babel/core": "^7.16.7",
"@babel/node": "^7.16.7",
"@babel/preset-env": "^7.16.7",
"cypress": "^9.2.0",
"cypress": "^9.5.1",
"eslint": "^8.6.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-plugin-import": "^2.25.4",
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.3</version>
<version>2.6.4</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.jasonhhouse</groupId>
<artifactId>Gaps</artifactId>
<version>0.10.1</version>
<version>0.10.2</version>
<name>Gaps</name>
<description>Demo project for Spring Boot</description>

Expand All @@ -26,7 +26,7 @@
<apache.commons.lang3>3.9</apache.commons.lang3>
<apache.commons.text>1.9</apache.commons.text>
<commons.io>2.11.0</commons.io>
<gaps.version>0.10.1</gaps.version>
<gaps.version>0.10.2</gaps.version>
<google.findbugs>3.0.0</google.findbugs>
<guava>31.0.1-jre</guava>
<hibernate.validator>6.1.5.Final</hibernate.validator>
Expand Down

0 comments on commit 38fecbd

Please sign in to comment.