Merge branch 'master' into Multi-user

app/Item.php

@@ -41,6 +41,7 @@ class Item extends Model
             'Cardigann' => \App\SupportedApps\Cardigann::class,
             'CouchPotato' => \App\SupportedApps\CouchPotato::class,
             'Bazarr' => \App\SupportedApps\Bazarr::class,
+            'Bitwarden' => \App\SupportedApps\Bitwarden::class,
             'Booksonic' => \App\SupportedApps\Booksonic::class,
             'BookStack' => \App\SupportedApps\BookStack::class,
             'Deluge' => \App\SupportedApps\Deluge::class,
@@ -62,6 +63,7 @@ class Item extends Model
             'Lidarr' => \App\SupportedApps\Lidarr::class,
             'Mcmyadmin' => \App\SupportedApps\Mcmyadmin::class,
             'Medusa' => \App\SupportedApps\Medusa::class,
+            'Monica' => \App\SupportedApps\Monica::class,
             'MusicBrainz' => \App\SupportedApps\MusicBrainz::class,
             'Mylar' => \App\SupportedApps\Mylar::class,
             'NZBGet' => \App\SupportedApps\Nzbget::class,

app/SupportedApps/Bitwarden.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Bitwarden implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#3c8dbc';
+    }
+    public function icon()
+    {
+        return 'supportedapps/bitwarden.png';
+    }
+}

app/SupportedApps/Monica.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Monica implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#fafbfc';
+    }
+    public function icon()
+    {
+        return 'supportedapps/monica.png';
+    }
+}

readme.md

