Merge branch 'docker-fixes' of https://github.com/thelamer/snipe-it into thelamer-docker-fixes

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -0,0 +1,61 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+#### Please confirm you have done the following before posting your bug report:
+
+- [ ] I have enabled debug mode 
+- [ ] I have read [checked the Common Issues page](https://snipe-it.readme.io/docs/common-issues)
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Server (please complete the following information):**
+ - Snipe-IT Version 
+ - OS: [e.g. Ubuntu, CentOS]
+ - Web Server: [e.g. Apache, IIS]
+ - PHP Version 
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Error Messages**
+- WITH DEBUG TURNED ON, if you're getting an error in your browser, include that error
+- If a stacktrace is provided in the error, include that too.
+- Any errors that appear in your browser's error console.
+- Confirm whether the error is reproducible on the demo: https://snipeitapp.com/demo.
+- Include any additional information you can find in `storage/logs` and your webserver's logs.
+
+**Additional context**
+- Is this a fresh install or an upgrade? 
+- What OS and web server you're running Snipe-IT on
+- What method you used to install Snipe-IT (install.sh, manual installation, docker, etc)
+- Include what you've done so far in the installation, and if you got any error messages along the way.
+- Indicate whether or not you've manually edited any data directly in the database
+
+Add any other context about the problem here.
+
+Please do not post an issue without answering the related questions above. If you have opened a different issue and already answered these questions, answer them again, once for every ticket. It will be next to impossible for us to help you.

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -0,0 +1,23 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Server (please complete the following information):**
+ - Snipe-IT Version 
+ - OS: [e.g. Ubuntu, CentOS]
+ - Web Server: [e.g. Apache, IIS]
+ - PHP Version 
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

app/Http/Controllers/Auth/LoginController.php

@@ -275,6 +275,7 @@ class LoginController extends Controller
     public function logout(Request $request)
     {
         $request->session()->forget('2fa_authed');
+
         Auth::logout();
 
         $settings = Setting::getSettings();

config/version.php

@@ -6,5 +6,5 @@ return array (
   'prerelease_version' => '',
   'hash_version' => 'gece916e12',
   'full_hash' => 'v4.4.1-54-gece916e12',
-  'branch' => 'develop',
+  'branch' => 'master',
 );

docker/entrypoint.sh

@@ -23,6 +23,12 @@ done
 
 chown -R docker:root /var/lib/snipeit/data/*
 chown -R docker:root /var/lib/snipeit/dumps
+chown -R docker:root /var/lib/snipeit/keys
+
+# If the Oauth DB files are not present copy the vendor files over to the db migrations
+if [ ! -f "/var/www/html/database/migrations/*create_oauth*" ]; then
+  cp -ax /var/www/html/vendor/laravel/passport/database/migrations/* /var/www/html/database/migrations/
+fi
 
 . /etc/apache2/envvars 
 exec apache2 -DNO_DETACH < /dev/null

public/assets/css/themes/dark-green.css

@@ -0,0 +1,145 @@
+:root {
+  --background: #222;
+  --back-main: #333;
+  --back-sub: #444;
+  --header: #18A452; /* Use same as Header picker */
+  --text-main: #FFF;
+  --text-sub: #BBB;
+}
+
+a, a:link, a:visited, .btn-primary.hover {
+    color: var(--header);
+}
+#accessoriesTable>tbody>tr>td>nobr>a>i.fa {
+    color: var(--text-main);
+}
+#assetsListingTable>tbody>tr>td>nobr>a>i.fa {
+    color: var(--text-main);
+}
+#assetsListingTable>tbody>tr.selected>td {
+    background-color: var(--back-main);
+}
+.box, .box.box-default {
+    border-top: 3px solid var(--header);
+    border-top-color: var(--header);
+}
+.box-body, .box-footer, .box-header {
+    background-color: var(--back-sub);
+    color: var(--text-main);
+}
+.btn-default{
+    background-color: var(--back-main);
+    color: var(--header);
+}
+.btn-default:active, .btn-default:focus, .btn-default:hover {
+    background-color: var(--back-sub);
+    color: var(--header);
+}
+.btn-primary, .btn-primary.hover, .btn-primary:active, .btn-primary:hover, .text-blue {
+    color: var(--text-main)!important;
+}
+#componentsTable>tbody>tr>td>nobr>a>i.fa {
+    color: var(--text-main);
+}
+#consumablesTable>tbody>tr>td>nobr>a>i.fa {
+    color: var(--text-main);
+}
+.content-wrapper {
+    background-color: var(--background);
+}
+#create-form>div>div>div>span.input-group-addon {
+    background-color: var(--back-sub);
+    color: var(--text-main);
+}
+#create-form>div>div>div>span>i.fa {
+    background-color: var(--back-sub);
+    color: var(--header);
+}
+#details>div>div>div>table {
+    background-color: transparent;
+}
+.dropdown-menu, .dropdown-menu>li>a {
+    background-color: var(--back-sub);
+    color: var(--header);
+}
+.dropdown-menu>li>a:hover {
+    background-color: var(--back-main);
+    color: var(--text-main);
+}
+.form-control {
+    background-color: var(--back-main);
+    color: var(--text-main);
+}
+h1 {
+    color: var(--text-main);
+}
+.help-block {
+    color: var(--text-sub);
+}
+input[type=text], input[type=search] {
+    background-color: var(--back-sub);
+    color: var(--text-main);
+}
+#licensesTable>tbody>tr>td>nobr>a>i.fa {
+    color: var(--text-main);
+}
+.main-footer {
+    background-color: var(--back-main);
+    color: var(--text-main);
+}
+.nav-tabs-custom>.nav-tabs>li>a, .nav-tabs-custom>.nav-tabs>li.active>a {
+    color: var(--text-main);
+}
+.nav-tabs-custom>.nav-tabs>li.active {
+    border-top-color: var(--header);
+}
+.nav-tabs-custom>.nav-tabs>li.active>a {
+    background-color: var(--back-main);
+}
+.nav-tabs-custom>.nav-tabs>li.active>a:hover {
+    background-color: var(--back-sub);
+    color: var(--text-main);
+}
+.nav-tabs-custom, .nav-tabs-custom>.tab-content {
+    background-color: var(--back-main);
+}
+.navbar-nav>.tasks-menu>.dropdown-menu>li.header {
+    background-color: var(--back-main);
+    color: var(--header);
+}
+.open>.dropdown-toggle.btn-default {
+    background-color: var(--back-sub);
+    color: var(--header);
+}
+.panel {
+    background-color: var(--back-sub);
+    color: var(--text-main);
+}
+.panel-default>.panel-heading {
+    background-color: var(--back-main);
+    color: var(--header);
+}
+.select2-selection--single {
+    background-color: var(--back-sub)!important;
+    color: var(--text-main)!important;
+}
+.select2-container--default .select2-selection--single .select2-selection__rendered {
+    color: var(--text-main);
+}
+.select2-dropdown {
+    background-color: var(--back-main);
+    color: var(--text-main);
+}
+.skin-blue .main-header .navbar .dropdown-menu li a {
+    color: var(--header);
+}
+.skin-blue .sidebar-menu>li.active>a, .skin-blue .sidebar-menu>li:hover>a, .sidebar-toggle:hover {
+    background-color: var(--header)!important;
+}
+.tab-content, .tab-pane {
+    background-color: var(--back-main);
+    color: var(--text-main);
+}
+.table-striped>tbody>tr:nth-of-type(odd) {
+    background-color: var(--back-sub);
+}