DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
snipe-it/config
History
snipe 5290c47e2a Merge branch 'develop' into v5-master-develop-integration 
# Conflicts:
#	.env.example
#	.travis.yml
#	Dockerfile
#	README.md
#	app/Console/Commands/LdapSync.php
#	app/Console/Kernel.php
#	app/Http/Controllers/AccessoriesController.php
#	app/Http/Controllers/Api/AccessoriesController.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/LocationsController.php
#	app/Http/Controllers/Api/SettingsController.php
#	app/Http/Controllers/Api/UsersController.php
#	app/Http/Controllers/AssetModelsController.php
#	app/Http/Controllers/Assets/AssetFilesController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/CategoriesController.php
#	app/Http/Controllers/CompaniesController.php
#	app/Http/Controllers/ComponentsController.php
#	app/Http/Controllers/ConsumablesController.php
#	app/Http/Controllers/DepartmentsController.php
#	app/Http/Controllers/LicensesController.php
#	app/Http/Controllers/LocationsController.php
#	app/Http/Controllers/ManufacturersController.php
#	app/Http/Controllers/ReportsController.php
#	app/Http/Controllers/SettingsController.php
#	app/Http/Controllers/SuppliersController.php
#	app/Http/Controllers/UsersController.php
#	app/Http/Middleware/EncryptCookies.php
#	app/Http/Requests/AssetRequest.php
#	app/Http/Transformers/AssetMaintenancesTransformer.php
#	app/Importer/AssetImporter.php
#	app/Models/AssetMaintenance.php
#	app/Models/Location.php
#	app/Models/User.php
#	composer.json
#	composer.lock
#	config/backup.php
#	config/database.php
#	config/version.php
#	public/mix-manifest.json
#	resources/lang/en-ID/general.php
#	resources/lang/vi/admin/settings/general.php
#	resources/views/accessories/edit.blade.php
#	resources/views/hardware/view.blade.php
#	resources/views/layouts/default.blade.php
#	tests/api/ApiCategoriesCest.php
2019-11-18 19:49:39 -08:00
..
app.php Merge branch 'develop' into v5-master-develop-integration 2019-11-18 19:49:39 -08:00
auth.php Added warning to not edit config files manually 2018-03-07 17:39:13 -08:00
backup.php Integrations/develop into master (#7352) 2019-08-14 21:48:14 -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 v5-master-develop-integration 2019-11-18 19:49:39 -08:00
debugbar.php Derp 2017-01-13 21:15:36 -08:00
filesystems.php Handle missing Flysystem env vars; let Debugbar autodiscover (#6514) 2018-12-17 14:04:56 -08: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
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 minor version 2019-10-28 13:55:21 -07:00
view.php Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00