@@ -4,7 +4,7 @@
 
 [![Discord](https://img.shields.io/discord/354974912613449730.svg)](https://discord.gg/CCjHKn4)
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg)](https://hub.docker.com/r/linuxserver/heimdall/)
-[![firsttimersonly](http://img.shields.io/badge/first--timers--only-friendly-blue.svg)](https://www.firsttimersonly.com/)
+[![firsttimersonly](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](https://www.firsttimersonly.com/)
 [![Paypal](https://heimdall.site/img/paypaldonate.svg)](https://paypal.me/pools/c/81ZR4dfBGo)
 
 ___
@@ -17,15 +17,15 @@ As the name suggests Heimdall Application Dashboard is a dashboard for all your
 
 Heimdall is an elegant solution to organise all your web applications. It’s dedicated to this purpose so you won’t lose your links in a sea of bookmarks.
 
-Why not use it as your browser start page?  It even has the ability to include a search bar using either Google, Bing or DuckDuckGo.
+Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo.
 
-![alt text](https://i.imgur.com/MrC4QpN.gif)
+![Heimdall demo animation](https://i.imgur.com/MrC4QpN.gif)
 
 ## Video
 If you want to see a quick video of it in use, go to https://youtu.be/GXnnMAxPzMc
 
 ## Supported applications
-You can use the app to link to any site or application, but Foundation apps will auto fill in the icon for the app and supply a default color for the tile.  In addition Enhanced apps allow you provide details to an apps API, allowing you to view live stats directly on the dashboad.  For example, the NZBGet and Sabnzbd Enhanced apps will display the queue size and download speed while something is downloading.
+You can use the app to link to any site or application, but Foundation apps will auto fill in the icon for the app and supply a default color for the tile. In addition Enhanced apps allow you provide details to an apps API, allowing you to view live stats directly on the dashboad. For example, the NZBGet and Sabnzbd Enhanced apps will display the queue size and download speed while something is downloading.
 
 Supported applications are recognized by the title of the application as entered in the title field when adding an application. For example, to add a link to pfSense, begin by typing "p" in the title field and then select "pfSense" from the list of supported applications.
 
@@ -45,6 +45,7 @@ Supported applications are recognized by the title of the application as entered
 **Foundation**
 - AirSonic
 - Bazarr
+- Bitwarden
 - Booksonic
 - BookStack
 - Cardigann
@@ -62,6 +63,7 @@ Supported applications are recognized by the title of the application as entered
 - Lidarr
 - McMyAdmin
 - Medusa
+- Monica
 - MusicBrainz
 - Mylar
 - NZBhydra & NZBhydra2
@@ -92,17 +94,13 @@ Supported applications are recognized by the title of the application as entered
 ## Installing
 Apart from the Laravel dependencies, namely PHP >= 7.0.0, OpenSSL PHP Extension, PDO PHP Extension, Mbstring PHP Extension, Tokenizer PHP Extension and XML PHP Extension, the only other thing Heimdall needs is sqlite support.
 
-If you find you can't change the background make sure php_fileinfo is enabled in your php.ini.  I believe it should be by default, but one user came across the issue on a windows system.
+If you find you can't change the background make sure `php_fileinfo` is enabled in your php.ini. I believe it should be by default, but one user came across the issue on a windows system.
 
-Installation is as simple as cloning the repository somewhere, or downloading and extracting the zip/tar and pointing your httpd document root to the `/public` folder.  For simple testing you could just go to the folder and type `php artisan serve`
+Installation is as simple as cloning the repository somewhere, or downloading and extracting the zip/tar and pointing your httpd document root to the `/public` folder. For simple testing you could just go to the folder and type `php artisan serve`
 
-There are also dockers and instructions on how to use them at
+There is also a multi-arch Docker which supports x86-64, armhf and arm64, instructions on how to use them at
 
-for x86-64: https://hub.docker.com/r/linuxserver/heimdall/
-
-for armhf: https://hub.docker.com/r/lsioarmhf/heimdall/
-
-and for arm64: https://hub.docker.com/r/lsioarmhf/heimdall-aarch64/
+- https://hub.docker.com/r/linuxserver/heimdall/
 
 ## New background image not being set
 If you are using the docker image or a default php install you may find images over 2MB wont get set as the background image, you just need to change the `upload_max_filesize` in the php.ini.
@@ -115,11 +113,11 @@ If you are running the docker and the EnhancedApps you are using are also in doc
 You can do this by using `http(s)://docker_name:port` in the config section. Instead of the name you can use the internal docker ip, this usually starts with `172.`
 
 ## Languages
-The app has been translated into several languages, however the quality of the translations could do with work, if you would like to improve them or help with other translations they are stored in /resources/lang/
+The app has been translated into several languages; however, the quality of the translations could do with work. If you would like to improve them, or help with other translations, they are stored in `/resources/lang/`.
 
-To create a new one, create a new folder with the ISO 3166-1 alpha-2 code as the name, copy app.php from /resources/lang/en/app.php into your new folder and replace the english strings.
+To create a new language translation, make a new folder with the ISO 3166-1 alpha-2 code as the name, copy `app.php` from `/resources/lang/en/app.php` into your new folder and replace the English strings.
 
-When you are finished create a pull request.
+When you are finished, create a pull request.
 
 Currently added languages are
 
@@ -134,19 +132,19 @@ Currently added languages are
 ## Web Server Configuration
 
 ### Apache
-A .htaccess file ships with the app, however, a lot of apache installations disallow .htaccess files by default.
-You will notice this due to some links not working like ``/settings``.
+A `.htaccess` file ships with the app, however, a lot of apache installations disallow `.htaccess` files by default.
+You will notice this due to some links not working like `/settings`.
 
 #### Fixes & work around options
 ##### - Apache global allow .htaccess
-Find the ``AllowOverride None`` line in your apache configuration and change this to ``AllowOverride All``
+Find the `AllowOverride None` line in your apache configuration and change this to `AllowOverride All`
 
 ##### - Apache vhost configuration allow .htaccess
-In the apache vhost configuration in the ``<Directory />`` block add ``AllowOverride All``
+In the apache vhost configuration in the `<Directory />` block add `AllowOverride All`
 
 ##### - Add .htaccess content in apache configuration
-You can add the full .htaccess into your apache configuration, this way you do not need to allow .htaccess files.
-You can even shorten the content of the .htaccess when inserting it into the apache configuration to :
+You can add the full `.htaccess` into your apache configuration, this way you do not need to allow `.htaccess` files.
+You can even shorten the content of the `.htaccess` when inserting it into the apache configuration to:
 ```
 Options +FollowSymLinks
 RewriteEngine On
@@ -156,32 +154,32 @@ RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule ^ index.php [L]
 ```
 #### More info
-More info about AllowOverride can be found here :
+More info about `AllowOverride` can be found here:
 https://httpd.apache.org/docs/2.4/mod/core.html#allowoverride
 
 
 
 ### Nginx
-If you are using Nginx, the following directive in your site configuration will direct all requests to the index.php front controller:
+If you are using Nginx, the following directive in your site configuration will direct all requests to the `index.php` front controller:
 
 ```
 location / {
     try_files $uri $uri/ /index.php?$query_string;
 }
 ```
-Someone was using the same nginx setup to both run this and reverse proxy Plex, Plex is served from /web so their location was interferring with the /webfonts.
+Someone was using the same nginx setup to both run this and reverse proxy Plex, Plex is served from `/web` so their location was interfering with the `/webfonts`.
 
-Therefore, if your fonts aren't showing because you have a location for /web add the following
+Therefore, if your fonts aren't showing because you have a location for `/web`, add the following
 ```
 location /webfonts {
-     try_files $uri $uri/;
+    try_files $uri $uri/;
 }
 ```
-If there are any other locations which might interefere with any of the folders in the /public folder, you might have to do the same for those as well, but it's a super fringe case.
+If there are any other locations which might interfere with any of the folders in the `/public` folder, you might have to do the same for those as well, but it's a super fringe case.
 
 ### Reverse proxy
 If you'd like to reverse proxy this app, we recommend using our letsencrypt/nginx docker image: [Letsencrypt/Nginx](https://hub.docker.com/r/linuxserver/letsencrypt/)
-You can either reverse proxy from the root location, or from a subdomain (subfolder method is currently not supported). For https proxy, make sure you use the https port of Heimdall webserver, otherwise some links may break. You can add security through `.htpasswd`
+You can either reverse proxy from the root location, or from a subdomain (subfolder method is currently not supported). For HTTPS proxy, make sure you use the HTTPS port of Heimdall webserver, otherwise some links may break. You can add security through `.htpasswd`
 
 ```
 location / {
@@ -192,14 +190,14 @@ location / {
 }
 ```
 
-If you are using https and things aren't working try adding `FORCE_HTTPS=true` to the end of your .env file
+If you are using HTTPS and things aren't working try adding `FORCE_HTTPS=true` to the end of your `.env` file
 
 ### Self-signed certificates and local CAs
-Per default Heimdall uses the standard certificate bundle file (ca-certificates.crt) to verify HTTPS sites and will ignore additional certificates placed in /etc/ssl/certs. If you wish to use enhanced apps with HTTPS sites that use a self-signed certificate or certs signed with your own local CA, you can override the default bundle:
+Per default Heimdall uses the standard certificate bundle file (`ca-certificates.crt`) to verify HTTPS sites and will ignore additional certificates placed in `/etc/ssl/certs`. If you wish to use enhanced apps with HTTPS sites that use a self-signed certificate or certs signed with your own local CA, you can override the default bundle:
 
-- Create a unified certificate .pem-file that contains all CAs and certificates that Heimdall has to verify. For example, if you use both LetsEncrypt and a local CA for your internal apps, concatenate the LetsEncrypt intermediate CA (export via browser) and your local CA cert.pem (or any number of self-signed certs) into one heimdall.pem file.
-- Place the heimdall.pem into the container (if you use Docker), for example by placing it in the path that you mapped to /config. Make sure that the Heimdall user has read access (chmod a+r).
-- Set the openssl.cafile setting in /config/php/php-local.ini to your cert bundle:
+- Create a unified certificate `.pem` file that contains all CAs and certificates that Heimdall has to verify. For example, if you use both LetsEncrypt and a local CA for your internal apps, concatenate the LetsEncrypt intermediate CA (export via browser) and your local CA `cert.pem` (or any number of self-signed certs) into one `heimdall.pem` file.
+- Place the `heimdall.pem` into the container (if you use Docker), for example by placing it in the path that you mapped to `/config`. Make sure that the Heimdall user has read access (`chmod a+r`).
+- Set the `openssl.cafile` setting in `/config/php/php-local.ini` to your cert bundle:
 
 ```
 # /config/php/php-local.ini
@@ -209,17 +207,17 @@ openssl.cafile = /config/heimdall.pem
 Restart the container and the enhanced apps should now be able to access your local HTTP websites. This configuration will survive updating or recreating the Heimdall container.
 
 ## Support
-https://discord.gg/CCjHKn4 or through Github issues
+https://discord.gg/CCjHKn4 or through GitHub issues
 
 ## Donate
 If you would like to show your appreciation, feel free to use the link below.
 
-[![Paypal](https://heimdall.site/img/paypaldonate.svg)](https://paypal.me/pools/c/81ZR4dfBGo)
+[![PayPal](https://heimdall.site/img/paypaldonate.svg)](https://paypal.me/pools/c/81ZR4dfBGo)
 
 ## Credits
 - PHP Framework - [Laravel](https://laravel.com/)
-- Icons - [FonteAwesome 5](https://fontawesome.com/)
-- Javascript - [jQuery](https://jquery.com/)
+- Icons - [FontAwesome 5](https://fontawesome.com/)
+- JavaScript - [jQuery](https://jquery.com/)
 - Colour picker - [Huebee](http://huebee.buzz/)
 - Background image - [pexels](https://www.pexels.com)
 - Everyone at Linuxserver.io that has helped with the app and let's not forget IronicBadger for the following question that started it all: