291 commits

Author	SHA1	Message	Date
snipe	9bba0b764a	Added clearer comments ... Signed-off-by: snipe <snipe@snipe.net>	2023-10-26 14:38:39 +01:00
snipe	64219da0b4	Merge branch 'develop' into Robert-Azelis-EOL_fix_improvements	2023-10-26 13:36:18 +01:00
snipe	0cebccac95	Removed extra logging ... Signed-off-by: snipe <snipe@snipe.net>	2023-10-26 06:51:07 +01:00
snipe	2695576968	Removed debugging ... Signed-off-by: snipe <snipe@snipe.net>	2023-10-26 04:21:20 +01:00
snipe	f25ddee857	Removed debugging, use new model rules if model has changed ... Signed-off-by: snipe <snipe@snipe.net>	2023-10-26 04:21:14 +01:00
snipe	541ba0c0ba	Removed conditional add for model_id ... Signed-off-by: snipe <snipe@snipe.net>	2023-10-26 04:20:52 +01:00
snipe	b87879f8e7	Removed debugging ... Signed-off-by: snipe <snipe@snipe.net>	2023-10-26 02:35:53 +01:00
snipe	6ebc01ca50	Bulk edit refactor ... Signed-off-by: snipe <snipe@snipe.net>	2023-10-26 01:49:23 +01:00
snipe	da08f0e26f	Merge pull request #13584 from Godmartinz/Bulk_location_edit_fix_gh-13572 ... added an option to bulk edit location & fixed location bug	2023-10-25 20:57:18 +01:00
Robert-Azelis	bd195a6911	Update AssetsController.php ... when asset is updated control EOL date change sand set explicit marker depends to setup of model EOL rate	2023-10-22 18:11:19 +02:00
snipe	f685ba01b6	Reversed order of find ... Signed-off-by: snipe <snipe@snipe.net>	2023-10-09 16:43:14 +01:00
snipe	e5f5802235	Added tighter controls for matching log ID and item_id ... Signed-off-by: snipe <snipe@snipe.net>	2023-10-09 15:17:03 +01:00
snipe	129e9b90dc	Merge pull request #13585 from spencerrlongg/eol_2 ... Standardize Asset EOL Date	2023-10-02 16:09:22 +01:00
snipe	279e6c7e4f	Check for null company ID ... Signed-off-by: snipe <snipe@snipe.net>	2023-09-26 14:33:42 +01:00
spencerrlongg	4660a2e5b7	rm more duplicate	2023-09-20 14:37:32 -05:00
spencerrlongg	a9123754f5	remove unnecessary code	2023-09-20 14:34:42 -05:00
spencerrlongg	7dab59c98d	fix for no eol, fix for optional in view	2023-09-20 14:17:30 -05:00
spencerrlongg	70a251de55	fix up gui edit	2023-09-13 13:51:14 -05:00
spencerrlongg	e21a8b6717	fix up this file	2023-09-12 18:11:36 -05:00
slong753	78c400e948	fix conflicts	2023-09-11 17:21:50 -05:00
slong753	75d7e3e1a0	fix conflicts	2023-09-11 17:20:21 -05:00
slong753	5948679a4a	fix purchase date update	2023-09-11 17:17:59 -05:00
slong753	774f21bb7f	some more cleanup	2023-09-11 17:17:59 -05:00
slong753	cda9dd57dd	asset update logic	2023-09-11 17:15:25 -05:00
slong753	1ea0de8bca	prevent injection, fix asset update	2023-09-11 17:15:25 -05:00
slong753	17ccfa9ada	resolve some conflicts	2023-09-11 17:15:24 -05:00
slong753	c1daabef08	progress	2023-09-11 17:10:41 -05:00
Godfrey M	e73b16846e	adds an option to bulk edit actual location for bulk edit and fixes update issue	2023-09-11 11:21:56 -07:00
snipe	02c187b0a0	Merge pull request #13566 from snipe/features/13562_add_inline_file_link ... Fixed #13562 - Added inline file link	2023-09-07 20:50:13 +01:00
snipe	a67888f3d3	Merge pull request #13547 from inietov/fixes/Attempt_to_read_property_asset_tag ... Fixed ErrorException: Attempt to read property "asset_tag" on null (rollbar #3541)	2023-09-05 20:26:21 +01:00
Ivan Nieto Vivanco	91b1cc7121	Move the early return to the controller instead of the Label model	2023-09-05 13:23:51 -06:00
snipe	d6dd332b09	Merge pull request #13557 from johnson-yi/fixes/add_changes_to_checkinout_actionlog ... Added/Fixed: track changes on asset checkin/out	2023-09-05 19:08:49 +01:00
snipe	f53db8ba75	Fixed #13562 - allow inline view for uploaded files ... Signed-off-by: snipe <snipe@snipe.net>	2023-09-05 18:28:01 +01:00
snipe	a62e2f092b	Merge pull request #13498 from marcusmoore/feature/add-checkin-date-range-filter-to-custom-asset-report ... Added last check in column and filter to custom asset report	2023-09-05 13:22:15 +01:00
Johnson Yi	09f7b3debe	Track changes on asset checkin/out	2023-09-01 13:12:07 +10:00
snipe	79b330f492	Merge pull request #13400 from inietov/fixes/asset_acceptance_user_error ... Fixed Asset acceptance error when user company and asset company don't match	2023-08-22 15:49:56 +01:00
snipe	fea11ec7f1	Merge pull request #12761 from spencerrlongg/bulk_edit_custom_fields ... Bulk Editing Custom Fields	2023-08-22 12:40:18 +01:00
Marcus Moore	489d30c685	Set last_checkin in ui and api controllers	2023-08-21 11:57:33 -07:00
Ivan Nieto Vivanco	053d3fc9ed	Prevent asset to be checked out if full company support is enabled and companies not match	2023-08-02 19:23:28 -06:00
Grant Le Roux	b1464e028c	Merge branch 'develop' into develop	2023-07-31 07:57:29 +08:00
snipe	a01cb26aac	Merge pull request #12940 from akemidx/delete_asset_from_view_page ... Delete button on asset view page	2023-07-25 12:11:35 +01:00
Ivan Nieto Vivanco	9591442f1e	Evaluate the radio input to update location only or default location too	2023-07-06 10:46:21 -06:00
Ivan Nieto Vivanco	743e852998	Add radio buttons to alter asset checkin location behavior	2023-07-06 10:38:48 -06:00
Ivan Nieto Vivanco	011726154c	Set rtd_location if a location is given at checkin	2023-06-29 03:16:59 -06:00
slong753	ea61f634fb	get rid of nice nullsafe	2023-06-28 16:48:52 -05:00
slong753	afe6fe207a	resolved, missed adding errors in a case	2023-06-28 16:45:18 -05:00
slong753	2a352619f7	clean up	2023-06-26 16:25:48 -05:00
slong753	691faf6340	ok, this kind of works - pr needs some clean up	2023-06-26 14:56:07 -05:00
Spencer Long	f646623a5e	Merge branch 'develop' into bulk_edit_custom_fields	2023-06-22 18:00:31 -05:00
Godfrey M	8e3cbdad90	removes assigned_to if archived	2023-05-15 11:52:57 -07:00
slong753	5e34ffa2b0	wip	2023-05-10 14:08:12 -05:00
slong753	1d2596fc54	wip	2023-05-09 14:58:59 -05:00
slong753	815c77f943	wip	2023-05-03 14:49:31 -05:00
slong753	cdda4a56d8	aha, ok thisd kind of works	2023-05-02 19:11:43 -05:00
slong753	b2c2097e8b	just more troubleshooting stuff, still no solution	2023-05-02 18:54:20 -05:00
akemidx	d94bed3f57	push for testing	2023-04-27 18:58:59 -04:00
slong753	52c9fefbe0	ok, this works except error display	2023-04-26 15:06:50 -05:00
snipe	8f0b823fb3	Applies #12868 ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-25 23:39:32 -07:00
snipe	22d73f503a	Merge pull request #12756 from dboth/develop ... Fixed #8208, #8896, #8985 and #9789: Currency issues when using non-english locales (resubmission)	2023-04-25 22:32:13 -07:00
slong753	6bec9cf880	fix a couple things	2023-04-25 23:26:16 -05:00
snipe	66ce02fc48	Added permission on restore ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-25 08:09:16 -07:00
snipe	6e7f0728fd	Added more granular permissions on bulk actions for assets ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-25 08:06:45 -07:00
slong753	52dc99588e	pushing for now, needs validation work	2023-04-17 13:57:48 -05:00
slong753	8b9aea8874	very much WIP, but dupe queries reduced ... but i think this can be cleaned up a bit more	2023-04-12 14:46:48 -05:00
slong753	0f72554a9f	translations for messages	2023-03-30 13:57:18 -05:00
slong753	382d849ee1	added catch for no assets selected	2023-03-30 13:52:29 -05:00
slong753	e4c76f454c	this is good, just needs translations done in view	2023-03-29 18:24:56 -05:00
slong753	162b70d5a9	wireframed, needs a view and should work	2023-03-29 17:34:36 -05:00
slong753	65bbecd145	this all works - could use some eyes	2023-03-29 14:46:31 -05:00
Dominik Both	3271c9dc9f	Fix #8208, #8896, #8985, #9789	2023-03-29 09:56:34 +02:00
slong753	032ae4348e	custom fields display, need to get saving ... +some clean up	2023-03-28 21:45:31 -05:00
slong753	804a788a27	initial fetch working	2023-03-28 20:31:24 -05:00
snipe	545d023a18	Handled a few more hard-coded strings ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-21 23:56:07 -07:00
snipe	c229d69cec	Added next audit date override in bulk asset edit ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-21 16:01:41 -07:00
snipe	f9e190eb32	Updates the Gate “use” statement to be more specific ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-18 11:58:09 -07:00
slong753	60b70a4074	catch and redirect back with error	2023-03-14 16:07:09 -05:00
snipe	1f7ae08d76	Merge branch 'develop' into features/make_eol_sortable	2023-02-28 18:05:09 -08:00
snipe	3e47d9e689	Pass the existing asset name to the bulk checkout form ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-24 09:54:46 -08:00
Marcus Moore	38cdcdf064	Eager load company	2023-02-06 10:59:51 -08:00
cram42	0f3c5d10ba	Merge branch 'feature-label2' into develop	2023-02-01 18:01:46 +11:00
cram42	4b4c228f1a	Correct parameter order	2023-02-01 17:56:23 +11:00
cram42	c2c009a018	Merge branch 'develop' into develop	2023-01-24 09:53:42 +08:00
snipe	41537a2449	Added field to the API controller endpoints ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-22 00:56:44 -08:00
snipe	b80d52a9c3	Added byod to asset controller for create and update methods ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-18 13:03:51 -08:00
Cram42	a8b6a4a259	Allow passing "template" param	2022-11-02 16:04:40 +08:00
Cram42	7b29ddd283	Tie into tag generation	2022-11-01 20:02:12 +08:00
Cram42	0e69e4248c	Fix: Multiple outputs at hardware/{id}/label	2022-10-27 08:12:42 +08:00
snipe	4eed2baa31	Added default tab to locations ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-20 19:06:58 -07:00
snipe	91e824c5b0	Check for nullifying checkboxes ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-11 18:25:07 -07:00
snipe	1b657ee995	Merge pull request #11601 from vickyjaura183/bugfix/error_404_bulkcheckout ... Error 404 fixed on submitting without mandatory field	2022-08-02 17:19:22 -07:00
vishalkumar183	96b40a5edd	Error 404 fixed on sumitting witout mandtory field	2022-08-02 18:44:16 +05:30
snipe	b035003546	Handled hardware route names ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 15:59:54 -07:00
snipe	92d46edca3	Cleaned up logging output ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-01 13:33:58 -07:00
snipe	14d8fb66aa	Merge pull request #11405 from snipe/fixes/use_db_column_instead_of_converted_value ... Only care about the custom field's converted name when updating the custom field itself	2022-06-27 17:36:26 -07:00
snipe	bf08e73f8f	Removed comments and server side cookie info ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-27 16:36:09 -07:00
snipe	baad3b9d58	Only care about the converted name when updating the custom field itself ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-27 14:17:07 -07:00
snipe	d70b36750c	Merge pull request #10967 from veenone/fix/hide_optional_field_on_create_asset ... Fixes #8155 - improve the workflow during asset creation	2022-06-24 18:53:07 -07:00
Achmad Fienan Rahardianto	fe65de1207	implements cookie to maintain display preference	2022-06-01 11:54:05 +07:00
snipe	4eab5fd075	Removed older comments ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	6fc222a648	Fixed #11014 - Removed double escaping on custom fields ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 05:45:00 -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	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
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	319d816002	Update in the license seat the user that the asset with that license have assigned	2022-03-21 15:06:43 -06: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	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
snipe	9db8bd782d	Merging master down into develop ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-16 18:02:07 +00:00
snipe	3e2fe10480	Fixed getAssetBySerial ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-05 09:03:29 -08: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
Alex Janes	bc4fe88ac0	First version of bulk checkin	2021-12-19 16:53:31 -05: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
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
Dampfklon	7645f23f5c	remove pending Acceptances on checkin	2021-10-07 21:03:46 +02: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	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
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
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
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
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
AlexanderWPapyrus	a1f9642a18	Increases DPI of barcode for small lables (#9344) ... solves issue #9293	2021-04-05 19:33:10 -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
Brady Wetherington	c7626f8387	Add new StorageHelper and use it where it makes sense (#9276)	2021-03-15 12:26:39 -07: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
snipe	985193ffff	Fixed #9082 - allow deployable status type on checkout	2021-02-03 01:29:54 -08:00
snipe	9a1acced58	Fix for legacy location_id=0 issue	2020-10-23 14:00:04 -07:00
Ivan Nieto	3fcd83c499	Fixes some errors in forms using the deprecated Input:: facade	2020-09-03 13:42:33 -05:00
snipe	3e62a6ea2d	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2020-07-31 11:01:35 -07:00
Sean Borg	567a9639f4	Enhanced #5762 Able to bulk edit expected checkin date ... In light of the need to edit 500+ devices #5762 (comment) I added the expected checkin date to the bulk edit page for assets	2020-07-10 19:21:34 +01:00
Sean Borg	3d8823ede5	Added #5762 Modify expected checkin dates ... It is now possible to edit expected checkin dates for assets in Actions > Edit Asset	2020-07-10 19:21:04 +01:00
snipe	a7eb89f6b6	Misc fixes for flysystem paths	2020-06-16 16:06:25 -07:00