Merge branch 'develop' into integrations/2020-08-31-dev-into-master

# Conflicts:
#	.all-contributorsrc
#	.nvmrc
#	README.md
#	app/Console/Commands/LdapSync.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/ConsumablesController.php
#	app/Http/Controllers/Api/ImportController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/LicensesController.php
#	app/Http/Controllers/UsersController.php
#	app/Models/Ldap.php
#	composer.json
#	composer.lock
#	config/version.php
#	public/css/build/all.css
#	public/css/dist/all.css
#	public/css/skins/skin-contrast.css
#	public/css/skins/skin-contrast.css.map
#	public/js/build/all.js
#	public/js/build/vue.js
#	public/js/build/vue.js.map
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/assets/less/overrides.less
#	resources/views/custom_fields/fieldsets/view.blade.php
#	resources/views/hardware/view.blade.php
#	resources/views/layouts/default.blade.php
#	resources/views/modals/model.blade.php
#	resources/views/modals/user.blade.php
#	resources/views/users/index.blade.php
#	routes/api.php
#	tests/unit/UserTest.php

.all-contributorsrc

@@ -1651,6 +1651,186 @@
  "code"
  ]
  },
+ {
+ "login": "jwhulette",
+ "name": "Wes Hulette",
+ "avatar_url": "https://avatars1.githubusercontent.com/u/4930051?v=4",
+ "profile": "http:https://macfoo.wordpress.com/",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "patrict",
+ "name": "patrict",
+ "avatar_url": "https://avatars0.githubusercontent.com/u/8134591?v=4",
+ "profile": "https://github.com/patrict",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "VELIKII-DIVAN",
+ "name": "Dmitriy Minaev",
+ "avatar_url": "https://avatars3.githubusercontent.com/u/2611616?v=4",
+ "profile": "https://github.com/VELIKII-DIVAN",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "liquidhorse",
+ "name": "liquidhorse",
+ "avatar_url": "https://avatars0.githubusercontent.com/u/5132245?v=4",
+ "profile": "https://github.com/liquidhorse",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "Seldaek",
+ "name": "Jordi Boggiano",
+ "avatar_url": "https://avatars1.githubusercontent.com/u/183678?v=4",
+ "profile": "https://seld.be/",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "inietov",
+ "name": "Ivan Nieto",
+ "avatar_url": "https://avatars0.githubusercontent.com/u/653557?v=4",
+ "profile": "https://github.com/inietov",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "benrubson",
+ "name": "Ben RUBSON",
+ "avatar_url": "https://avatars2.githubusercontent.com/u/6764151?v=4",
+ "profile": "https://github.com/benrubson",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "NMathar",
+ "name": "NMathar",
+ "avatar_url": "https://avatars2.githubusercontent.com/u/8554558?v=4",
+ "profile": "https://github.com/NMathar",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "smb",
+ "name": "Steffen",
+ "avatar_url": "https://avatars1.githubusercontent.com/u/139566?v=4",
+ "profile": "https://github.com/smb",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "Sxderp",
+ "name": "Sxderp",
+ "avatar_url": "https://avatars0.githubusercontent.com/u/6609453?v=4",
+ "profile": "https://github.com/Sxderp",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "fanta8897",
+ "name": "fanta8897",
+ "avatar_url": "https://avatars1.githubusercontent.com/u/4807843?v=4",
+ "profile": "https://github.com/fanta8897",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "andreybolonin",
+ "name": "Andrey Bolonin",
+ "avatar_url": "https://avatars2.githubusercontent.com/u/2576509?v=4",
+ "profile": "https://andreybolonin.com/phpconsulting/",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "shinayoshi",
+ "name": "shinayoshi",
+ "avatar_url": "https://avatars3.githubusercontent.com/u/2173307?v=4",
+ "profile": "http:https://www.shinayoshi.net/",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "reuser",
+ "name": "Hubert",
+ "avatar_url": "https://avatars3.githubusercontent.com/u/2130159?v=4",
+ "profile": "https://github.com/reuser",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "KeenRivals",
+ "name": "KeenRivals",
+ "avatar_url": "https://avatars0.githubusercontent.com/u/6865789?v=4",
+ "profile": "https://brashear.me",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "omyno",
+ "name": "omyno",
+ "avatar_url": "https://avatars3.githubusercontent.com/u/2902513?v=4",
+ "profile": "https://github.com/omyno",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "jackka",
+ "name": "Evgeny",
+ "avatar_url": "https://avatars1.githubusercontent.com/u/6271335?v=4",
+ "profile": "https://github.com/jackka",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "colin-campbell",
+ "name": "Colin Campbell",
+ "avatar_url": "https://avatars2.githubusercontent.com/u/1169963?v=4",
+ "profile": "https://digitalist.se",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "lubo",
+ "name": "Ľubomír Kučera",
+ "avatar_url": "https://avatars3.githubusercontent.com/u/2872098?v=4",
+ "profile": "https://github.com/lubo",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "Mezzle",
+ "name": "Martin Meredith",
+ "avatar_url": "https://avatars3.githubusercontent.com/u/570639?v=4",
+ "profile": "https://www.sourceguru.net",
+ "contributions": [
+ "code"
+ ]
+ },
  {
  "login": "timothyfarmer",
  "name": "Tim Farmer",
@@ -1724,10 +1904,37 @@
  ]
  },
  {
- "login": "alek13",
- "name": "Alexander Chibrikin",
- "avatar_url": "https://avatars2.githubusercontent.com/u/1972329?v=4",
- "profile": "http:https://phpprofi.ru/",
+ "login": "johnson-yi",
+ "name": "johnson-yi",
+ "avatar_url": "https://avatars1.githubusercontent.com/u/63399474?v=4",
+ "profile": "https://github.com/johnson-yi",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "sanjay900",
+ "name": "Sanjay Govind",
+ "avatar_url": "https://avatars1.githubusercontent.com/u/1862720?v=4",
+ "profile": "https://tangentmc.net",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "PeterUpfold",
+ "name": "Peter Upfold",
+ "avatar_url": "https://avatars0.githubusercontent.com/u/1255375?v=4",
+ "profile": "https://peter.upfold.org.uk/",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "jbiel",
+ "name": "Jared Biel",
+ "avatar_url": "https://avatars2.githubusercontent.com/u/961717?v=4",
+ "profile": "https://github.com/jbiel",
  "contributions": [
  "code"
  ]

.dockerignore

@@ -1,5 +1,13 @@
 .git
+.github
+.gitattributes
+.gitignore
 .dockerignore
 app/storage/logs/*
 app/storage/views/*
 vendor/*
+storage/framework/cache/*
+node_modules
+.vagrant
+.idea
+

.env.example

@@ -9,6 +9,12 @@ APP_TIMEZONE='UTC'
 APP_LOCALE=en
 MAX_RESULTS=500
 
+# --------------------------------------------
+# REQUIRED: UPLOADED FILE STORAGE SETTINGS
+# --------------------------------------------
+PRIVATE_FILESYSTEM_DISK=local
+PUBLIC_FILESYSTEM_DISK=local_public
+
 # --------------------------------------------
 # REQUIRED: DATABASE SETTINGS
 # --------------------------------------------
@@ -95,12 +101,24 @@ MEMCACHED_HOST=null
 MEMCACHED_PORT=null
 
 # --------------------------------------------
-# OPTIONAL: AWS S3 SETTINGS
+# OPTIONAL: PUBLIC S3 Settings
+# --------------------------------------------
+PUBLIC_AWS_SECRET_ACCESS_KEY=null
+PUBLIC_AWS_ACCESS_KEY_ID=null
+PUBLIC_AWS_DEFAULT_REGION=null
+PUBLIC_AWS_BUCKET=null
+PUBLIC_AWS_URL=null
+PUBLIC_AWS_BUCKET_ROOT=null
+
+# --------------------------------------------
+# OPTIONAL: PRIVATE S3 Settings
 # --------------------------------------------
-AWS_SECRET=null
-AWS_KEY=null
-AWS_REGION=null
-AWS_BUCKET=null
+PRIVATE_AWS_ACCESS_KEY_ID=null
+PRIVATE_AWS_SECRET_ACCESS_KEY=null
+PRIVATE_AWS_DEFAULT_REGION=null
+PRIVATE_AWS_BUCKET=null
+PRIVATE_AWS_URL=null
+PRIVATE_AWS_BUCKET_ROOT=null
 
 # --------------------------------------------
 # OPTIONAL: LOGIN THROTTLING
@@ -114,7 +132,6 @@ LOGIN_LOCKOUT_DURATION=60
 APP_LOG=single
 APP_LOG_MAX_FILES=10
 APP_LOCKED=false
-FILESYSTEM_DISK=local
 APP_CIPHER=AES-256-CBC
 GOOGLE_MAPS_API=
 BACKUP_ENV=true

.env.testing

@@ -40,10 +40,12 @@ IMAGE_LIB=gd
 # --------------------------------------------
 # OPTIONAL: AWS S3 SETTINGS
 # --------------------------------------------
-AWS_SECRET=null
-AWS_KEY=null
-AWS_REGION=null
+AWS_SECRET_ACCESS_KEY=null
+AWS_ACCESS_KEY_ID=null
+AWS_DEFAULT_REGION=null
 AWS_BUCKET=null
+AWS_BUCKET_ROOT=null
+AWS_URL=null
 
 
 # --------------------------------------------

.env.testing-ci

@@ -2,7 +2,7 @@
 # REQUIRED: BASIC APP SETTINGS
 # --------------------------------------------
 APP_ENV=testing-ci
-APP_DEBUG=true
+APP_DEBUG=false
 APP_KEY=ChangeMe
 APP_URL=http:https://localhost:8000
 APP_TIMEZONE='US/Pacific'
@@ -40,10 +40,12 @@ IMAGE_LIB=gd
 # --------------------------------------------
 # OPTIONAL: AWS S3 SETTINGS
 # --------------------------------------------
-AWS_SECRET=null
-AWS_KEY=null
-AWS_REGION=null
+AWS_SECRET_ACCESS_KEY=null
+AWS_ACCESS_KEY_ID=null
+AWS_DEFAULT_REGION=null
 AWS_BUCKET=null
+AWS_BUCKET_ROOT=null
+AWS_URL=null
 
 
 # --------------------------------------------

.gitattributes

@@ -1 +1,3 @@
-* text=auto
+* text=auto
+public/js/** binary
+public/css/** binary

.github/autolabeler.yml

@@ -0,0 +1,4 @@
+frontend: ["*.js", "*.css", "*.vue", "*.scss", "*.less", "*.blade.*"]
+backend: ["/app", "*.php"]
+legal: ["LICENSE*", "NOTICES*"]
+config: .github

.github/config.yml

@@ -0,0 +1,33 @@
+# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome
+
+# Comment to be posted to on first time issues
+newIssueWelcomeComment: |
+ 👋 Thanks for opening your first issue here! If you're reporting a 🐞 bug, please make sure you include steps to reproduce it. We get a lot of issues on this repo, so please be patient and we will get back to you as soon as we can.
+
+# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
+
+# Comment to be posted to on PRs from first time contributors in your repository
+newPRWelcomeComment: |
+ 💖 Thanks for this pull request! 💖
+
+ We use [semantic commit messages](https://snipe-it.readme.io/docs/contributing-overview#section-pull-request-guidelines) to streamline the release process and easily generate changelogs between versions. Before your pull request can be merged, you should **update your pull request title** to start with a semantic prefix if it doesn't have one already.
+
+ Examples of commit messages with semantic prefixes:
+
+ - `Fixed #<issue number>: don't overwrite prevent_default if default wasn't prevented`
+ - `Added #<issue number>: add checkout functionality to assets`
+ - `Improved Asset Checkout: use new notification method for checkout`
+
+ Things that will help get your PR across the finish line:
+
+ - Document any user-facing changes you've made.
+ - Include tests when adding/changing behavior.
+ - Include screenshots and animated GIFs whenever possible.
+
+ We get a lot of pull requests on this repo, so please be patient and we will get back to you as soon as we can.
+
+# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge
+
+# Comment to be posted to on pull requests merged by a first time user
+firstPRMergeComment: >
+ Congrats on merging your first pull request! 🎉🎉🎉

.github/weekly-digest.yml

@@ -0,0 +1,7 @@
+# Configuration for weekly-digest - https://github.com/apps/weekly-digest
+publishDay: sun
+canPublishIssues: true
+canPublishPullRequests: true
+canPublishContributors: true
+canPublishStargazers: true
+canPublishCommits: true