snipe-it/config
snipe e321aeabae
Merge branch 'master' into integrations/2020-08-31-v5-rc
# Conflicts:
#	.all-contributorsrc
#	.nvmrc
#	README.md
#	app/Console/Commands/LdapSync.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/Importer/import_mappings.md
#	app/Models/Ldap.php
#	app/Models/Loggable.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/js/components/importer/importer-file.vue
#	resources/assets/less/overrides.less
#	resources/macros/macros.php
#	resources/views/custom_fields/fieldsets/view.blade.php
#	resources/views/hardware/edit.blade.php
#	resources/views/hardware/labels.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
#	routes/web/fields.php
#	tests/unit/UserTest.php
2020-08-31 12:14:44 -07:00
..
app.php Merge branch 'master' into integrations/2020-08-31-v5-rc 2020-08-31 12:14:44 -07:00
auth.php WIP: Upgrade develop to Laravel 6.6.1 (#7637) 2019-12-10 19:32:50 -08:00
backup.php Fixes for backups 2020-08-28 14:10:43 -07:00
broadcasting.php Added warning to not edit config files manually 2018-03-07 17:39:13 -08:00
cache.php Improve Memcached settings (#6485) 2018-12-06 14:39:14 -08:00
compile.php Added warning to not edit config files manually 2018-03-07 17:39:13 -08:00
cors.php Integrations/develop into master (#7352) 2019-08-14 21:48:14 -07:00
database.php Merge branch 'develop' into integrations/2020-04-15-v5-merge 2020-04-20 23:20:34 -07:00
debugbar.php Derp 2017-01-13 21:15:36 -08:00
filesystems.php Fixes for backups 2020-08-28 14:10:43 -07:00
hashing.php Added hashing config 2018-07-24 21:13:02 -07:00
image.php Added warning to not edit config files manually 2018-03-07 17:39:13 -08:00
logging.php Add APP_LOG_LEVEL to new logging config 2018-10-25 21:01:14 -07:00
mail-auto-embed.php Added email image auto-embed support 2018-09-05 18:57:49 -07:00
mail.php Added warning to not edit config files manually 2018-03-07 17:39:13 -08:00
passport.php WIP: Upgrade develop to Laravel 6.6.1 (#7637) 2019-12-10 19:32:50 -08:00
permissions.php Merge branch 'hotfixes/2fa_qr' into develop 2019-03-20 02:17:02 -07:00
queue.php Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00
services.php Added warning to not edit config files manually 2018-03-07 17:39:13 -08:00
session.php Added #6463 - ability to override session path in .env 2018-12-05 17:17:11 -08:00
trustedproxy.php Merge branch 'develop' into dev-master-integration 2019-02-13 06:42:52 -08:00
version.php Bumped hash 2020-07-17 12:32:01 -07:00
view.php Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00