3176 commits

Author	SHA1	Message	Date
Brady Wetherington	864cc4f8d5	Fix FIXME's by downgrading them to TODO's :)	2021-11-10 11:37:10 -08:00
snipe	457c6080cc	Better handling if there was no file uploaded ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 01:43:45 -08:00
snipe	76685d7fd3	Clearer text in restore artisan command ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 00:07:32 -08:00
snipe	96f76e1f6b	INCOMPLETE: Added restore and upload methods for backups ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 00:07:17 -08:00
snipe	3b25093aeb	Removed noisy debugging ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-09 22:38:27 -08:00
snipe	76506dabbf	Made helpers call full namespace (tho I have no idea why this was necessary) ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-09 22:38:14 -08:00
snipe	1b1b54fbf4	Add modified_value and modified_display so we can use the formatted date but still sort correctly ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-09 22:37:49 -08:00
snipe	0e21a95817	Escape error message in asset autdit apI (same as in v5) ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-09 19:39:32 -08:00
Brady Wetherington	91f087258b	Merge branch 'develop' into remove_old_ldap	2021-11-09 18:33:41 -08:00
Brady Wetherington	3ea209a507	Escape asset_tag attribute at controller level for consumption in bulk checkout	2021-11-08 20:27:43 -08:00
Brady Wetherington	a58c5ce27f	Better documentation, disable AdLdap2-based "Add domain" setting	2021-11-08 17:11:47 -08:00
Brady Wetherington	b0417e5bd7	Finish pulling out the AdLdap2-based LDAP remnants that were still in the system	2021-11-03 15:22:06 -07:00
Terrell Eaton	2c7a71a2a1	Fixes not being able to search by checked out user in advanced search	2021-11-01 22:14:19 +01:00
Brady Wetherington	4dda28de9e	WIP: cleaning up LDAP	2021-10-28 18:19:50 -07:00
Brady Wetherington	31933a56fa	Trying to get the login screen working	2021-10-28 18:18:11 -07:00
snipe	ea0d92c439	Merge branch 'develop' into fixes/fmcs_departments	2021-10-28 18:18:08 -07:00
snipe	d36849bd41	Merge branch 'develop' into feature/remove_deleted_user_from_unaccepted_assets_report	2021-10-28 18:11:03 -07:00
snipe	84a3a85823	Fixed parse error for merge conflict ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-28 18:04:03 -07:00
snipe	798f6d65de	Merge pull request #9847 from inietov/bug/ch15357/requested_assets_allow_to_cancel_if_checkedout_to_self ... Adds a check to know if the asset is checked out to the logged in user to allow check the state in the view	2021-10-28 17:53:24 -07:00
snipe	76cc46c419	Merge pull request #9814 from 01ste02/importMinAmt ... Improved Consumable Import: Import min_amt for consumables	2021-10-28 17:49:44 -07:00
snipe	bdf321ecc9	Merge branch 'develop' into change-var-aws-public-url	2021-10-28 17:46:16 -07:00
snipe	645529ba78	Merge pull request #9889 from ncareau/api-licenses ... Add licenses api parameters and fix a missing variable in license view.	2021-10-28 17:20:09 -07:00
snipe	2f9e5f79af	Merge pull request #10139 from FliegenKLATSCH/patch-1 ... API: Do not include deleted items per default on lookup by serial	2021-10-28 17:09:20 -07:00
snipe	3088230236	Merge pull request #10209 from Godmartinz/feature/sc-1474/sync-parent-asset-location-with-children-assets ... Fixes Bug: When parent asset is assigned to other location, children assets loca…	2021-10-28 16:49:44 -07:00
snipe	371a39a118	Merge branch 'develop' into fixes/advanced_search_serial_v2	2021-10-28 16:42:10 -07:00
snipe	7821d38e60	Merge pull request #10238 from inietov/fixes/asset_components_must_return_relationship_instance ... Fixes asset components must return relationship instance	2021-10-28 16:38:21 -07:00
snipe	1895dd326f	Merge pull request #10245 from Sxderp/pr-support-appache-rewrite-redirect-headers-for-remote-user ... support apache REDIRECT_* for remote user login	2021-10-28 16:34:57 -07:00
snipe	52ef9280ba	Adds reqestable as model bulk edit field ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-28 15:15:54 -07:00
Steven Daniele	efc644c960	support apache REDIRECT_* for remote user login	2021-10-28 14:23:38 -04:00
Ivan Nieto Vivanco	ee9133f722	Return the proper Asset-Components relationship	2021-10-27 16:42:51 -05:00
snipe	17bf899a17	Set default_label to 0 instead of null in API ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-25 20:14:01 -07:00
snipe	8b1c60a17a	Make gates a little more consistent ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-25 15:34:22 -07:00
snipe	033c3253bb	Fixed permissions array to handle missing clone button ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-25 14:10:17 -07:00
Ivan Nieto Vivanco	9eaf89aaa7	Add a variable to better control the selected user's ids	2021-10-21 13:28:58 -05:00
snipe	31d49b5c9b	Fixed merge error parse error ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-20 18:11:34 -07:00
snipe	6e0f8068b2	Fixed duplicate use statement from merge fuckery ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-20 17:54:32 -07:00
snipe	9ee13f0d2a	Fixed dupe use statement from merge fuckery ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-20 17:53:43 -07:00
snipe	ae1a4bb3c9	Fixed extra braces from merge fuckery ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-20 17:36:06 -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
Godfrey M	9ae7d0b23a	when parent asset is assigned to other location, children assets location are updated as well.	2021-10-20 17:01:25 -07:00
Matthew Nickson	8996c24d1f	Merge branch 'develop' into sum_cost_by_quantity	2021-10-10 13:01:44 +01:00
FliegenKLATSCH	24c484303e	Do not include deleted assets by default when doing lookup by serial ... This commit introduces a new query parameter `deleted`, which can be set to `true` to include deleted assets in the response.	2021-10-09 08:56:31 +02:00
snipe	5d94b99035	Switched to 5 in one minute ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-08 15:53:32 -07:00
snipe	0674ef5a3d	Fixed number to 1 (for minutes) ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-08 15:43:32 -07:00
snipe	702791210e	Throttle password reset requests to 5 every 60 seconds ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-08 14:26:30 -07:00
Ivan Nieto Vivanco	23b770fac6	Added a validation to use the same name in categories with different types	2021-10-08 15:19:16 -05:00
snipe	1c77fd0d09	Merge pull request #10178 from inietov/bug/sc-17520/symfony_component_debug_exception_fatalthrowableerror ... Fixed typo when setting the headers	2021-10-08 12:04:45 -07:00
Ivan Nieto Vivanco	d184da8611	Fixed typo (thanks @ssddanbrown)	2021-10-08 13:39:49 -05:00
Dampfklon	ab4a234e20	fix rebase errors	2021-10-07 21:32:57 +02:00
Dampfklon	7645f23f5c	remove pending Acceptances on checkin	2021-10-07 21:03:46 +02:00
Dampfklon	4418ad2340	Enable display of deleted acceptances, strike deleted users, add date, enable sorting	2021-10-07 21:03:46 +02:00
Dampfklon	12ee06deb6	add Download All Button, change route analogue to activity report	2021-10-07 21:01:50 +02:00
Dampfklon	9a9ca59544	Fix decprecated implode usage	2021-10-07 20:55:47 +02:00
Dampfklon	ed99532c30	Unaccepted Assets Report Actions (send reminder, delete) added ... Unaccepted Assets Export fixed	2021-10-07 20:53:02 +02:00
snipe	ccd430ce07	Switched back down to debug level ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-06 12:38:21 -07:00
snipe	f306401e7e	Fixed SVG XSS vuln ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-06 12:26:45 -07:00
snipe	c06a93ef13	Removed extra brace in assets for components ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-06 10:38:13 -07:00
Ivan Nieto Vivanco	ef6eea67d8	Set headers in a different manner in the middleware	2021-10-05 14:09:35 -05:00
Brady Wetherington	bbeedc026d	A lot of cleanups to the Livewire stuff, and got it kinda-sorta basically working.	2021-10-04 22:07:29 -07:00
Brady Wetherington	d80604f2ac	Most of the basics are working, but not done and lots of debug messages are about ... I picked up the change that picked a point-release difference on the AWS library since that usually works out for us (x.y.1 vs. x.y.2 - usually a good call)	2021-10-04 22:06:48 -07:00
snipe	34eab88b7e	Removed debugging ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 20:25:31 -07:00
snipe	b20c841a89	Fixed asset models restore ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 19:29:13 -07:00
snipe	52caee2a9f	Handle checking and unchecking for bulk actions ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 17:18:26 -07:00
snipe	52ea172e5d	Fix ID array ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 17:18:07 -07:00
snipe	9b48732cd2	Force revalidation headers when user logs out ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 12:52:48 -07:00
snipe	daa88f06f7	Added pivot to components JSON ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-30 15:51:08 -07:00
snipe	d0acb9fdb4	Applies PR #10150 to master ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-30 15:33:00 -07:00
Ivan Nieto Vivanco	11aa8971c8	Fix error if the Department is also empty	2021-09-30 17:20:44 -05:00
Ivan Nieto Vivanco	5c7aaaac22	Fix error when department is null	2021-09-30 16:46:23 -05:00
snipe	61f16f47a2	Use Helper alias ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-28 19:44:55 -07:00
Brady Wetherington	ae466be153	Fix license output, tweak CleanFloat function to handle numbers over 1 million	2021-09-28 19:10:25 -07:00
Brady Wetherington	f3338667c7	Create new ParseCurrency helper and use it in the appropriate controllers	2021-09-28 18:20:39 -07:00
Brady Wetherington	f380da3f19	Try to ensure all currency output is formatted correctly.	2021-09-28 16:45:47 -07:00
NMC	c680977791	Merge branch 'develop' into api-licenses	2021-09-27 15:02:51 -04:00
snipe	d88c0ae5ec	Merge pull request #10103 from snipe/fixes/make_boolean_fields_nullable ... Fixed issue when creating a status label via API - default_label and show_in_nav being not nullable	2021-09-26 13:41:52 -07:00
snipe	7e41c74cc3	Updated more fa icons ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-26 01:11:08 -07:00
snipe	67d898e897	Updated map icons ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 14:30:36 -07:00
snipe	e03d7b7016	More fa icon updates ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 13:07:02 -07:00
snipe	ad6f073c82	Few more icon updates ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 06:38:23 -07:00
snipe	dbe93d91cd	Updated fontawesome icons ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 06:07:46 -07:00
snipe	2f9582ee5c	Switched to loadMissing for performance ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-23 17:31:19 -07:00
snipe	3b7ce0091c	Load components in the assets API if components=true in API request ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-23 17:23:53 -07:00
snipe	6e270c0ed2	Include created_at in pivot ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-23 17:23:17 -07:00
snipe	3862b6476b	Merge pull request #10122 from inietov/fixes/api_issue_when_component_checkout ... Fixes API Issue when checking out a component	2021-09-23 13:21:48 -07:00
Ivan Nieto Vivanco	7dfab3a6e2	Change the condition to 'bigger or equal' instead of just 'bigger than' in ComponentsController checkout api	2021-09-23 15:02:39 -05:00
snipe	a6b3aa5f04	Don't try to delete the file if there is no log entry ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-22 19:04:25 -07:00
snipe	61cf9ec009	Small conflict handling bits ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-22 00:00:44 -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	b4a90045e6	Added totals to depreciation report footer ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-21 21:52:18 -07:00
snipe	0763c76a4e	Fixed scoping with leftjoin ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-21 20:54:24 -07:00
snipe	5d32c17a2e	Removed comments ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-21 20:01:36 -07:00
snipe	10ca7cffc3	Fixes for query scoping, ordering, and nicer readability ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-21 19:59:23 -07:00
snipe	61176335d7	Improved category_type with strtolower() to make it case insensitive ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-21 15:51:41 -07:00
Delta5	c8c3c7fbbd	Fixed issue with incorrect error message	2021-09-21 19:45:18 +00:00
Delta5	59302e1d19	Add restore to users api endpoint	2021-09-21 17:42:26 +00:00
snipe	9b52c61d95	Updated banner with better warning ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-20 18:49:04 -07:00
snipe	36464bc17d	Fix confirmation, because apparently you can't pass that along via cli vs interactively ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-20 18:22:06 -07:00
snipe	f35208d58d	Clean up, find custom fields and drop those columns ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-20 18:03:13 -07:00
snipe	4d30edd535	Let's make sure to keep some of the stuff we need on the demo as well ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-20 17:29:32 -07:00
snipe	957f33c8cf	First stab at a better pave command ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-20 17:19:41 -07:00
snipe	b331bb33d9	Code fixes and a new migration ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-20 15:37:24 -07:00
snipe	8a93e1e796	Remove asset call on depreciation report controller method ... We ajax this in now, so no need for it Signed-off-by: snipe <snipe@snipe.net>	2021-09-15 13:49:53 -07:00
snipe	d96f877aa4	Default show_in_nav to 0 ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-15 11:33:13 -07:00
snipe	02705d0d1a	Fixed S3 upload path ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-14 12:49:17 -07:00
snipe	80175cffdc	Fixed #9969 - added color, show_in_nav, and default_label to status labels API ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-10 20:44:49 -07:00
snipe	514f9aa64a	Fixed #9973 - add use_default_eula to categories API endpoint ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-10 20:23:49 -07:00
Ivan Nieto Vivanco	f1b8b7d11d	Convert whatever value we get in column 'checkout type' to all lowercase	2021-09-08 12:49:29 -05:00
snipe	cfaa6679af	Merge pull request #10031 from inietov/fixes/checkout_date_not_saved_in_asset_history ... Fixed #10026: Checkout date not saved in asset history	2021-09-07 17:37:30 -07:00
snipe	bb5a04491d	Merge pull request #10053 from inietov/fixes/accepted_assets_still_showing_unaccepted_report ... Fix Accepted Assets still showing on Unaccepted Asset Report	2021-09-07 12:15:17 -07:00
snipe	f9c0eee7c9	Merge pull request #10048 from inietov/fixes/blank_results_for_non_superadmins ... Fix to PR #10009. The asset search now works as intended for normal users	2021-09-07 12:14:29 -07:00
Ivan Nieto Vivanco	27ff0be9a8	Delete checkout acceptances when an asset is checked in without response	2021-09-07 12:01:32 -05:00
Ivan Nieto Vivanco	b5525e6a21	Deleted additional bindings present also in the User model	2021-09-07 00:57:12 -05:00
Ivan Nieto Vivanco	c3eb7a3425	Remove aditional bindings that 'overflows' the generated queries	2021-09-07 00:15:21 -05:00
snipe	94310e18b1	Presenters and Transformers for Depreciation report ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-01 17:33:59 -07:00
snipe	2f25eb598b	Allow the Assets API controller to handle depreciation reports ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-01 17:33:39 -07:00
Ivan Nieto Vivanco	e621eaf456	Change date showed in the activity report view, the condition is now on action_date	2021-09-01 13:58:17 -05:00
Ivan Nieto Vivanco	ea1d7a42e2	Add condition to check if action_date have value and if it have assign it to created_at parameter	2021-09-01 13:08:08 -05:00
snipe	4293674f4a	Added a few more fields to the users API ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-31 12:36:06 -07:00
snipe	aeae681326	Fixecd copypasta from state to zip ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-31 12:28:20 -07:00
snipe	4794f93224	Added additional fields for user search ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-31 12:24:53 -07:00
snipe	f58ed6bd1f	Merge pull request #9982 from Shankschn/master ... Fixes: When using API CheckIn assets, there will be two CheckIn records in the Activity Report log for each asset.	2021-08-31 11:08:52 -07:00
Ivan Nieto Vivanco	d917ae51b7	Remove e() function from other input fields	2021-08-31 04:01:20 -05:00
Ivan Nieto Vivanco	e7470b5545	Remove e() function from the saved notes when updating an asset maintenance	2021-08-31 03:50:57 -05:00
snipe	a02534b6c8	Merge pull request #10009 from inietov/fixes/blank_results_for_non_superadmins ... Fixes #9985. Error 500 when using the asset search - blank results for non super-admins	2021-08-30 13:29:18 -07:00
snipe	6d3a82aacf	Merge pull request #10008 from uberbrady/fix_unlink_error_ldap ... Fixed rb445 and rb446 - the unlink calls for the client-side certs...	2021-08-30 12:47:38 -07:00
Brady Wetherington	da0b375773	Fixed rb445 and rb446 - the unlink calls for the client-side certs ... need to be wrapped around a file-existence check	2021-08-30 12:29:16 -07:00
Ivan Nieto Vivanco	d1304cc975	Add sentence to infer the table's name according to the query passed	2021-08-30 13:44:26 -05:00
snipe	085be16966	Merge remote-tracking branch 'origin/develop'	2021-08-25 14:45:41 -07:00
Ivan Nieto Vivanco	4a79c77630	Add a condition to checkin licenses assigned to Assets	2021-08-25 16:38:34 -05:00
Ivan Nieto Vivanco	137f55e4ce	Change condition to return the actual max upload size allowed to files	2021-08-25 15:27:25 -05:00
snipe	4abb9baa95	Merge remote-tracking branch 'origin/develop'	2021-08-24 15:29:41 -07:00
Shanks	961e80404a	Update AssetsController.php ... Fix：When using API CheckIn assets, there will be two CheckIn records in the Activity Report log for each asset.	2021-08-24 16:39:58 +08:00
snipe	70f6753f50	Merge pull request #9979 from uberbrady/add_client_side_ldap_certs ... Add client side ldap certs	2021-08-23 16:30:46 -07:00
snipe	9285697611	Merge remote-tracking branch 'origin/develop'	2021-08-20 17:30:52 -07:00
snipe	9687bcb41c	Fixed issue where consumables model number was not searchable ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-20 17:30:35 -07:00
snipe	24af2ab67a	Merge remote-tracking branch 'origin/develop'	2021-08-18 14:31:53 -07:00
snipe	7b447a2f16	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2021-08-18 14:31:38 -07:00
Ivan Nieto Vivanco	f04e23cacb	Add a small refactor so we not repeat logic	2021-08-18 15:22:53 -05:00
Ivan Nieto Vivanco	4207858a14	Fix the count in StatuslabelsController@getAssetsCountByStatuslabel() function that allows it to pass the correct index ... Also edit the default color for assets with the Pending label, so it match the color in the docs	2021-08-18 14:08:35 -05:00
snipe	b88fde5dae	Nicer comment formatting ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-18 12:07:09 -07:00
snipe	b5bb74b8ca	Merge remote-tracking branch 'origin/develop'	2021-08-17 22:01:23 -07:00
snipe	cce808c784	Fixed #9909 and #9714 - applies v6 currency formatter to v5 [ch16628] ... Duplicates d4e46ee41f but on v5 Signed-off-by: snipe <snipe@snipe.net>	2021-08-17 21:59:33 -07:00
Brady Wetherington	4d4badf830	Got the client-side LDAP setup working well enough for sync!	2021-08-17 14:43:36 -07:00
Godfrey M	cef0e424e1	adds a Floor value for depreciation models	2021-08-16 18:14:10 -07:00
James Emanuel	98285001ac	Fixing Typo on creating Depreciation	2021-08-16 15:33:17 +03:00
snipe	29c584289f	Merge remote-tracking branch 'origin/develop'	2021-08-14 14:09:31 -07:00
snipe	ef687fdc7b	Fixed typo ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-14 14:07:04 -07:00
snipe	45caa8a90d	Added restore functionalty to asset API ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-14 14:06:15 -07:00
Godfrey M	01037cf9cb	initial commit: adds migration, input area and transformer modifications for depreciation minimum value [ch15358]	2021-08-10 18:26:43 -07:00
Tobias Regnery	eced1ab77f	Fix advanced search with serial and another field ... The advanced search in /hardware produces incorrect results if the serial is combined with another field like category. There is a typo as the fieldname 'product_key' doesn't exist. Change this to 'serial'. Also change the last If-Statement from ->orWhere() to ->where(). Now additional fields like custom fields can be combined with other searches in an And-Clause. I think this function could be simplified further, but this is the minimal bugfix.	2021-08-05 15:07:28 +02:00
Computroniks	f994af16da	Added function to calculate cost based on quantity ... sumFormatterQuantity takes the same input as sumFormatter but instead of calculating the specified columns total it calculates the total purchase cost of an item based upon its quantity. Also updated affected pressenters to use this formatter. Signed-off-by: Computroniks <mnickson@sidingsmedia.com>	2021-08-04 22:09:50 +01:00
NMC	4cfc4aec1d	fix false search in api.	2021-08-01 15:10:22 -04:00
NMC	976957ddd4	Add Maintained filed in licenses view and api. + Expires in API	2021-08-01 14:30:16 -04:00
snipe	cdc4940338	Merge pull request #9881 from inietov/fixes/integrity_constraint_violation__emailing_password_reset ... Fixes Integrity constraint violation when emailing password reset.	2021-07-30 16:01:53 -07:00
Ivan Nieto Vivanco	27cdfbc579	Edit the log message	2021-07-29 16:14:52 -05:00
Ivan Nieto Vivanco	405545cd88	Add exception handling in the ForgotPasswordController	2021-07-29 16:02:45 -05:00
snipe	593e1234a5	Merge pull request #9797 from markbrule/fixes/search_parameter_checkedout_api ... Fixed #9671: wrap OR queries in sub-condition in checkedout search	2021-07-27 14:39:10 -07:00
snipe	9a5d9eafeb	Merge pull request #9709 from morning-bird/master ... add CompanyableTrait	2021-07-27 14:38:21 -07:00
Ivan Nieto Vivanco	38a2a0c1ee	Add the pertinent filters in Accessories and Consumables controllers	2021-07-26 12:59:15 -05:00
snipe	75d4a46fff	Merge pull request #9856 from inietov/bug/ch15413/model_number_is_not_on_accessory_import_dropdown ... Fixes: Model Number is not on the Accessory import dropdown of mappable fields [ch15413]	2021-07-24 01:05:26 -07:00
Ivan Nieto Vivanco	0f1c48cb6f	Add the field model_number to Accessory importer	2021-07-24 02:38:44 -05:00
Ivan Nieto Vivanco	35ffe8b902	Adds a check to know if the asset is checked out to the logged in user to allow check the state int the view	2021-07-20 18:56:22 -05:00
snipe	5f842d02ef	Fixed namespace ... Signed-off-by: snipe <snipe@snipe.net>	2021-07-15 13:24:40 -07:00
Petri Asikainen	f753404197	missed this when rebasing	2021-07-15 12:26:14 +03:00
Petri Asikainen	5d999d2572	legacy image_source support for store	2021-07-15 12:26:14 +03:00
Petri Asikainen	d50294e8e2	Just mention source of idea as code rewriten	2021-07-15 12:26:14 +03:00
Petri Asikainen	2fc3ff671e	hand legacy image_source field	2021-07-15 12:26:14 +03:00
Petri Asikainen	89cc84f1d9	convert image_source field ... This reverts commit b2d3ba7410.	2021-07-15 12:26:14 +03:00
Petri Asikainen	f24138da44	Revert "Handle image_source with ConvertBase64ToFiles" ... This reverts commit 168d7f7004.	2021-07-15 12:26:14 +03:00
Petri Asikainen	a76b36cad9	Handle image_source with ConvertBase64ToFiles	2021-07-15 12:26:14 +03:00
Petri Asikainen	1936fc2ea9	Better debug comment	2021-07-15 12:26:14 +03:00
Petri Asikainen	23f77b2894	Fixed case again	2021-07-15 12:26:14 +03:00
Petri Asikainen	15dd7061ed	removed unused Bag-functions	2021-07-15 12:26:14 +03:00
Petri Asikainen	5f81488679	fix debug placement	2021-07-15 12:26:14 +03:00
Petri Asikainen	c894e8ceb3	handle files via standard field	2021-07-15 12:26:14 +03:00
Petri Asikainen	bbe964c6b2	debug trait	2021-07-15 12:26:14 +03:00
Petri Asikainen	2325b1d8c2	Try without trait	2021-07-15 12:26:14 +03:00
Petri Asikainen	948a741935	case case again..	2021-07-15 12:26:14 +03:00
Petri Asikainen	d7d3681d71	trait base64 encoded files	2021-07-15 12:26:13 +03:00
Petri Asikainen	e6d432423d	trait base64 encoded files	2021-07-15 12:26:13 +03:00
Petri Asikainen	6173aaa25c	fixed capitalization	2021-07-15 12:26:13 +03:00
Petri Asikainen	91af3f2661	Support images and multipart requests	2021-07-15 12:26:13 +03:00
Petri Asikainen	4191dd39ea	Support images and multipart requests	2021-07-15 12:26:13 +03:00
Petri Asikainen	2f3501bdc2	Support images and multipart requests	2021-07-15 12:26:13 +03:00
Petri Asikainen	f1b8ce0a1b	Support images and multipart requests	2021-07-15 12:26:13 +03:00
Petri Asikainen	6a21660c14	Support images and multipart requests	2021-07-15 12:26:13 +03:00
Petri Asikainen	64c8767e81	Support images and multipart requests	2021-07-15 12:26:13 +03:00
Petri Asikainen	0e7af80806	Support images and multipart requests	2021-07-15 12:26:13 +03:00
Petri Asikainen	e95b15d553	Support images and multipart requests	2021-07-15 12:26:13 +03:00
Petri Asikainen	bb269e0e5f	Support images and multipart requests	2021-07-15 12:26:13 +03:00
Petri Asikainen	60f13c8d79	Support images and multipart requests	2021-07-15 12:26:13 +03:00
Petri Asikainen	5081ca3512	Support images and multipart requests	2021-07-15 12:26:13 +03:00
Petri Asikainen	b4380c8012	Support images and multipart requests	2021-07-15 12:26:13 +03:00
Petri Asikainen	f6766c5f23	Support images and multipart requests	2021-07-15 12:26:07 +03:00
Petri Asikainen	8bbbb06c5e	testing image upload via api	2021-07-15 12:24:25 +03:00
Petri Asikainen	febf1ec20f	Support legacy image_source property	2021-07-14 13:09:50 +03:00
Petri Asikainen	7b12668af4	Merge branch 'develop' of github.com:snipe/snipe-it into feature/api-image-uploads	2021-07-13 17:23:44 +03:00
Oskar Stenberg	5b5874499d	Added import for min_amt for consumables	2021-07-12 11:46:19 +02:00
snipe	f785c3e759	Default to 1 if no qty is passed ... Signed-off-by: snipe <snipe@snipe.net>	2021-07-08 16:04:52 -07:00
Petri Asikainen	4379ea61fa	Just mention source of idea as code rewriten	2021-07-08 19:50:33 +03:00
Petri Asikainen	41deabf998	hand legacy image_source field	2021-07-07 09:33:48 +03:00
Petri Asikainen	7a424649c8	convert image_source field ... This reverts commit b2d3ba7410.	2021-07-07 09:24:24 +03:00
Petri Asikainen	b2d3ba7410	Revert "Handle image_source with ConvertBase64ToFiles" ... This reverts commit 168d7f7004.	2021-07-07 09:20:38 +03:00
Petri Asikainen	168d7f7004	Handle image_source with ConvertBase64ToFiles	2021-07-07 09:08:37 +03:00
Mark Brule	f706c87cbc	wrap OR queries in sub-condition	2021-07-06 20:43:17 +00:00
Tobias Regnery	9e1d7ffb5d	Fix scope of departments for FullMultipleCompanySupport ... If a user tries to view or edit a department from a different company with FullMultipleCompanySupport enabled, there is a 403 error displayed. Apply the correct company scope in order to only display the departments from the own company in the departments view. Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com>	2021-07-06 09:45:46 +02:00
Petri Asikainen	f53cabee24	Better debug comment	2021-07-06 07:26:16 +03:00
Petri Asikainen	e275c9ee90	Fixed case again	2021-07-06 07:10:03 +03:00
Petri Asikainen	3d8acd1bd8	removed unused Bag-functions	2021-07-06 07:00:12 +03:00
Petri Asikainen	2169c62700	Merge branch 'feature/api-image-uploads-json' into feature/api-image-uploads	2021-07-06 06:55:54 +03:00
Petri Asikainen	c21b291484	keep using request	2021-07-06 06:51:07 +03:00
Petri Asikainen	c1bc2486ad	keep using request	2021-07-06 06:49:19 +03:00
Petri Asikainen	e3166c2209	fix debug placement	2021-07-06 06:41:37 +03:00
Petri Asikainen	7a5b5c291d	merged from develop	2021-07-06 06:38:32 +03:00
Petri Asikainen	d66ef233bf	handle files via standard field	2021-07-06 06:25:37 +03:00
Petri Asikainen	013df747d7	debug trait	2021-07-05 09:59:19 +03:00
Petri Asikainen	02fb7ac03e	Try without trait	2021-07-04 13:39:46 +03:00
Petri Asikainen	d48a9d549d	Try without trait	2021-07-04 13:37:05 +03:00
Petri Asikainen	f59f3dbde4	case case again..	2021-07-02 10:43:15 +03:00
Petri Asikainen	f4fa6836cb	trait base64 encoded files	2021-07-02 10:29:26 +03:00
Petri Asikainen	e846e6ac76	trait base64 encoded files	2021-07-02 10:18:18 +03:00
Petri Asikainen	e15159b9c3	trait base64 encoded files	2021-07-02 10:17:29 +03:00
Ivan Nieto Vivanco	5545457536	Remove an else statement that doesn't allow to continue the importer flow.	2021-07-01 14:26:03 -05:00
Brady Wetherington	102591b009	Better debugging output, and remove non-PHP-7.3-compatible option	2021-06-30 14:53:08 -07:00
Petri Asikainen	347e742e88	merged current upstream/develop	2021-06-30 12:02:05 +03:00
snipe	868419b35b	Components checkin/checkout via API ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-30 01:02:44 -07:00
Petri Asikainen	6048acc95d	fixed capitalization	2021-06-30 06:36:12 +03:00
snipe	50a644a2c0	Did I seriously spell my own goddamned name wrong in the docblock?? ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-29 10:28:00 -07:00
snipe	c517ec849d	Small refactor for login Livewire ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-29 10:05:23 -07:00
snipe	8780fa0a26	Use correct auth failure message ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-29 07:46:39 -07:00
Petri Asikainen	b0aa26e6cb	Support images and multipart requests	2021-06-29 14:25:20 +03:00
Petri Asikainen	b49733832c	Support images and multipart requests	2021-06-29 12:29:17 +03:00
Petri Asikainen	8c0be3aa87	Support images and multipart requests	2021-06-29 12:29:07 +03:00
Petri Asikainen	a936744e2e	Support images and multipart requests	2021-06-29 12:28:52 +03:00
Petri Asikainen	f9da83bc46	Support images and multipart requests	2021-06-29 12:28:42 +03:00
Petri Asikainen	fc8498972e	Support images and multipart requests	2021-06-29 12:28:32 +03:00
Petri Asikainen	4ba75291e4	Support images and multipart requests	2021-06-29 12:27:18 +03:00
Petri Asikainen	a7b1e31776	Support images and multipart requests	2021-06-29 12:27:08 +03:00
Petri Asikainen	604a0b6df1	Support images and multipart requests	2021-06-29 12:26:59 +03:00
Petri Asikainen	4ed9788a0e	Support images and multipart requests	2021-06-29 12:26:45 +03:00
Petri Asikainen	e8a4059db9	Support images and multipart requests	2021-06-29 12:26:24 +03:00
Petri Asikainen	aa402bf896	Support images and multipart requests	2021-06-29 12:26:15 +03:00
Petri Asikainen	8d4219759e	Support images and multipart requests	2021-06-29 12:25:47 +03:00
snipe	704eb728bc	Added livewire the login screen ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-29 02:16:57 -07:00
snipe	ebb0aa5532	Merge pull request #9766 from uberbrady/livewire_integration_v6 ... Livewire integration for Snipe-IT v6	2021-06-28 21:51:00 -07:00
Brady Wetherington	a6ac4f94f1	Breaking out field-listing into its own Livewire blade for use elsewhere	2021-06-28 21:00:20 -07:00
Brady Wetherington	ea1f1eb972	Get some basic Livewire going for 'edit model's default values.	2021-06-28 21:00:20 -07:00
Brady Wetherington	8e66abb926	Basic Laravel7 compatibility, starting getting Livewire going	2021-06-28 21:00:16 -07:00
snipe	4af247f845	Added additional boxes to the dashboard ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 16:36:15 -07:00
snipe	d4e46ee41f	Added comma in US currency format [ch16628] ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 16:14:32 -07:00
snipe	68c751fe63	Break out name into first name and last name [ch1382] ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 15:55:33 -07:00
snipe	a016f4ecd0	Applies PR #9761 to integration ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 13:11:22 -07:00
snipe	19413a63da	Make notes field searchable on status labels ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 11:53:17 -07:00
snipe	a4fd0c9c6d	Fixed #9745 - added searchable, sortable notes field to status labels ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 11:52:57 -07:00
Petri Asikainen	e0c5205e9b	save images	2021-06-28 08:11:33 +03:00
Petri Asikainen	695bf1e15f	save images	2021-06-28 07:58:08 +03:00
Petri Asikainen	0e2efb6573	Merge branch 'develop' of github.com:snipe/snipe-it into feature/api-image-uploads	2021-06-27 14:38:55 +03:00
snipe	e44a25126d	Merge pull request #9676 from inietov/fixes/asset_checkin_api_doesnt_send_notification ... Fixes #9666 Asset checkin via api doesn't send notification.	2021-06-23 14:35:07 -07:00
snipe	c801305c9b	Merge pull request #9681 from tulsaschoolsdata/9680-fix-statuslabels-asset-count ... Fixed #9680: Use Eloquent’s `withCount` method to count Statuslabel assets	2021-06-23 14:34:34 -07:00
Petri Asikainen	491a788cd0	testing image upload via api	2021-06-23 11:22:41 +03:00
snipe	dc157f8f78	Add components and users count to dashboard ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-19 16:16:18 -07:00
Petri Asikainen	ae2c77f97f	Allow to bulk update min_amt	2021-06-17 00:36:04 +03:00
GMS ICT 2	ea7f18d0e6	add CompanyableTrait	2021-06-15 15:32:44 +07:00
snipe	c407b52bbf	Updated Cors ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-12 00:23:30 -07:00
snipe	226b208f7c	Reset handler to stock for now ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-11 22:19:10 -07:00
snipe	c08f70b03c	Restore exeption handler functionality ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-11 21:51:28 -07:00
snipe	fa786e615e	Moved HasFactory ... Signed-off-by: snipe <snipe@snipe.net>	2021-06-11 19:02:19 -07:00
snipe	3095a78664	Small tweaks to Dashboard controller ... Still gettiing a bizarre `Non-static method App\Http\Controllers\DashboardController::index() should not be called statically` error Signed-off-by: snipe <snipe@snipe.net>	2021-06-11 14:43:47 -07:00
snipe	a8123092af	Misc fixes for shift ... // TODO - re-fix the exception handler Signed-off-by: snipe <snipe@snipe.net>	2021-06-11 14:07:50 -07:00
Laravel Shift	b62d1f49e4	Shift cleanup	2021-06-10 20:19:27 +00:00
Laravel Shift	104b441e0d	Shift to class based factories	2021-06-10 20:17:44 +00:00
Laravel Shift	9f43ce97e9	Convert deprecated $dates property to $casts	2021-06-10 20:17:18 +00:00
Laravel Shift	bdf23e472e	Shift to class based routes	2021-06-10 20:17:14 +00:00
Laravel Shift	ddc8b8648b	Shift service providers	2021-06-10 20:17:07 +00:00
Laravel Shift	4ed3d6afb8	Shift HTTP kernel and middleware	2021-06-10 20:17:04 +00:00
Laravel Shift	802dc9240d	Shift bindings ... PHP 5.5.9+ adds the new static `class` property which provides the fully qualified class name. This is preferred over using class name strings as these references are checked by the parser.	2021-06-10 20:16:56 +00:00
Laravel Shift	934afa036f	Adopt Laravel coding style ... Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions. You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started. [1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer [2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200	2021-06-10 20:15:52 +00:00
Travis Miller	4f6b1bb12d	Fixed #9680: Use Eloquent’s withCount method to count Statuslabel assets	2021-06-09 11:52:04 -05:00
Ivan Nieto Vivanco	bb227cafb2	Added event to trigger the notification.	2021-06-08 13:16:13 -05:00
Ivan Nieto Vivanco	9f944ad497	Added the 'required' attribute to the input file n the upload file form modal. Added a validation for the UserFilesController if the user doesn't select any file to upload [ch16471].	2021-05-27 15:48:13 -05:00
snipe	9f2b4c721d	Allow password reset from user profile ... Signed-off-by: snipe <snipe@snipe.net>	2021-05-26 15:32:23 -07:00
snipe	b8d413a6b8	Merge pull request #9632 from inietov/fixes/api_allow_duplicate_asset_tags ... Fixes an issue that allows duplicate asset tags when the Asset is created via API.	2021-05-26 13:34:59 -07:00
snipe	200d0804ec	Merge pull request #9630 from kcoyo/develop ... Fixed #9607: Sessions expire for SAML/RemoteUser/LDAP	2021-05-26 13:04:13 -07:00
Ivan Nieto Vivanco	d9f5f1182a	Delete a couple lines that rewrites validation rules for asset tags in the model Asset.php:save() method.	2021-05-25 23:09:27 -05:00
kcoyo	cee6f0d579	Update LoginController.php ... Fixed #9607 - Sessions expire for SAML/RemoteUser/LDAP	2021-05-25 16:37:34 -07:00
snipe	5b4550a6a8	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2021-05-21 16:56:15 -07:00
snipe	1a7edb3411	Accept webp in uploads (not just image files) ... Signed-off-by: snipe <snipe@snipe.net>	2021-05-21 16:56:11 -07:00
Brady Wetherington	94c1d36e08	The legacy 'logo.png' might not be a PNG, so switched to wildcard.	2021-05-21 15:55:37 -07:00
Brady Wetherington	e71bba441e	Several improvements to the snipeit:restore Artisan command ... The output now focuses on files that were skipped. Wildcard support was added for individual files. A progress bar fills as the files are transferred from the ZIPball to the filesystem. A new command-line switch can be used to disable the progress bar. Barcode restores are now skipped (we'd probably prefer to regenerate them). A few missed directories have been added in. Some logic to skip macOS resource-fork files has been put in. Some bugs with array operations were fixed. There's now a concept of 'valid' and 'invalid' files for wildcard operations.	2021-05-21 15:23:23 -07:00
sh1hab	f43413bdc3	Feature snipe#9378 update	2021-05-21 10:19:04 +06:00
Marc Leuser	4030789786	fix LicenseSeatsController method documentation (#9584) ... in an attempt to get the automatic API reference generation to work	2021-05-14 16:14:32 -07:00
Brady Wetherington	6066005aeb	[WIP] Initial rough stabs at the Backup Migrator. It kinda-sorta works? (#9457) ... * Initial rough stabs at the Backup Migrator. It kinda-sorta works? * Fix hardcoded mysql path var	2021-05-12 17:44:39 -07:00
Ivan Nieto Vivanco	6ed5dff1a5	Fix the target path to copy the demo logos in the database\seeds\SettingsSeeder.php. Also added the code that copies the demo logos to app\Console\Commands\ResetDemoSettings.php (#9571)	2021-05-12 16:41:49 -07:00
Thomas Misilo	18b1a155bf	Change from ENV to config value for PUBLIC_AWS_URL ... When running config:cache the env('PUBLIC_AWS'URL') value disappears and isn't available, so it doesn't get added to the CSP Policy.	2021-05-11 09:51:35 -05:00
snipe	ded61614d1	Attempt to fix transient LDAP bug ... Signed-off-by: snipe <snipe@snipe.net>	2021-05-07 18:13:04 -07:00
snipe	a704614397	Bumped max for country on model ... Signed-off-by: snipe <snipe@snipe.net>	2021-05-07 16:42:26 -07:00
Tom Misilo	4e408cbc42	Fix CSP Always being Enabled unless in debug mode. (#9543)	2021-05-05 10:51:47 -07:00
Ivan Nieto Vivanco	36a43642d8	Changed the orderBy clause inside the custom reports function that forms the CSV to be 'id' so making it a unique value and don't causes repeated items. [ch14587] (#9535)	2021-05-04 23:50:02 -07:00
markbrule	6c1553167d	issue #9422 - pivot ID was being used as a user_id (#9512)	2021-05-04 22:27:01 -07:00
Tom Misilo	a6bbe1fec3	Delete file from assets folder, not just the ref. (#9525)	2021-05-04 22:18:22 -07:00