snipe-it

mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 01:24:06 -08:00

Author	SHA1	Message	Date
snipe	c52faaf23d	Added checkout to permissions check Signed-off-by: snipe <snipe@snipe.net>	2022-05-11 19:02:23 -07:00
snipe	780222d372	Merge remote-tracking branch 'origin/master' into develop Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # resources/views/users/print.blade.php	2022-05-10 17:26:26 -07:00
snipe	4fccf4ddc4	Few more log lines Signed-off-by: snipe <snipe@snipe.net>	2022-05-10 12:27:42 -07:00
snipe	646166b2b6	Removed debug line Signed-off-by: snipe <snipe@snipe.net>	2022-05-10 12:16:07 -07:00
snipe	f4e737eaf3	More SAML debugging Signed-off-by: snipe <snipe@snipe.net>	2022-05-10 12:14:22 -07:00
snipe	f572eaa421	Added debugging for SAML login Signed-off-by: snipe <snipe@snipe.net>	2022-05-10 12:07:07 -07:00
snipe	dfd4d54433	Fixed route name Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 15:46:25 -07:00
snipe	220f94faee	Check that the session key exists Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 14:10:47 -07:00
snipe	22ec3c1398	Use error style instead of warn/info when nothing was selected Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:41:52 -07:00
snipe	caf17d4f25	Fixed wrong variable name Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:41:32 -07:00
snipe	e1b24bb763	Added a comment Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:30:21 -07:00
snipe	76213ec3d9	Create a session on bulk actions, store it for redirect, then delete it Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:14:08 -07:00
snipe	243739e9c3	Added missing gate for bulk checkout Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:13:36 -07:00
snipe	784bf4d784	Merge remote-tracking branch 'origin/master' into develop Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .github/ISSUE_TEMPLATE/feature_request.yml # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/ReportsController.php # config/version.php # package-lock.json # package.json # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/views/users/print.blade.php # webpack.mix.js	2022-05-06 01:52:43 -07:00
snipe	b20921cb62	Removed duplicate session regenerate Signed-off-by: snipe <snipe@snipe.net>	2022-05-05 21:35:05 -07:00
snipe	0939591efb	Merge pull request #11003 from inietov/fixes/integrity_constraint_violation_column_order_cannot_be_null_develop Fixes QueryException Integrity constraint violation: Column 'order' cannot be null for develop	2022-05-05 13:28:00 -07:00
snipe	a859eac4a0	Merge pull request #11002 from inietov/fixes/integrity_constraint_violation_column_order_cannot_be_null Fixes QueryException Integrity constraint violation: Column 'order' cannot be null	2022-05-05 13:27:45 -07:00
snipe	953b3a8d6e	Merge pull request #10993 from snipe/rcs/merge_master_into_develop_for_rc_8 Merge master into develop for RC 6.0.0-8	2022-05-05 10:53:17 -07:00
Ivan Nieto Vivanco	37805509da	Adds an integer casting to the order input field so it cannot be null	2022-05-01 15:27:05 -05:00
Ivan Nieto Vivanco	01232d9a54	Adds an integer casting to the order input field so it cannot be null	2022-05-01 15:16:56 -05:00
Ivan Nieto Vivanco	ac8da55270	Evaluate if an item still exists before trying to get its name in the report	2022-05-01 13:25:55 -05:00
Ivan Nieto Vivanco	1cbbf8f976	Evaluate if an item still exists before trying to get its name in the report	2022-05-01 13:11:05 -05:00
Johnson Yi	92fe1287ea	Do not saml login automatically after normal logout	2022-04-29 15:35:08 +00:00
snipe	9aac1cbba4	Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Console/Commands/MoveUploadsToNewDisk.php # app/Http/Controllers/ActionlogController.php # app/Http/Controllers/Api/LicensesController.php # app/Http/Controllers/Api/StatuslabelsController.php # app/Http/Controllers/Assets/AssetCheckinController.php # app/Http/Controllers/Licenses/LicensesController.php # app/Http/Controllers/Users/BulkUsersController.php # app/Http/Requests/AssetCheckoutRequest.php # app/Importer/LicenseImporter.php # app/Models/Actionlog.php # app/Models/License.php # app/Models/User.php # app/Observers/AssetObserver.php # composer.lock # config/version.php # database/factories/LicenseFactory.php # database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php # database/migrations/2018_10_18_191228_add_kits_licenses_table.php # database/migrations/2018_10_19_153910_add_kits_table.php # database/migrations/2018_10_19_154013_add_kits_models_table.php # database/migrations/2019_02_07_185953_add_kits_consumables_table.php # database/migrations/2019_02_07_190030_add_kits_accessories_table.php # package-lock.json # package.json # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/lang/ar/general.php # resources/lang/ar/passwords.php # resources/lang/cs/general.php # resources/lang/cs/passwords.php # resources/lang/de/admin/custom_fields/general.php # resources/lang/de/admin/settings/general.php # resources/lang/de/admin/settings/message.php # resources/lang/fr/admin/custom_fields/general.php # resources/lang/fr/admin/hardware/general.php # resources/lang/fr/admin/locations/table.php # resources/lang/fr/admin/settings/message.php # resources/lang/hu/admin/custom_fields/general.php # resources/lang/hu/admin/settings/general.php # resources/lang/hu/general.php # resources/lang/it/admin/settings/general.php # resources/lang/nl/admin/custom_fields/general.php # resources/lang/nl/admin/settings/general.php # resources/lang/nl/general.php # resources/lang/pl/admin/custom_fields/general.php # resources/lang/sv-SE/passwords.php # resources/lang/tr/general.php # resources/views/hardware/view.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/reports/activity.blade.php # resources/views/users/print.blade.php	2022-04-28 17:49:06 +01:00
snipe	2e9cf8fa87	Added access gate to the requested assets index Signed-off-by: snipe <snipe@snipe.net>	2022-04-28 15:45:37 +01:00
snipe	6b1329133b	Adds status ID to asset checkout API endpoint Signed-off-by: snipe <snipe@snipe.net>	2022-04-15 13:06:35 +01:00
snipe	698c7f4904	Fixes potential XSS vuln in user requestable results Signed-off-by: snipe <snipe@snipe.net>	2022-04-15 12:22:20 +01:00
snipe	1441cf9f4f	Ports #10494 to master Signed-off-by: snipe <snipe@snipe.net>	2022-04-12 21:04:57 +01:00
snipe	7b891f0952	Merge pull request #10913 from inietov/fixes/bulk_user_edit_not_updating_asset_locations Fixes Bulk user edit not updating checked out asset locations	2022-04-07 19:41:01 +01:00
snipe	8218b5ef47	Merge pull request #10914 from inietov/fixes/bulk_user_edit_not_updating_asset_locations_develop Fixes Bulk user edit not updating checked out asset locations	2022-04-07 19:40:42 +01:00
Godfrey M	3eb7a87a66	fixes action_date for check-in not including H:i:s	2022-04-07 11:24:12 -07:00
Godfrey M	1325628039	fixes typo	2022-04-07 11:18:16 -07:00
Godfrey M	8498082f21	fixes typo	2022-04-07 11:16:40 -07:00
Godfrey M	6dc45c189b	removed deadspace	2022-04-07 11:10:36 -07:00
Godfrey M	5d0a1ebb7a	fixes action_date for check-in not including H:i:s	2022-04-07 11:08:43 -07:00
Ivan Nieto Vivanco	e1927aa154	Update Assets locations when user's location changes whey they got bulk-edited	2022-04-06 19:23:49 -05:00
Ivan Nieto Vivanco	6529a75683	Update Assets locations when user's location changes whey they got bulk-edited	2022-04-06 19:12:02 -05:00
Ivan Nieto Vivanco	b5378eff64	Fix several typos	2022-04-05 16:12:31 -05:00
snipe	a937bd34f6	Merge master back down into develop Signed-off-by: snipe <snipe@snipe.net>	2022-03-29 16:28:43 +01:00
snipe	7941a88623	Merge pull request #10817 from dampfklon/fix-10810-unaccepted-assets Fix #10810 unaccepted assets	2022-03-29 12:10:37 +01:00
snipe	b5f3a357e2	Merge pull request #10850 from Godmartinz/feature/sc-18937/add-manager-to-ldap-sync This looks good, thanks!	2022-03-29 12:06:01 +01:00
snipe	639409fb3f	Backporting #10829 to master Signed-off-by: snipe <snipe@snipe.net>	2022-03-25 13:00:16 +00:00
Godfrey M	a1429ce86b	removed manager_name from user files	2022-03-24 11:47:13 -07:00
Godfrey M	c1f8252388	adds manager field to LDAP sync	2022-03-24 11:24:39 -07:00
Godfrey M	55680762de	Merge branch 'develop' into feature/sc-18937/add-manager-to-ldap-sync	2022-03-22 16:33:58 -07:00
Godfrey Martinez	fe6a6740db	Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf	2022-03-22 10:10:56 -07:00
Godfrey M	3e01981576	clean up	2022-03-22 10:07:08 -07:00
Godfrey M	62352ef1a1	completes accessory eula agreement blade	2022-03-22 10:04:22 -07:00
Ivan Nieto Vivanco	319d816002	Update in the license seat the user that the asset with that license have assigned	2022-03-21 15:06:43 -06:00
Godfrey M	4956eb0410	WIP: needs to be tested. adds ldap_manager field to ldap sync	2022-03-21 11:15:39 -07:00
Godfrey M	220df9710e	adds most of the fields for an accessory eula agreement pdf	2022-03-21 09:18:29 -07:00
snipe	df60729140	Fixed #10769 - redirect user back to due for audit page This could probably take a little reworking, since if you are auditing from the Overdue for Audit page, we’d want to take you back there instead of the Due for Audit page. Signed-off-by: snipe <snipe@snipe.net>	2022-03-21 14:27:18 +00:00
snipe	e04ae63d02	Apply the fix to API controller too :( Signed-off-by: snipe <snipe@snipe.net>	2022-03-19 23:12:48 +00:00
snipe	7db252ade3	Fixed #10840 - defaulting to 0 on supplier ID if no value provided Signed-off-by: snipe <snipe@snipe.net>	2022-03-19 23:11:42 +00:00
Godfrey M	b2e78e3382	formats most of the pdf blade	2022-03-16 15:53:32 -07:00
Dampfklon	9818d16834	fix showDeletedFunction by reverting #9508	2022-03-16 20:20:46 +01:00
Godfrey M	5fcc3c39f3	routes eula agreements for download correctly to the asset history	2022-03-16 11:56:56 -07:00
snipe	9db8bd782d	Merging master down into develop Signed-off-by: snipe <snipe@snipe.net>	2022-03-16 18:02:07 +00:00
Godfrey M	6386fa1c5e	clean up	2022-03-16 09:54:10 -07:00
snipe	7498fe36e9	Removed extra space because pedantry Signed-off-by: snipe <snipe@snipe.net>	2022-03-16 16:45:03 +00:00
snipe	babf7c064b	Added ability to filter status label index endpoint by status type Signed-off-by: snipe <snipe@snipe.net>	2022-03-16 16:38:45 +00:00
Ivan Nieto Vivanco	570dd09dcd	Add validation to Accessories and Consumables to not let the user update the number of items to less than they already have checked out	2022-03-15 17:52:19 -06:00
Godfrey M	b2f7262cd2	adds table structure for asset history	2022-03-14 19:38:36 -07:00
Godfrey M	e1a6a2afc6	adds translation for accept_eula, a bit more logic on the Acceptance Controller that is not working yet	2022-03-10 12:15:50 -08:00
Godfrey M	59c583ac74	adds the ability to save eula pdfs to storage, still working on storing them in the DB and exposing them in the UI	2022-03-08 16:42:27 -08:00
snipe	3e2fe10480	Fixed getAssetBySerial Signed-off-by: snipe <snipe@snipe.net>	2022-03-05 09:03:29 -08:00
snipe	2d7a8b5e15	Merge pull request #10776 from snipe/added_trim_to_email_and_username Added trim to email and username	2022-03-04 11:57:33 -08:00
snipe	9a358087ec	Add remote user to bulk edit Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 06:47:23 -08:00
snipe	67134ca387	Do a trim() before inserting/updating Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 06:18:52 -08:00
snipe	0dfc27f56e	Added remote to allowed_columns for sorting Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 05:44:46 -08:00
snipe	43c1949092	Add remote option to user Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 05:35:26 -08:00
snipe	f840652395	Suppress errors for missing signatures Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 03:18:28 -08:00
snipe	67ed0d91c0	Handle file_get_contents more gracefully Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 02:54:37 -08:00
snipe	b876d0abb0	Merge remote-tracking branch 'origin/master' into develop Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .env.example # app/Http/Controllers/Auth/LoginController.php # app/Http/Kernel.php # app/Http/Transformers/ActionlogsTransformer.php # app/Importer/AssetImporter.php # app/Models/Accessory.php # app/Models/Consumable.php # app/Presenters/AccessoryPresenter.php # app/Presenters/ComponentPresenter.php # app/Presenters/ConsumablePresenter.php # app/Providers/AuthServiceProvider.php # composer.json # composer.lock # config/app.php # config/cors.php # config/version.php # package-lock.json # public/js/build/app.js # public/js/build/app.js.LICENSE.txt # public/js/dist/all.js # public/mix-manifest.json # resources/views/accessories/view.blade.php # resources/views/consumables/view.blade.php # resources/views/settings/saml.blade.php # routes/api.php	2022-03-03 21:59:38 -08:00
snipe	9acb5413f6	Added notes field to controllers Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 20:29:25 -08:00
snipe	08a2fe4edb	Merge pull request #10773 from snipe/features/adds_ldap_import_and_assets_count_to_user_api Features/adds ldap import and assets count to user api	2022-03-03 19:15:14 -08:00
snipe	6abe8f296b	We don’t need the users table here Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 19:12:03 -08:00
snipe	a53a67be4a	Added consumables, licenses, accessories count filters too Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 19:08:08 -08:00
snipe	b72cac3511	Adds ldap_import and assets_count filter to user API endpoint Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 19:03:35 -08:00
snipe	c940d36fff	Updated maintenance gate in API Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 18:49:54 -08:00
snipe	cd12028845	Use “update” instead of edit in gate Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 18:47:20 -08:00
snipe	3339a691e1	Merge pull request #10721 from snipe/features/adds_users_consumables_endpoint Added consumables endpoint to user API	2022-03-02 14:33:45 -08:00
Ivan Nieto Vivanco	0df9dd8320	Delete a function that is not longer used	2022-03-01 18:59:50 -06:00
Godfrey M	533670f3f1	faulty method for converting asset acceptance to pdf	2022-02-24 14:50:16 -08:00
snipe	42fcd29200	Fixed #10436 on master, applies #10449 Signed-off-by: snipe <snipe@snipe.net>	2022-02-22 21:06:54 -08:00
snipe	dc2e6c2b06	Adds consumables endpoint to user API Signed-off-by: snipe <snipe@snipe.net>	2022-02-22 20:44:34 -08:00
snipe	dd5f812d88	Merge remote-tracking branch 'origin/master' into develop Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Console/Commands/FixDoubleEscape.php # app/Console/Commands/LdapSync.php # app/Exceptions/Handler.php # app/Http/Controllers/Api/AssetMaintenancesController.php # app/Http/Controllers/Api/AssetModelsController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/CategoriesController.php # app/Http/Controllers/Api/CompaniesController.php # app/Http/Controllers/Api/DepartmentsController.php # app/Http/Controllers/Api/LicensesController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/ManufacturersController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/Api/SuppliersController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CustomFieldsController.php # app/Http/Controllers/SettingsController.php # app/Models/Loggable.php # app/Providers/AuthServiceProvider.php # config/version.php # database/migrations/2014_11_04_231416_update_group_field_for_reporting.php # database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php # package-lock.json # package.json # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json # resources/assets/js/components/forms/asset-models/fieldset-default-values.vue # resources/views/hardware/view.blade.php	2022-02-20 13:29:12 -08:00
Ivan Nieto Vivanco	23a6907975	Some minor stylistic changes	2022-02-17 18:05:06 -06:00
Ivan Nieto Vivanco	5b2a5ff124	Put the 'remember_token' column as null in the users table	2022-02-17 18:03:00 -06:00
Ivan Nieto Vivanco	548b172744	Logout every connected user	2022-02-17 18:00:24 -06:00
Ivan Nieto Vivanco	263893b3c6	Search logged in user that made the restore, if they doesn't exist in the restored system, add it again	2022-02-17 17:42:06 -06:00
Ivan Nieto Vivanco	811ca51c4f	Wipe database before restoration	2022-02-17 16:59:44 -06:00
snipe	d1b45a83b8	Blergh, one more linebreak Signed-off-by: snipe <snipe@snipe.net>	2022-02-17 14:51:06 -08:00
snipe	01a8701a8c	Removed extra linebreaks Signed-off-by: snipe <snipe@snipe.net>	2022-02-17 14:50:38 -08:00
snipe	67fe53e32a	Removed debugging, added comments Signed-off-by: snipe <snipe@snipe.net>	2022-02-17 14:50:07 -08:00
snipe	7f6b8cc43d	Removed carbon, since we went with PHP's datetime instead Signed-off-by: snipe <snipe@snipe.net>	2022-02-17 14:48:12 -08:00
snipe	5fe999eb02	Shored up the date math, updated the explanation Signed-off-by: snipe <snipe@snipe.net>	2022-02-17 14:34:33 -08:00
snipe	ea429d650e	Initial audit date fix Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 20:19:38 -08:00
snipe	824eedf7c2	Added UI elements for is_unique Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 13:47:48 -08:00
snipe	4f89dfee49	Merge pull request #10679 from snipe/fixes/timing_attack_mitigation_for_forgot_password Added usleep random to forgotten password method to mitigate timing attacks	2022-02-16 11:17:00 -07:00
snipe	5540069cce	Be more specific with deleted license point Require this value to be "true" speciically to get the deleted list Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 09:14:04 -08:00
snipe	1ad56760ce	Adds delete endpoint for licenses Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 09:08:50 -08:00
snipe	f878e0ad66	Fixes 2FA cookie -> user issue Signed-off-by: snipe <snipe@snipe.net>	2022-02-15 18:29:23 -08:00
snipe	178e440951	Added usleep :( Signed-off-by: snipe <snipe@snipe.net>	2022-02-15 18:09:58 -08:00
snipe	cab4fa1687	Fixes some conceptual gates Signed-off-by: snipe <snipe@snipe.net>	2022-02-14 15:42:23 -08:00
snipe	4804e5b3ab	Added Asset edit/delete gates to maintenances Signed-off-by: snipe <snipe@snipe.net>	2022-02-14 15:34:06 -08:00
snipe	1c0a96b0ce	Added gate to supplier Signed-off-by: snipe <snipe@snipe.net>	2022-02-13 11:58:12 -07:00
snipe	d77a47765e	Adds gate to supplier Signed-off-by: snipe <snipe@snipe.net>	2022-02-13 11:53:45 -07:00
Dampfklon	0d49fc3a2e	remove unused route, controller functions and view	2022-02-13 12:10:19 +01:00
snipe	2dad27eed6	Added additional gate for selectlists Signed-off-by: snipe <snipe@snipe.net>	2022-02-11 11:46:14 -08:00
snipe	f5ffda8053	Ahem. Signed-off-by: snipe <snipe@snipe.net>	2022-02-10 22:43:51 -08:00
snipe	70af10ae6c	Merge pull request #10640 from JonathonReinhart/10552-add-checkin-api-date Fix #10552: Add checkin_at parameter to /hardware/:id/checkin API	2022-02-10 09:54:20 -08:00
snipe	b9a8d45c07	Better messaging Signed-off-by: snipe <snipe@snipe.net>	2022-02-09 16:30:42 -08:00
snipe	7794c2f44b	Check that the fieldset exists before trying to detach it from the fieldset Signed-off-by: snipe <snipe@snipe.net>	2022-02-09 16:16:16 -08:00
snipe	6b25b53462	Merge pull request #10628 from inietov/fixes/default_values_dont_allow_checkbox_radio Fixes #10299 Default Values do not allow Checkbox/Radio Buttons	2022-02-09 14:39:46 -08:00
Ivan Nieto Vivanco	6d79c9f3e2	Save the default values for custom fields with same format than Assets do for actual values	2022-02-09 13:41:33 -06:00
Ivan Nieto Vivanco	a36957dd77	Finish the implementation of custom fields default values for checkboxes	2022-02-09 13:12:42 -06:00
Ivan Nieto Vivanco	2f3499e4b9	Show checkboxes a little less assy, actually save the data checked by them	2022-02-09 10:49:10 -06:00
Jonathon Reinhart	3536d08477	Add checkin_at parameter to /hardware/:id/checkin API Fixes #10552	2022-02-08 20:23:09 -05:00
Jonathon Reinhart	cd963179fd	Fix /hardware/{id}/checkin API response on error Fixes #10629	2022-02-08 01:08:42 -05:00
Ivan Nieto Vivanco	eac8e0bdba	Add a casting to a truthy/falsy that needs to be integer	2022-02-02 13:54:57 -06:00
snipe	ce154a2382	Merge pull request #10455 from adagioajanes/features/quickscan_checkin Added #10454: Quick Scan Checkin	2022-02-01 20:19:45 -08:00
snipe	06a5ea1530	Fixed duplicate use statement Signed-off-by: snipe <snipe@snipe.net>	2022-02-01 18:57:45 -08:00
snipe	5fded57ec6	Merge remote-tracking branch 'origin/master' into develop Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/ProfileController.php # app/Importer/ItemImporter.php # app/Importer/UserImporter.php # app/Models/Asset.php # app/Models/License.php # app/Providers/AppServiceProvider.php # app/Services/LdapAd.php # config/version.php # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json # resources/lang/ar/button.php # resources/lang/de/admin/companies/general.php # resources/lang/de/admin/custom_fields/general.php # resources/lang/de/admin/groups/titles.php # resources/lang/de/admin/hardware/form.php # resources/lang/de/admin/hardware/general.php # resources/lang/de/admin/hardware/message.php # resources/lang/de/admin/hardware/table.php # resources/lang/de/admin/kits/general.php # resources/lang/de/admin/locations/table.php # resources/lang/de/admin/reports/general.php # resources/lang/de/admin/settings/general.php # resources/lang/de/admin/settings/message.php # resources/lang/de/admin/users/general.php # resources/lang/de/general.php # resources/lang/de/mail.php # resources/lang/en/admin/asset_maintenances/message.php # resources/lang/en/admin/asset_maintenances/table.php # resources/lang/en/admin/companies/general.php # resources/lang/en/admin/companies/message.php # resources/lang/en/admin/custom_fields/general.php # resources/lang/en/admin/depreciations/general.php # resources/lang/en/admin/groups/titles.php # resources/lang/en/admin/hardware/form.php # resources/lang/en/admin/hardware/general.php # resources/lang/en/admin/hardware/table.php # resources/lang/en/admin/kits/general.php # resources/lang/en/admin/locations/table.php # resources/lang/en/admin/reports/general.php # resources/lang/en/admin/settings/general.php # resources/lang/en/admin/settings/message.php # resources/lang/en/admin/users/general.php # resources/lang/en/button.php # resources/lang/en/general.php # resources/lang/en/help.php # resources/lang/en/mail.php # resources/lang/en/passwords.php # resources/lang/hu/admin/hardware/general.php # resources/lang/hu/admin/hardware/table.php # resources/lang/hu/admin/locations/table.php # resources/lang/is/admin/locations/table.php # resources/lang/ko/admin/custom_fields/general.php # resources/lang/ko/general.php # resources/lang/nl/admin/hardware/general.php # resources/lang/nl/admin/hardware/message.php # resources/lang/nl/admin/hardware/table.php # resources/lang/nl/admin/locations/table.php # resources/lang/nl/admin/statuslabels/message.php # resources/lang/nl/admin/users/general.php # resources/lang/no/admin/companies/general.php # resources/lang/no/admin/custom_fields/general.php # resources/lang/no/admin/depreciations/general.php # resources/lang/no/admin/depreciations/table.php # resources/lang/no/admin/groups/titles.php # resources/lang/no/admin/hardware/form.php # resources/lang/no/admin/hardware/general.php # resources/lang/no/admin/hardware/table.php # resources/lang/no/admin/kits/general.php # resources/lang/no/admin/locations/table.php # resources/lang/no/admin/reports/general.php # resources/lang/no/admin/settings/general.php # resources/lang/no/admin/settings/message.php # resources/lang/no/admin/statuslabels/message.php # resources/lang/no/admin/users/general.php # resources/lang/no/button.php # resources/lang/no/general.php # resources/lang/no/mail.php # resources/lang/no/validation.php # resources/lang/pl/admin/companies/general.php # resources/lang/pl/admin/custom_fields/general.php # resources/lang/pl/admin/depreciations/general.php # resources/lang/pl/admin/depreciations/table.php # resources/lang/pl/admin/groups/titles.php # resources/lang/pl/admin/hardware/form.php # resources/lang/pl/admin/hardware/general.php # resources/lang/pl/admin/hardware/table.php # resources/lang/pl/admin/kits/general.php # resources/lang/pl/admin/locations/table.php # resources/lang/pl/admin/reports/general.php # resources/lang/pl/admin/settings/general.php # resources/lang/pl/admin/settings/message.php # resources/lang/pl/admin/users/general.php # resources/lang/pl/button.php # resources/lang/pl/general.php # resources/lang/pt-PT/admin/companies/general.php # resources/lang/pt-PT/admin/custom_fields/general.php # resources/lang/pt-PT/admin/depreciations/general.php # resources/lang/pt-PT/admin/depreciations/table.php # resources/lang/pt-PT/admin/groups/titles.php # resources/lang/pt-PT/admin/hardware/form.php # resources/lang/pt-PT/admin/hardware/general.php # resources/lang/pt-PT/general.php # resources/lang/pt-PT/help.php # resources/lang/pt-PT/validation.php # resources/lang/ro/admin/companies/general.php # resources/lang/ro/admin/custom_fields/general.php # resources/lang/ro/admin/groups/titles.php # resources/lang/ro/admin/hardware/form.php # resources/lang/ro/admin/hardware/general.php # resources/lang/ro/admin/hardware/message.php # resources/lang/ro/admin/hardware/table.php # resources/lang/ro/admin/locations/table.php # resources/lang/ro/admin/settings/message.php # resources/lang/ru/admin/companies/general.php # resources/lang/ru/admin/custom_fields/general.php # resources/lang/ru/admin/settings/general.php # resources/lang/ru/button.php # resources/lang/ru/general.php # resources/lang/ru/validation.php # resources/lang/sk/admin/settings/general.php # resources/lang/sk/button.php # resources/lang/sk/general.php # resources/lang/tr/admin/hardware/form.php # resources/lang/tr/admin/hardware/table.php # resources/lang/tr/admin/kits/general.php # resources/lang/tr/admin/locations/table.php # resources/lang/tr/admin/reports/general.php # resources/lang/tr/admin/settings/general.php # resources/lang/tr/admin/settings/message.php # resources/lang/tr/admin/statuslabels/message.php # resources/lang/tr/admin/users/general.php # resources/lang/tr/button.php # resources/lang/tr/general.php # resources/lang/zh-CN/admin/companies/general.php # resources/lang/zh-CN/admin/custom_fields/general.php # resources/lang/zh-CN/admin/depreciations/general.php # resources/lang/zh-CN/admin/depreciations/table.php # resources/lang/zh-CN/admin/groups/titles.php # resources/lang/zh-CN/admin/hardware/form.php # resources/lang/zh-CN/admin/hardware/general.php # resources/lang/zh-CN/admin/hardware/message.php # resources/lang/zh-CN/admin/hardware/table.php # resources/lang/zh-CN/admin/kits/general.php # resources/lang/zh-CN/admin/locations/table.php # resources/lang/zh-CN/admin/reports/general.php # resources/lang/zh-CN/admin/settings/general.php # resources/lang/zh-CN/admin/settings/message.php # resources/lang/zh-CN/admin/statuslabels/message.php # resources/lang/zh-CN/admin/users/general.php # resources/lang/zh-CN/button.php # resources/lang/zh-CN/general.php # resources/lang/zh-CN/mail.php # resources/views/depreciations/edit.blade.php	2022-02-01 18:53:05 -08:00
Ivan Nieto Vivanco	3ef775533a	Adds actionlog for bulk edits	2022-02-01 12:10:46 -06:00
Ivan Nieto Vivanco	2fec40d7df	Adds actionlog for bulk edits	2022-02-01 00:00:12 -06:00
snipe	aa3aa78204	Adds Lookup Asset by Custom Field via API [sc-18632] Signed-off-by: snipe <snipe@snipe.net>	2022-01-28 09:08:48 -08:00
Ivan Nieto Vivanco	f510b9c2a9	Add query to filter non-deprecable assets when the Depreciation Report is called	2022-01-15 14:21:31 -06:00
Ivan Nieto Vivanco	8334ed6f7e	Add query to filter non-deprecable assets when the Depreciation Report is called	2022-01-15 14:01:19 -06:00
Brady Wetherington	ef463a37d8	Make 'pending' assets properly requestable; use requestable scope	2022-01-14 12:48:33 -08:00
Brady Wetherington	65e584c2bd	Revert the unnecessary optimization for asset->count()	2022-01-13 19:37:08 -08:00
Brady Wetherington	4e8ae8a162	Fix extraneous wildcard query in requestable asset search	2022-01-13 16:32:40 -08:00
snipe	984db1ef44	Apply personal API token fix to master Signed-off-by: snipe <snipe@snipe.net>	2022-01-13 01:39:56 -08:00
snipe	512dbfee7a	Added gate to check that the user is allowed to view API keys Signed-off-by: snipe <snipe@snipe.net>	2022-01-13 01:33:27 -08:00
snipe	eb8f23a888	Removed commented code Signed-off-by: snipe <snipe@snipe.net>	2022-01-13 01:32:28 -08:00
snipe	8f4ec95fbb	Remove assets query, since we handle that via API call now and just need the count() Signed-off-by: snipe <snipe@snipe.net>	2022-01-12 23:23:00 -08:00
snipe	224d0b2fd2	Small language file additions Signed-off-by: snipe <snipe@snipe.net>	2022-01-12 22:21:00 -08:00
snipe	43c57c8461	Merge master into develop Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Http/Controllers/BulkAssetModelsController.php # app/Http/Controllers/CustomFieldsController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/ModalController.php # app/Http/Transformers/GroupsTransformer.php # config/version.php # package-lock.json # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/build/app.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/assets/less/overrides.less # resources/lang/en/admin/hardware/message.php # resources/lang/en/admin/settings/general.php # resources/views/partials/bootstrap-table.blade.php # routes/web.php	2022-01-12 20:51:33 -08:00
Alex Janes	d2bb3e6377	Merge branch 'develop' into features/quickscan_checkin	2022-01-11 16:40:20 -05:00
Alex Janes	edef640d35	Merge branch 'develop' into features/lock_logins_to_saml	2022-01-11 09:05:14 -05:00
snipe	ea83567e7d	Merge pull request #10494 from exula/fix/increase_max_licenses Fixed #7824	2022-01-10 15:04:47 -08:00
snipe	d9624b59b4	Merge pull request #10264 from nuraeil/added-localized-strings Added #10242: Improved localized strings	2022-01-10 14:48:52 -08:00
Brad	81084fa717	Fixed #7824 Previously there was a 999 max seats on Licenses as anything above that seemed to cause slowdowns and failure. This commit allievates those pain points - removed freeSeats as a hydrated Eloquent model on JSON requests for the licenses index - removed 'licenseSeats.user', 'licenseSeats.asset' from the 'with' clause as it's not needed in the view (Datatabales takes care of that) - removed the 999 max seats limit from the License Model, - reworked how new license seats are created when increasing seats or creating licenses - Added an index the license_seats table to help speed up lookups	2022-01-10 14:03:28 -05:00
Wächtler, Yannick	04d649122b	Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO	2022-01-06 12:35:37 +01:00
Haxatron	bb095641c2	Update BulkAssetModelsController.php https://huntr.dev/bounties/efdf2ead-f9d1-4767-9f02-d11f762d15e7	2022-01-06 09:50:11 +08:00
snipe	884b6b0270	Fixes format property on invalid custom field object Signed-off-by: snipe <snipe@snipe.net>	2022-01-03 19:14:50 -08:00
Brady Wetherington	95c30cae8d	Some duplicate imports at the top of the Settings file	2022-01-03 13:53:53 -08:00
Brady Wetherington	3c7f2e89ec	Merge branch 'develop' into remove_old_ldap Had to re-do the composer install because the conflicts were too complicated.	2022-01-03 12:56:58 -08:00
snipe	2ee84c2675	Added a few more comments Signed-off-by: snipe <snipe@snipe.net>	2021-12-30 18:33:28 -08:00
snipe	c6ce928567	Added allow list to modal view options Signed-off-by: snipe <snipe@snipe.net>	2021-12-30 18:16:49 -08:00
snipe	b4fac3e4ae	Fixed missing index for fieldsets Signed-off-by: snipe <snipe@snipe.net>	2021-12-30 13:16:44 -08:00
snipe	bad6b862ca	assets_count doesnt exist as a column Signed-off-by: snipe <snipe@snipe.net>	2021-12-30 12:59:16 -08:00
Alex Janes	7acb559069	corrected issue with asset not found errors	2021-12-20 19:55:00 -05:00
Alex Janes	2b5aca183c	removed unnecessary additional data call from api method	2021-12-19 19:21:58 -05:00
Alex Janes	14b21a6e95	removed some whitespace	2021-12-19 19:17:32 -05:00
Alex Janes	08cb8c354b	more cleanup to fit formatting convention	2021-12-19 19:11:24 -05:00
Alex Janes	29da4f4325	Removed a bunch of redundant code I created from the API	2021-12-19 18:39:57 -05:00
Alex Janes	bc4fe88ac0	First version of bulk checkin	2021-12-19 16:53:31 -05:00
Alex Janes	a68ec8bb57	Update LoginController.php Updated if statements to match convention exactly.	2021-12-17 18:52:42 -05:00
Alex Janes	74de91c31a	Merge pull request #1 from snipe/develop Develop	2021-12-17 14:51:03 -05:00
snipe	9b2dd6522f	Switch GET to POST for asset request Signed-off-by: snipe <snipe@snipe.net>	2021-12-16 20:36:08 -08:00
Alex Janes	d99db5c63b	bug fix and formatting fix	2021-12-16 19:04:37 -05:00
snipe	398180dc59	Small merge unmagling Signed-off-by: snipe <snipe@snipe.net>	2021-12-16 14:38:04 -08:00
snipe	c3d55ee27e	Merge master down into develop Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Exceptions/Handler.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/CustomFieldsController.php # app/Http/Controllers/SettingsController.php # app/Http/Transformers/AssetsTransformer.php # app/Models/Setting.php # config/version.php # resources/lang/af/button.php # resources/lang/ar/button.php # resources/lang/bg/button.php # resources/lang/cs/button.php # resources/lang/cy/button.php # resources/lang/da/button.php # resources/lang/de/button.php # resources/lang/el/button.php # resources/lang/en-GB/button.php # resources/lang/en-ID/button.php # resources/lang/es-CO/admin/groups/message.php # resources/lang/es-MX/button.php # resources/lang/et/admin/custom_fields/general.php # resources/lang/et/admin/hardware/table.php # resources/lang/et/admin/kits/general.php # resources/lang/et/admin/manufacturers/message.php # resources/lang/et/admin/models/general.php # resources/lang/et/admin/settings/general.php # resources/lang/et/button.php # resources/lang/et/mail.php # resources/lang/fa/button.php # resources/lang/fa/help.php # resources/lang/fi/button.php # resources/lang/fil/button.php # resources/lang/fr/button.php # resources/lang/ga-IE/button.php # resources/lang/he/button.php # resources/lang/hr/button.php # resources/lang/hu/admin/settings/general.php # resources/lang/hu/auth/message.php # resources/lang/hu/button.php # resources/lang/hu/mail.php # resources/lang/id/admin/hardware/table.php # resources/lang/id/button.php # resources/lang/it/button.php # resources/lang/iu/button.php # resources/lang/ja/button.php # resources/lang/ko/button.php # resources/lang/lt/button.php # resources/lang/lv/button.php # resources/lang/mi/button.php # resources/lang/mk/button.php # resources/lang/ml-IN/button.php # resources/lang/mn/button.php # resources/lang/ms/admin/hardware/table.php # resources/lang/ms/admin/kits/general.php # resources/lang/ms/admin/models/general.php # resources/lang/ms/admin/models/message.php # resources/lang/ms/admin/settings/general.php # resources/lang/ms/button.php # resources/lang/nl/button.php # resources/lang/no/admin/hardware/table.php # resources/lang/no/admin/kits/general.php # resources/lang/no/admin/settings/general.php # resources/lang/no/auth/message.php # resources/lang/no/button.php # resources/lang/no/help.php # resources/lang/no/mail.php # resources/lang/pl/button.php # resources/lang/pt-BR/button.php # resources/lang/pt-PT/auth/message.php # resources/lang/pt-PT/button.php # resources/lang/pt-PT/mail.php # resources/lang/ro/button.php # resources/lang/ru/admin/settings/general.php # resources/lang/ru/button.php # resources/lang/ru/help.php # resources/lang/sl/admin/custom_fields/general.php # resources/lang/sl/admin/hardware/table.php # resources/lang/sl/admin/kits/general.php # resources/lang/sl/admin/manufacturers/message.php # resources/lang/sl/admin/models/general.php # resources/lang/sl/admin/settings/general.php # resources/lang/sl/admin/users/general.php # resources/lang/sl/auth/message.php # resources/lang/sl/button.php # resources/lang/sl/help.php # resources/lang/sr-CS/button.php # resources/lang/ta/button.php # resources/lang/th/button.php # resources/lang/th/mail.php # resources/lang/tl/button.php # resources/lang/tr/admin/settings/general.php # resources/lang/tr/auth/message.php # resources/lang/tr/button.php # resources/lang/uk/button.php # resources/lang/ur-PK/button.php # resources/lang/vi/button.php # resources/lang/zh-CN/button.php # resources/lang/zh-HK/button.php # resources/lang/zh-TW/admin/hardware/table.php # resources/lang/zh-TW/button.php # resources/lang/zu/button.php # resources/views/models/custom_fields_form.blade.php # resources/views/reports/custom.blade.php # resources/views/settings/slack.blade.php	2021-12-16 14:26:24 -08:00
Alex Janes	6898119891	Replaced env() with config() to check environment variables Made the app.php description for 'REQUIRE_SAML' a bit more... descriptive.	2021-12-16 16:56:39 -05:00
Alex Janes	a6116a1b15	If SAML required, don't accept login form post.	2021-12-16 14:33:25 -05:00
Alex Janes	3c8d70c5fb	Add option to environment to require SAML for a more secure installation.	2021-12-16 11:44:07 -05:00
Bradley Coudriet	dbdc1c7f3f	Update SettingsController.php to save Slack Settings This goes with #10438 that I just submitted about Slack Settings not saving. This adds the necessary code to actually save the Slack Settings, As they are already validated by the SlackSettingsRequest, this seems like an easy and low-impact fix.	2021-12-15 10:38:51 -05:00
Ivan Nieto Vivanco	c80aa2a289	Add title column to custom reports	2021-12-14 12:05:33 -06:00
Ivan Nieto Vivanco	0037cdb00c	Add title column to custom reports	2021-12-13 20:27:23 -06:00
Ivan Nieto Vivanco	a419a690d4	Add a variable to better control the selected user's ids	2021-12-11 18:01:38 -06:00
Brady Wetherington	ea71086dfc	Yank assetlog from eager-load clause in API query for develop	2021-12-10 18:50:34 -08:00
Brady Wetherington	acfb41f129	Remove 'actionlog' from the ::with() clause in the asset query API	2021-12-10 18:42:56 -08:00
Haxatron	1699c09758	Update AssetModelsController.php	2021-12-09 21:42:18 +08:00
Haxatron	918e7c8dae	Fix access control - https://huntr.dev/bounties/19453ef1-4d77-4cff-b7e8-1bc8f3af0862/	2021-12-09 12:57:04 +08:00
snipe	86afe6c4b1	Cleanup slack validation Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 18:03:56 -08:00
snipe	ff97b359ad	Removed form request on ajax, cleaned up some other things Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 17:58:46 -08:00
snipe	8fa690b635	Reverting form request because it doesn't seem to work (????!!) Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 17:54:15 -08:00
snipe	8c1cd87831	Added slacksettingsrequest as use statement Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 15:56:22 -08:00
snipe	ebdbc20740	Adds stricter validation for slack endpoints Signed-off-by: snipe <snipe@snipe.net>	2021-12-06 11:40:24 -08:00
snipe	3debe78574	Merge pull request #10350 from inietov/fixes/trim_custom_fields_names Apply trim() function when storing Custom Fields names	2021-11-24 19:42:04 -08:00
snipe	29bbfad693	Applied escaping fix from master to develop Signed-off-by: snipe <snipe@snipe.net>	2021-11-24 19:38:27 -08:00
snipe	830d07f84f	Removed escaping on input save for asset checkout on creation Signed-off-by: snipe <snipe@snipe.net>	2021-11-24 19:19:32 -08:00
Ivan Nieto Vivanco	1ca770895a	Apply trim() function when storing Custom Fields names	2021-11-22 18:43:21 -06:00
snipe	46d2f8a81d	Disallow file upload to backups on demo Signed-off-by: snipe <snipe@snipe.net>	2021-11-15 19:42:02 -08:00
snipe	92b7aaf44b	Log the user out upon successful restore Signed-off-by: snipe <snipe@snipe.net>	2021-11-15 19:40:01 -08:00
snipe	f2f8f96991	Merge remote-tracking branch 'origin/master' into develop Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # app/Http/Controllers/Api/AssetsController.php # app/Http/Transformers/AssetsTransformer.php # app/Importer/ConsumableImporter.php # app/Models/Consumable.php # config/version.php # package-lock.json # package.json # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/build/app.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/views/custom_fields/fieldsets/view.blade.php # resources/views/layouts/default.blade.php # routes/web.php # routes/web/fields.php	2021-11-15 19:24:38 -08:00
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	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	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
Brady Wetherington	4dda28de9e	WIP: cleaning up LDAP	2021-10-28 18:19:50 -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	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	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
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
Ivan Nieto Vivanco	9eaf89aaa7	Add a variable to better control the selected user's ids	2021-10-21 13:28:58 -05: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	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
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
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	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	52ea172e5d	Fix ID array Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 17:18:07 -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	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	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	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	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	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	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
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	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
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
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	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
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
Ivan Nieto Vivanco	38a2a0c1ee	Add the pertinent filters in Accessories and Consumables controllers	2021-07-26 12:59:15 -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	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	23f77b2894	Fixed case again	2021-07-15 12:26:14 +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
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	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	e275c9ee90	Fixed case again	2021-07-06 07:10:03 +03: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
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	4af247f845	Added additional boxes to the dashboard Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 16:36:15 -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	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
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
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
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
kcoyo	cee6f0d579	Update LoginController.php Fixed #9607 - Sessions expire for SAML/RemoteUser/LDAP	2021-05-25 16:37:34 -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
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
snipe	cee5eea121	Use 24-hour date format for audit Signed-off-by: snipe <snipe@snipe.net>	2021-04-30 15:37:39 -07:00
snipe	c6726015f7	Added missing use statement Signed-off-by: snipe <snipe@snipe.net>	2021-04-30 14:52:08 -07:00
snipe	315bcb6b38	Added use statement Signed-off-by: snipe <snipe@snipe.net>	2021-04-23 14:26:57 -07:00
Steven	82f73eb9e2	Added user locale to REST API GET /api/users response; (#9486 ) * Clearer reporting on import Signed-off-by: snipe <snipe@snipe.net> * Try adding text/x-Algol68 to import Signed-off-by: snipe <snipe@snipe.net> * Added user locale to REST API GET /api/users response; Co-authored-by: snipe <snipe@snipe.net>	2021-04-23 12:09:00 -07:00
Brady Wetherington	72a813f23d	This fixes the controller signature error people are getting with LDAP logins (#9466 )	2021-04-21 10:23:32 -07:00
aranar-pro	5127727730	Fixed #9424 : import history adds asset model to assigned user and respects checkin date (#9350 ) * Fixed #9294: Assets import history. Behaviour based on Checkin Date added, including assigning checked out items to users. * Fixed #9294: Fixed asset import history to respect checkin and update user with checked out items. * Fixed #9294: whitespace and comment cleanup for merge * Fixed #9294: Fixed asset import history to respect checkin and update user with checked out items.	2021-04-20 21:25:17 -07:00
snipe	c17eaaad69	Check that the field is valid before checking to see count() This mostly affects the demo, since the seeder updates info often Signed-off-by: snipe <snipe@snipe.net>	2021-04-20 15:10:28 -07:00
snipe	e286ff0be3	Added show() redirect for CustomFields::show() Signed-off-by: snipe <snipe@snipe.net>	2021-04-20 15:09:23 -07:00
Brady Wetherington	2a28f5e66c	(Maybe?) Fixes the problem where we always need LDAP enabled (#9321 ) * I think this fixes the problem where we need LDAP even if we aren't using it? * Pull the LdapAd dependency out of the AuthController constructor	2021-04-20 14:53:47 -07:00
Ivan Nieto Vivanco	36bc47c61c	Handle regex format when assigned from API (#9443 )	2021-04-20 14:44:47 -07:00
snipe	e1c6d4ced7	Merge branch 'develop' of https://github.com/Skywalker-11/snipe-it into Skywalker-11-develop Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # app/Http/Requests/SettingsSamlRequest.php	2021-04-14 15:15:07 -07:00
Godfrey Martinez	246cc0eaa8	Feature/ch16172/adding other fields to ldap sync settings (#9416 ) * new branch, added manager as an additional field. Currently having DB issues * WIP DB Issue with eloquent * added department to LDAP sync * removed unused variables	2021-04-14 10:17:57 -07:00
Brady Wetherington	792a31cc7f	Merge branch 'develop'	2021-04-06 20:10:22 -07:00
snipe	e47e2e3754	Fixed #9404 - include note in accessory API Signed-off-by: snipe <snipe@snipe.net>	2021-04-06 10:57:30 -07:00
snipe	3ffa3534a0	Use environmental variables in memory limits Signed-off-by: snipe <snipe@snipe.net>	2021-04-05 21:47:57 -07:00
snipe	b9bab05ac3	Merge branch 'master' of https://github.com/ajsy/snipe-it into ajsy-master Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # resources/views/users/print.blade.php	2021-04-05 20:55:49 -07:00
snipe	df72f92bc0	Brings PR #6744 up to parity with previous changes - Set custom field's default value when creating a new asset using the API Signed-off-by: snipe <snipe@snipe.net>	2021-04-05 20:16:06 -07:00
AlexanderWPapyrus	a1f9642a18	Increases DPI of barcode for small lables (#9344 ) solves issue #9293	2021-04-05 19:33:10 -07:00
Godfrey Martinez	5ea759f615	Fixed #7211 , #9197 , #7864 , [ch15504] - Added additional LDAP fields to sync (#9318 ) * LDAP and Active Directory has plenty of other [ch15504] * removed department id from ldap sync * removed department id from ldap sync * Update 2021_03_18_184102_adds_several_ldap_fields.php	2021-04-05 19:26:04 -07:00
Marc Leuser	90b7d34c69	Added #6695 : add API endpoint for license seats (#8058 ) * remove miselading comment line * added dedicated API endpoint for license seats * don't display a seat name via API it makes no sense and we don't have any particular sorting order so the numbering would be inconsistent anyway * reduce amount of IFs * add sanity checks to show() * fix goofed logging logic * add tests for action log entries	2021-03-29 19:41:26 -07:00
NMC	3e934a1b96	Add a way for a user to override the site skin setting + fix mislabeled comment. (#6891 ) * Add a way for a user to override the skin setting. * Add site setting to allow user to change the skin. * Fix skin list. Co-authored-by: NMC <info@nmc-lab.com>	2021-03-29 19:09:23 -07:00
Tom Misilo	7557879d4a	Add support for overriding the Time and Memory Limits (#8389 ) This is similar to what exists for the LDAP Import, and adds support for setting th Import and Report max execution time and memory limits Co-authored-by: snipe <snipe@snipe.net>	2021-03-24 11:40:43 -07:00
snipe	0b41f9182a	Merge remote-tracking branch 'origin/develop'	2021-03-24 11:35:39 -07:00
snipe	86fef3f40a	Set SAML errors to warning instead of error Signed-off-by: snipe <snipe@snipe.net>	2021-03-17 22:30:26 -07:00
snipe	c90604b5ae	Merge remote-tracking branch 'origin/develop'	2021-03-17 22:19:24 -07:00
snipe	069e9e52fe	Try/catch barcodes so they don’t shit up the logs Signed-off-by: snipe <snipe@snipe.net>	2021-03-17 22:19:10 -07:00
snipe	9f3a8a43cc	Merge remote-tracking branch 'origin/develop' Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # composer.lock	2021-03-17 19:41:02 -07:00
snipe	8fd8e716ac	Changed debug level on bad LDAP connection (#9314 ) * Changed debug level on bad LDAP connection TODO: Unfuck all of this. It’s a mess and it really doesn’t work the way we think it does. AdLdap library strikes again. :( Signed-off-by: snipe <snipe@snipe.net> * Improved phrasing Signed-off-by: snipe <snipe@snipe.net>	2021-03-17 19:24:28 -07:00
snipe	ab092fd209	Merge remote-tracking branch 'origin/develop' # Conflicts: # app/Providers/AppServiceProvider.php # config/logging.php # config/services.php	2021-03-15 12:29:29 -07:00
Brady Wetherington	c7626f8387	Add new StorageHelper and use it where it makes sense (#9276 )	2021-03-15 12:26:39 -07:00
snipe	f164f0ea60	Fixed #9266 - set a colors_array variable even if other conditions are not met	2021-03-09 21:04:32 -08:00
Ivan Nieto Vivanco	d64b35c348	Added a condition to ensure that only assets checked out to an user that is being deleted are updating their status (#9233 )	2021-03-01 13:07:23 -08:00
Ivan Nieto Vivanco	ab7dd90602	Fixes ternary that sets the offset in 0 when the offset passed to the API for the user is greater than total locations. (#9210 )	2021-02-26 12:56:04 -08:00
snipe	f37d5d3d03	Fixed #9085 - asset models not showing proper pagination Huge thanks to @inietov for catching this one	2021-02-25 16:43:38 -08:00
johnson-yi	763e17f491	Added saml custom setting retrieveParametersFromServer to enable fixing SLO issues with Azure AD (#9187 )	2021-02-23 11:05:22 -08:00
Ivan Nieto	12ff465cdb	Added feature: Checkbox Custom Fields as list of values. (#9112 ) * Added functionality for checkboxes in custom fields. Similar to how radio buttons work. * Added the same functionality when the custom fieldset is encrypted. * Added missing bits, so the edit custom assets view shows what values have been already stored in database	2021-02-16 17:20:29 -08:00
Ivan Nieto	f89d789832	Fixes #8918 The validation rules on Manufacturer Model 'name' attribute are malformed. (#9133 ) * Fixes the validation rules on Manufacturer Model * Fixes a little issue; if the manufacturer is active soft-deletes it, if is already deleted permanently deletes it	2021-02-16 12:52:55 -08:00
Giuseppe Iannello	5edbb4b229	Support Google Cloud IAP (#8768 ) Following up on `7c2da81700`, this extends the logic, adding support for Google Cloud IAP.	2021-02-03 11:59:55 -08:00
snipe	985193ffff	Fixed #9082 - allow deployable status type on checkout	2021-02-03 01:29:54 -08:00
snipe	124343911f	Merge remote-tracking branch 'origin/develop'	2021-02-02 16:57:18 -08:00
Brady Wetherington	462f8c791f	Hotfix to develop to yank extraneous e() (#9080 )	2021-02-02 16:44:54 -08:00
Brady Wetherington	9a224a07ba	Modified how we do Select2 dynamic drop-down menus to be more secure (#9079 ) * Modified how we do Select2 dynamic drop-down menus to be more secure As noted by the author of select2, the more-secure way of creating rich Select-dropdowns is to use jquery to create HTML snippets and carefully modify text attributes within there. This prevents any XSS from being brought to the page. As a side-effect, the extra escaping that we had to do in all of the internal selectlist calls is now no longer necessary, and has been removed. Rebased and squashed from the original. * Rebuilt all assets, but this still feels like it's too much stuff in here. * Whoops, need to run that in dev, not prod	2021-02-02 15:55:21 -08:00
snipe	b6c432a596	One more line of logging for purges	2021-02-02 02:20:30 -08:00
snipe	ef668317a9	Log user initiating a purge	2021-02-02 01:58:50 -08:00
snipe	fdb5b3baf1	Depreciation detail view fixes [ch15776] (#9059 ) * Allow sorting by months for depreciation list view * Added dataTableLayout to standardize the list display table * Implement the dataTableLayout() on the list view blade * Split the view into tabs so we can combine asset depreciations and license depreciations * Updated depreciation view to use tabbed interface for assets and licenses * Added asset models to depreciation details page * Make asset model category sortable * Added cateory as allowed to be sorted on * Added category sort scope * Removed offset variable * Small fixes to asset modes display in depreciation to bulk edit models	2021-01-27 17:44:05 -08:00
Brady Wetherington	70e6a6ced6	Fix issue where users with edit permission cannot invoke LDAP sync (#9058 ) * Fix issue where users with edit permission cannot invoke LDAP sync * Make User::class consistent with usage elsewhere in the same directory	2021-01-27 15:36:43 -08:00
Ivan Nieto	6e83679528	Instead of return a JSON response, redirect back to the previous screen (#9055 )	2021-01-27 12:01:42 -08:00
snipe	0031fab0fe	Added termination date, depreciation in license column selection [ch14505] (#9052 )	2021-01-27 01:34:32 -08:00
Evgeny	d8bb69533c	To eliminate 12/24hours ambiguity fix. This fix prevents loss of time accuracy. (#8887 ) Its a tiny fix to eliminate 12/24hours ambiguity. Fix prevents time accuracy loss in field "last_audit_date" for assets.	2021-01-26 12:22:59 -08:00
Vincent Lainé	d6ead5ae17	Added #8931 : add health controller without session (#8978 ) * Added health controller * Trying to move session middleware to web and api group to have health controller without session * Fix health route store the session Co-authored-by: Vincent Lainé <v.laine@dental-monitoring.com>	2021-01-26 12:10:54 -08:00
Ivan Nieto	2da6f9136f	Add 'Last Audit Date/Next Audit Date' filter to custom report (#8989 ) * Add 'Last Audit Date/Next Audit Date' filter to custom report * Added a constraint: cannot require a report with a Last Audit Date in the future.	2021-01-26 12:05:31 -08:00

... 6 7 8 9 10 ...

2214 commits