Merge remote-tracking branch 'origin/development'

QuickBox · Apr 21, 2017 · 948dcbb · 948dcbb
2 parents 00573d8 + dc0d2fa
commit 948dcbb
Show file tree

Hide file tree

Showing 387 changed files with 2,213 additions and 142,508 deletions.
diff --git a/dashboard/.gitignore b/dashboard/.gitignore
diff --git a/dashboard/.htaccess b/dashboard/.htaccess
diff --git a/dashboard/custom/.gitignore b/dashboard/custom/.gitignore
diff --git a/dashboard/db/.gitignore b/dashboard/db/.gitignore
diff --git a/dashboard/db/branding-m.php b/dashboard/db/branding-m.php
diff --git a/dashboard/fileshare/.htaccess b/dashboard/fileshare/.htaccess
diff --git a/dashboard/fileshare/share.php b/dashboard/fileshare/share.php
diff --git a/dashboard/img/brands/btsync.png b/dashboard/img/brands/btsync.png
diff --git a/dashboard/img/brands/couchpotato.png b/dashboard/img/brands/couchpotato.png
diff --git a/dashboard/img/brands/csf.png b/dashboard/img/brands/csf.png
diff --git a/dashboard/img/brands/deluge.png b/dashboard/img/brands/deluge.png
diff --git a/dashboard/img/brands/emby.png b/dashboard/img/brands/emby.png
diff --git a/dashboard/img/brands/jackett.png b/dashboard/img/brands/jackett.png
diff --git a/dashboard/img/brands/nextcloud.png b/dashboard/img/brands/nextcloud.png
diff --git a/dashboard/img/brands/nzbhydra.png b/dashboard/img/brands/nzbhydra.png
diff --git a/dashboard/img/brands/plex.png b/dashboard/img/brands/plex.png
diff --git a/dashboard/img/brands/plexpy.png b/dashboard/img/brands/plexpy.png
diff --git a/dashboard/img/brands/plexrequests-net.png b/dashboard/img/brands/plexrequests-net.png
diff --git a/dashboard/img/brands/pyload.png b/dashboard/img/brands/pyload.png
diff --git a/dashboard/img/brands/quickbox.png b/dashboard/img/brands/quickbox.png
diff --git a/dashboard/img/brands/rapidleech.png b/dashboard/img/brands/rapidleech.png
diff --git a/dashboard/img/brands/rtorrent.png b/dashboard/img/brands/rtorrent.png
diff --git a/dashboard/img/brands/sabnzbd.png b/dashboard/img/brands/sabnzbd.png
diff --git a/dashboard/img/brands/sickrage.png b/dashboard/img/brands/sickrage.png
diff --git a/dashboard/img/brands/sonarr.png b/dashboard/img/brands/sonarr.png
diff --git a/dashboard/img/brands/subsonic.png b/dashboard/img/brands/subsonic.png
diff --git a/dashboard/img/brands/syncthing.png b/dashboard/img/brands/syncthing.png
diff --git a/dashboard/img/brands/znc.png b/dashboard/img/brands/znc.png
diff --git a/dashboard/img/favicon/android-chrome-192x192.png b/dashboard/img/favicon/android-chrome-192x192.png
diff --git a/dashboard/img/favicon/android-chrome-512x512.png b/dashboard/img/favicon/android-chrome-512x512.png
diff --git a/dashboard/img/favicon/apple-touch-icon.png b/dashboard/img/favicon/apple-touch-icon.png
diff --git a/dashboard/img/favicon/browserconfig.xml b/dashboard/img/favicon/browserconfig.xml
diff --git a/dashboard/img/favicon/favicon-16x16.png b/dashboard/img/favicon/favicon-16x16.png
diff --git a/dashboard/img/favicon/favicon-32x32.png b/dashboard/img/favicon/favicon-32x32.png
diff --git a/dashboard/img/favicon/favicon.ico b/dashboard/img/favicon/favicon.ico
diff --git a/dashboard/img/favicon/manifest.json b/dashboard/img/favicon/manifest.json
diff --git a/dashboard/img/favicon/mstile-150x150.png b/dashboard/img/favicon/mstile-150x150.png
diff --git a/dashboard/img/favicon/safari-pinned-tab.svg b/dashboard/img/favicon/safari-pinned-tab.svg
diff --git a/dashboard/img/logo-dark.png b/dashboard/img/logo-dark.png
diff --git a/dashboard/img/logo-light.png b/dashboard/img/logo-light.png