Skip to content

Commit

Permalink
Merge pull request #167 from JasonHHouse/improvement/adding_open_coll…
Browse files Browse the repository at this point in the history
…ective

Improvement/adding open collective
  • Loading branch information
JasonHHouse authored Sep 10, 2020
2 parents 4251f23 + 38211cf commit da78590
Show file tree
Hide file tree
Showing 19 changed files with 44 additions and 22 deletions.
4 changes: 2 additions & 2 deletions 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.7.4</version>
<version>0.7.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -15,7 +15,7 @@
<dependency>
<groupId>com.jasonhhouse</groupId>
<artifactId>Plex</artifactId>
<version>0.7.4</version>
<version>0.7.5</version>
</dependency>

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

WORKDIR /usr/app

COPY GapsWeb/target/GapsWeb-0.7.4.jar /usr/app/gaps.jar
COPY GapsWeb/target/GapsWeb-0.7.5.jar /usr/app/gaps.jar

COPY start.sh /usr/app/

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

WORKDIR /usr/app

COPY GapsWeb/target/GapsWeb-0.7.4.jar /usr/app/gaps.jar
COPY GapsWeb/target/GapsWeb-0.7.5.jar /usr/app/gaps.jar

COPY start.sh /usr/app/

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

WORKDIR /usr/app

COPY GapsWeb/target/GapsWeb-0.7.4.jar /usr/app/gaps.jar
COPY GapsWeb/target/GapsWeb-0.7.5.jar /usr/app/gaps.jar

COPY start.sh /usr/app/

Expand Down
2 changes: 1 addition & 1 deletion GapsOnWindows/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.7.4-installer.exe"
OutFile "gaps-0.7.5-installer.exe"
6 changes: 3 additions & 3 deletions 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.7.4</version>
<version>0.7.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -21,13 +21,13 @@
<dependency>
<groupId>com.jasonhhouse</groupId>
<artifactId>Core</artifactId>
<version>0.7.4</version>
<version>0.7.5</version>
</dependency>

<dependency>
<groupId>com.jasonhhouse</groupId>
<artifactId>Plex</artifactId>
<version>0.7.4</version>
<version>0.7.5</version>
</dependency>

<dependency>
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 @@ -47,7 +47,7 @@ info:
app:
name: Gaps
description: Gaps searches through your Plex Server or local folders 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.7.4
version: 0.7.5
storageFolder: /usr/data
properties:
rssFeed: rssFeed.json
Expand Down
11 changes: 8 additions & 3 deletions GapsWeb/src/main/resources/templates/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<img 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.7.4</h4>
<h4 class="top-margin text-primary">v0.7.5</h4>

<p class="text-muted">Gaps searches through your Plex Server. It then queries
for known
Expand All @@ -103,8 +103,13 @@ <h4 class="top-margin text-primary">License</h4>
<p class="text-muted">Gaps license can be found <a href="https://github.com/JasonHHouse/Gaps/blob/master/LICENSE">here</a>.</p>

<h4 class="top-margin text-primary">Support</h4>
<p class="text-muted">While Gaps is free to use, donations are greatly appreciated. Any donations can be done through <a
href="https://paypal.me/thehousewrecker?locale.x=en_US">PayPal.</a></p>
<p class="text-muted">While Gaps is free to use, donations are greatly appreciated. Any donations can be sent through a few different options.</p>
<ul>
<li><a href="https://paypal.me/thehousewrecker?locale.x=en_US" target="_blank">PayPal</a></li>
<li><a href="https://opencollective.com/gaps" target="_blank">Become a Sponsor</a></li>
<li><a href="https://pay.google.com/" target="_blank">Google Pay via [email protected]</a></li>
</ul>

</div>

<script src="/js/libraries/jquery-3.4.1.min.js" type="text/javascript"></script>
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 @@ -77,7 +77,7 @@
<div class="container bottom-margin">
<img src="/images/final-2.svg" alt="Gaps Logo" style="width:50%;height:50%;" class="center">

<h3 class="top-margin">v0.7.4</h3>
<h3 class="top-margin">v0.7.5</h3>

<p class="text-muted">Gaps searches through your Plex Server. It then queries
for known
Expand Down
5 changes: 5 additions & 0 deletions GapsWeb/src/main/resources/templates/updates.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@
<img 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.7.5</h4>
<ul class="text-muted">
<li>Updating About page</li>
</ul>

<h4 class="top-margin text-primary">v0.7.4</h4>
<ul class="text-muted">
<li>Added auto restart to scheduler</li>
Expand Down
2 changes: 1 addition & 1 deletion GapsWeb/src/test/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ info:
app:
name: Gaps
description: Gaps searches through your Plex Server or local folders 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.7.4
version: 0.7.5
loginEnabled: false
storageFolder: /usr/data
properties:
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.7.4</version>
<version>0.7.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,18 @@ Once you've completed at least one search of your plex libraries, you can then v
- [Spring Boot](https://spring.io/projects/spring-boot) - Server Framework
- [NodeJs](https://nodejs.org/en/) - Testing and Build Environment

## Supporters

This project would not be possible without the support by these amazing folks. [**Become a sponsor or backer**](https://opencollective.com/gaps) to help us out!

### Sponsors

[![Sponsors](https://opencollective.com/gaps/tiers/sponsor.svg)](https://opencollective.com/gaps/order/3851)

### Backers

[![Backers](https://opencollective.com/gaps/tiers/backer.svg?avatarHeight=48)](https://opencollective.com/gaps/order/3850)

## ✍️ Authors <a name = "authors"></a>
- [@JasonHHouse](https://github.com/JasonHHouse) - Idea & Initial work

Expand Down
2 changes: 1 addition & 1 deletion build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
VERSION=0.7.4
VERSION=0.7.5
JAR_VERSION="GapsWeb/target/GapsWeb-$VERSION.jar"
ZIP_VERSION="Gaps-$VERSION.zip"
./minify
Expand Down
2 changes: 1 addition & 1 deletion build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ call npm run uglifyjs-schedule-js
call mvn clean install
del GapsOnWindows\*.jar
del GapsOnWindows\README.md
copy GapsWeb\target\GapsWeb-0.7.4.jar GapsOnWindows\gaps.jar
copy GapsWeb\target\GapsWeb-0.7.5.jar GapsOnWindows\gaps.jar
copy README.md GapsOnWindows\
cd GapsOnWindows
makensis gaps.nsi
2 changes: 1 addition & 1 deletion cypress/integration/about/about.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ describe('Verify About Page', function () {
.should('have.text', 'About');

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

cy.get('.container > :nth-child(6)')
.should('have.text', 'Software');
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gaps",
"version": "0.7.4",
"version": "0.7.5",
"description": "Gaps searches through your Plex Server or local folders 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 Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</parent>
<groupId>com.jasonhhouse</groupId>
<artifactId>Gaps</artifactId>
<version>0.7.4</version>
<version>0.7.5</version>
<name>Gaps</name>
<description>Demo project for Spring Boot</description>

Expand Down

0 comments on commit da78590

Please sign in to comment.