276 commits

Author	SHA1	Message	Date
snipe	d3d199efc3	Add @PlaneNuts as a contributor	2021-10-28 16:39:28 -07:00
snipe	aa8f1378c9	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Http/Controllers/Accessories/AccessoriesController.php # app/Http/Controllers/Api/AssetMaintenancesController.php # app/Http/Controllers/Api/AssetModelsController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetMaintenancesController.php # app/Http/Controllers/Assets/AssetFilesController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Assets/BulkAssetsController.php # app/Http/Controllers/Components/ComponentsController.php # app/Http/Controllers/Consumables/ConsumablesController.php # app/Http/Controllers/Licenses/LicenseFilesController.php # app/Http/Controllers/Licenses/LicensesController.php # app/Http/Controllers/Users/UserFilesController.php # app/Http/Transformers/AssetsTransformer.php # app/Http/Transformers/LicensesTransformer.php # app/Importer/UserImporter.php # app/Models/Asset.php # config/app.php # config/version.php # package-lock.json # public/js/build/app.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/lang/en/admin/users/message.php # resources/lang/is/button.php # resources/lang/ja/admin/kits/general.php # resources/lang/ro/admin/users/general.php # resources/lang/zh-HK/admin/depreciations/general.php # resources/lang/zh-HK/admin/models/general.php # resources/views/hardware/qr-view.blade.php # resources/views/hardware/view.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/users/view.blade.php # routes/web.php # routes/web/hardware.php # routes/web/models.php # routes/web/users.php	2021-10-20 17:26:41 -07:00
snipe	fa1cf3073b	Add @alwism as a contributor	2021-10-04 15:04:58 -07:00
snipe	71badee78a	Add @Robert-Azelis as a contributor	2021-10-04 15:04:47 -07:00
snipe	cb0d1add8d	Add @01ste02 as a contributor	2021-10-04 15:04:22 -07:00
snipe	1b0d11a572	Add @jethron as a contributor	2021-10-04 15:03:50 -07:00
snipe	9e522b6a4d	Add @Computroniks as a contributor	2021-10-04 15:03:35 -07:00
snipe	a773e70936	Add @Toreg87 as a contributor	2021-10-04 15:03:23 -07:00
snipe	92a38f2a23	Add @jerm as a contributor	2021-10-04 15:03:05 -07:00
snipe	542f774c68	Add @FliegenKLATSCH as a contributor	2021-10-04 15:02:56 -07:00
snipe	67e106c7fa	Add @AL4AL as a contributor	2021-10-04 15:02:51 -07:00
snipe	e27065fe16	Merge branch 'develop-v6-integration' into develop-v6-rc1 ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Console/Commands/ResetDemoSettings.php # app/Helpers/Helper.php # app/Http/Controllers/Api/AccessoriesController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/CategoriesController.php # app/Http/Controllers/Api/ComponentsController.php # app/Http/Controllers/Api/ConsumablesController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/StatuslabelsController.php # app/Http/Controllers/Api/SuppliersController.php # app/Http/Controllers/AssetMaintenancesController.php # app/Http/Controllers/Auth/ForgotPasswordController.php # app/Http/Controllers/DepreciationsController.php # app/Http/Controllers/ReportsController.php # app/Http/Controllers/SettingsController.php # app/Http/Requests/ImageUploadRequest.php # app/Http/Transformers/ActionlogsTransformer.php # app/Http/Transformers/DepreciationsTransformer.php # app/Listeners/CheckoutableListener.php # app/Models/Accessory.php # app/Models/Asset.php # app/Models/Company.php # app/Models/Ldap.php # app/Models/User.php # app/Presenters/AssetPresenter.php # app/Presenters/CategoryPresenter.php # composer.json # composer.lock # config/version.php # database/factories/AssetModelFactory.php # database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php # database/seeds/AssetModelSeeder.php # package-lock.json # public/css/build/AdminLTE.css # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/css/dist/skins/skin-black-dark.css # public/css/dist/skins/skin-black-dark.min.css # public/css/dist/skins/skin-black.css # public/css/dist/skins/skin-black.min.css # public/css/dist/skins/skin-blue-dark.css # public/css/dist/skins/skin-blue-dark.min.css # public/css/dist/skins/skin-blue.css # public/css/dist/skins/skin-blue.min.css # public/css/dist/skins/skin-contrast.css # public/css/dist/skins/skin-contrast.min.css # public/css/dist/skins/skin-green-dark.css # public/css/dist/skins/skin-green-dark.min.css # public/css/dist/skins/skin-green.css # public/css/dist/skins/skin-green.min.css # public/css/dist/skins/skin-orange-dark.css # public/css/dist/skins/skin-orange-dark.min.css # public/css/dist/skins/skin-orange.css # public/css/dist/skins/skin-orange.min.css # public/css/dist/skins/skin-purple-dark.css # public/css/dist/skins/skin-purple-dark.min.css # public/css/dist/skins/skin-purple.css # public/css/dist/skins/skin-purple.min.css # public/css/dist/skins/skin-red-dark.css # public/css/dist/skins/skin-red-dark.min.css # public/css/dist/skins/skin-red.css # public/css/dist/skins/skin-red.min.css # public/css/dist/skins/skin-yellow-dark.css # public/css/dist/skins/skin-yellow-dark.min.css # public/css/dist/skins/skin-yellow.css # public/css/dist/skins/skin-yellow.min.css # public/js/build/app.js # public/js/build/vendor.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/assets/js/vue.js # resources/lang/af/validation.php # resources/lang/ar/admin/settings/general.php # resources/lang/ar/validation.php # resources/lang/bg/admin/settings/general.php # resources/lang/bg/validation.php # resources/lang/cs/admin/settings/general.php # resources/lang/cs/validation.php # resources/lang/cy/help.php # resources/lang/cy/validation.php # resources/lang/da/admin/settings/general.php # resources/lang/da/validation.php # resources/lang/de/admin/settings/general.php # resources/lang/de/validation.php # resources/lang/el/validation.php # resources/lang/en-GB/admin/settings/general.php # resources/lang/en-GB/validation.php # resources/lang/en-ID/admin/hardware/table.php # resources/lang/en-ID/admin/settings/general.php # resources/lang/en-ID/validation.php # resources/lang/es-CO/admin/settings/general.php # resources/lang/es-CO/auth/message.php # resources/lang/es-CO/button.php # resources/lang/es-CO/help.php # resources/lang/es-CO/validation.php # resources/lang/es-ES/admin/settings/general.php # resources/lang/es-ES/auth/message.php # resources/lang/es-ES/button.php # resources/lang/es-ES/help.php # resources/lang/es-ES/validation.php # resources/lang/es-MX/admin/settings/general.php # resources/lang/es-MX/validation.php # resources/lang/es-VE/admin/settings/general.php # resources/lang/es-VE/auth/message.php # resources/lang/es-VE/button.php # resources/lang/es-VE/help.php # resources/lang/es-VE/validation.php # resources/lang/et/validation.php # resources/lang/fa/validation.php # resources/lang/fi/admin/settings/general.php # resources/lang/fi/validation.php # resources/lang/fil/validation.php # resources/lang/fr/admin/settings/general.php # resources/lang/fr/validation.php # resources/lang/ga-IE/validation.php # resources/lang/he/admin/settings/general.php # resources/lang/he/general.php # resources/lang/he/validation.php # resources/lang/hr/validation.php # resources/lang/hu/validation.php # resources/lang/id/validation.php # resources/lang/is/admin/categories/general.php # resources/lang/is/admin/companies/message.php # resources/lang/is/admin/companies/table.php # resources/lang/is/admin/components/general.php # resources/lang/is/admin/components/table.php # resources/lang/is/admin/consumables/table.php # resources/lang/is/admin/depreciations/general.php # resources/lang/is/admin/depreciations/message.php # resources/lang/is/admin/hardware/form.php # resources/lang/is/admin/hardware/general.php # resources/lang/is/admin/hardware/message.php # resources/lang/is/admin/hardware/table.php # resources/lang/is/admin/kits/general.php # resources/lang/is/admin/licenses/form.php # resources/lang/is/admin/licenses/general.php # resources/lang/is/admin/locations/table.php # resources/lang/is/admin/manufacturers/table.php # resources/lang/is/admin/reports/message.php # resources/lang/is/admin/settings/general.php # resources/lang/is/admin/settings/message.php # resources/lang/is/admin/statuslabels/message.php # resources/lang/is/admin/suppliers/message.php # resources/lang/is/admin/suppliers/table.php # resources/lang/is/admin/users/table.php # resources/lang/is/mail.php # resources/lang/is/validation.php # resources/lang/it/admin/settings/general.php # resources/lang/it/validation.php # resources/lang/iu/validation.php # resources/lang/ja/mail.php # resources/lang/ja/validation.php # resources/lang/ko/validation.php # resources/lang/lt/validation.php # resources/lang/lv/validation.php # resources/lang/mi/validation.php # resources/lang/mk/validation.php # resources/lang/ml-IN/validation.php # resources/lang/mn/validation.php # resources/lang/ms/validation.php # resources/lang/nl/admin/settings/general.php # resources/lang/nl/validation.php # resources/lang/no/validation.php # resources/lang/pl/admin/settings/general.php # resources/lang/pl/validation.php # resources/lang/pt-BR/admin/settings/general.php # resources/lang/pt-BR/mail.php # resources/lang/pt-BR/validation.php # resources/lang/pt-PT/validation.php # resources/lang/ro/validation.php # resources/lang/ru/validation.php # resources/lang/sl/validation.php # resources/lang/sr-CS/admin/settings/general.php # resources/lang/sr-CS/validation.php # resources/lang/sv-SE/admin/settings/general.php # resources/lang/sv-SE/auth/message.php # resources/lang/sv-SE/button.php # resources/lang/sv-SE/mail.php # resources/lang/sv-SE/validation.php # resources/lang/ta/validation.php # resources/lang/th/validation.php # resources/lang/tl/validation.php # resources/lang/tr/mail.php # resources/lang/tr/validation.php # resources/lang/uk/admin/accessories/table.php # resources/lang/uk/admin/asset_maintenances/message.php # resources/lang/uk/admin/asset_maintenances/table.php # resources/lang/uk/validation.php # resources/lang/ur-PK/validation.php # resources/lang/vi/admin/settings/general.php # resources/lang/vi/validation.php # resources/lang/zh-CN/admin/settings/general.php # resources/lang/zh-CN/validation.php # resources/lang/zh-HK/validation.php # resources/lang/zh-TW/validation.php # resources/lang/zu/validation.php # resources/views/partials/bootstrap-table.blade.php # resources/views/partials/forms/edit/company-select.blade.php # routes/api.php	2021-09-21 23:46:50 -07:00
snipe	6d3c8a9189	Add @Delta5 as a contributor	2021-09-21 20:06:45 -07:00
snipe	81f1f4ce6f	Add @vapier as a contributor	2021-09-20 15:07:37 -07:00
snipe	7b4cc5044b	Add @derdeagle as a contributor	2021-06-23 14:31:48 -07:00
snipe	c684e5f481	Add @PetriAsi as a contributor	2021-06-23 14:31:16 -07:00
snipe	c567ad0617	Add @travismiller as a contributor	2021-06-10 15:18:02 -07:00
snipe	11f1b29db9	Add @kcoyo as a contributor	2021-05-26 13:04:51 -07:00
snipe	3f559c4a50	Add @tbrconnect as a contributor	2021-05-12 13:38:56 -07:00
snipe	ed98683496	Add @mikecmpbll as a contributor	2021-05-04 22:40:04 -07:00
snipe	c1a8b609ea	Add @markbrule as a contributor	2021-05-04 22:27:35 -07:00
snipe	6c0af3c6e1	Add @JohnnyPicnic as a contributor	2021-05-04 22:21:18 -07:00
snipe	36c2edb278	Add @nepella as a contributor	2021-04-21 11:40:38 -07:00
snipe	dd1a5681da	Add @psarossy as a contributor	2021-04-20 14:53:10 -07:00
snipe	e92f69dcda	Add @zybersup as a contributor	2021-04-20 14:52:29 -07:00
snipe	3e471a6587	Add @sh1hab as a contributor	2021-04-20 14:49:31 -07:00
snipe	415ae5854f	Add @Skywalker-11 as a contributor	2021-04-14 15:15:57 -07:00
snipe	252b2ee1b4	Add @Jelle-S as a contributor	2021-04-14 15:07:40 -07:00
snipe	2c0438bdcb	Add @andreaci as a contributor	2021-04-14 11:18:13 -07:00
snipe	f19595f525	Add @deivishome as a contributor	2021-04-14 10:27:08 -07:00
snipe	465ec054d3	Add @limeless as a contributor	2021-04-14 10:22:58 -07:00
snipe	ab8f7e7b84	Add @Joly0 as a contributor	2021-04-14 10:21:18 -07:00
snipe	abddda2ab8	Add @kajes as a contributor	2021-04-05 21:56:45 -07:00
snipe	55692bfe98	Add @Tetrachloromethane250 as a contributor	2021-04-05 21:52:14 -07:00
snipe	f147c43dd4	Add @t3easy as a contributor	2021-04-05 21:04:39 -07:00
snipe	c9ec15101c	Add @ajsy as a contributor	2021-04-05 20:56:39 -07:00
snipe	298bfa73c8	Add @ocelotsloth as a contributor	2021-04-05 20:35:28 -07:00
snipe	26b97d2b0b	Add @JuustoMestari as a contributor	2021-04-05 20:16:35 -07:00
snipe	53651ba3df	Add @misilot as a contributor	2021-03-24 14:09:02 -07:00
snipe	d527f23ec8	Add @raelldottin as a contributor	2021-03-24 14:08:56 -07:00
snipe	ca882e2b3d	Add @elyscape as a contributor	2021-03-15 16:42:52 -07:00
snipe	52bf050c4f	Add @joelpittet as a contributor	2021-02-26 15:59:17 -08:00
snipe	f636aac2dd	Add @sw-mreyes as a contributor	2021-02-19 10:11:52 -08:00
snipe	bfadb2cea6	Add @koelle25 as a contributor	2021-02-17 12:58:57 -08:00
snipe	2a88781cd5	Add @Kurokat as a contributor	2021-02-03 16:07:25 -08:00
snipe	f96c867bd3	Update @ghost as a contributor	2021-02-03 16:07:06 -08:00
snipe	06f8e8620a	Add @EDVLeer as a contributor	2021-02-03 16:06:28 -08:00
snipe	95d907c9e9	Add @sean-borg as a contributor	2021-02-03 16:06:14 -08:00
snipe	d990152856	Add @andres-baller as a contributor	2021-02-03 16:05:45 -08:00
snipe	05609230b2	Add @ncareau as a contributor	2021-02-03 16:05:21 -08:00