Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Jannik 2017-07-26 18:14:46 +02:00
commit 3a18a73ee8
1 changed files with 7 additions and 7 deletions

View File

@ -1,20 +1,20 @@
# Project-HomeFlix # Project-HomeFlix
Project-HomeFlix is a Kellerkinder Project, that alowes you to sort all your local saved movies in clean UI. Project-HomeFlix is free and open-source software and uses other open-source projects to provied a nice user experience.
## Installation
Simply download the Project-HomeFlix.jar from [releases](https://github.com/Seil0/Project-HomeFlix/releases), make sure you have the latest version of java 8 oracle jre/jdk installed, open the .jar file. If you need additional information pleas visit our [wiki](https://github.com/Seil0/Project-HomeFlix/wiki).
Project HomeFlix is a Kellerkinder Project, that alowes you to sort all your local saved movies in clean UI. ## Development information
The dev branch is **only merged** into master when a **new release** is released, so **master contains the latest released version**. Please commit all changes to [dev](https://github.com/Seil0/Project-HomeFlix/tree/dev). The dev branch is **only merged** into master when a **new release** is released, so **master contains the latest released version**. Please commit all changes to [dev](https://github.com/Seil0/Project-HomeFlix/tree/dev).
**Due to some changes with the API we use(not provided by us), the query does not work at the moment!**
Librarys used in this Project: Librarys used in this Project:
JFoenix: https://github.com/jfoenixadmin/JFoenix JFoenix: https://github.com/jfoenixadmin/JFoenix
minimal-json: https://github.com/ralfstx/minimal-json minimal-json: https://github.com/ralfstx/minimal-json
sqlite-jdbc: https://github.com/xerial/sqlite-jdbc sqlite-jdbc: https://github.com/xerial/sqlite-jdbc
apache commons io : https://commons.apache.org/proper/commons-io/ apache commons io : https://commons.apache.org/proper/commons-io/
## Installation ## screenshots
![Screenshot](https://github.com/Seil0/Seil0.github.io/blob/master/pictures/Project-HomeFlix_MainWindow.png)
[wiki](https://github.com/Seil0/Project-HomeFlix/wiki) Project-HomeFlix © 2016-2017 Kellerkinder ([Seil0](https://github.com/Seil0), [Windoofs](https://github.com/Windoofs))
Project HomeFlix © 2016-2017 Kellerkinder ([Seil0](https://github.com/Seil0), [Windoofs](https://github.com/Windoofs))
www.kellerkinder.xyz www.kellerkinder.xyz