751 commits

Author	SHA1	Message	Date
snipe	28cd0085b7	Added Khmer as an available language ... Signed-off-by: snipe <snipe@snipe.net>	2023-09-25 10:54:32 +01:00
snipe	860e7791ff	Fixed #13592 - unable to delete model from view page ... Signed-off-by: snipe <snipe@snipe.net>	2023-09-14 23:35:44 +01:00
snipe	8f4ca9da57	Simplify upload messaging ... Signed-off-by: snipe <snipe@snipe.net>	2023-09-14 21:20:21 +01:00
snipe	b92327eb40	Merge pull request #13520 from inietov/fixes/licenses_reassignable_feature ... Fixed Not reassignable Licenses shouldn't show 'Checkin All Seats' button [sc-23506]	2023-09-14 12:52:13 +01:00
snipe	2acf2b880e	Account for hard-deleted models, suppliers ... Signed-off-by: snipe <snipe@snipe.net>	2023-09-05 15:58:21 +01:00
snipe	b17af38d8e	Merge pull request #12901 from Godmartinz/user_total_cost ... Added users total cost of assets to user profile	2023-09-05 13:52:34 +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
snipe	83b178f5b2	Added model name and number to dynamic url ... Signed-off-by: snipe <snipe@snipe.net>	2023-08-31 18:03:32 +01:00
Godfrey Martinez	d86c63cf23	Merge branch 'ignore_encrypt_and_other_changes' into fix-companyable	2023-08-28 19:38:16 -07:00
Godfrey M	74f45a4473	reworks company queries for asset history	2023-08-28 19:35:46 -07:00
snipe	844fe0938c	Added link to the help docs ... Signed-off-by: snipe <snipe@snipe.net>	2023-08-26 17:42:56 +01:00
Ivan Nieto Vivanco	7bfb5a0667	Disable the Checkin All Seats button if License is not reassignable	2023-08-23 16:36:06 -06: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	a48762c64d	Merge pull request #13496 from snipe/features/setting_for_name_order ... Fixed #13495 added setting for name order	2023-08-22 12:50:58 +01:00
snipe	23237e5cd3	Removed unused translation ... Signed-off-by: snipe <snipe@snipe.net>	2023-08-22 12:50:32 +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	c332b98456	Add last checkin options to report front end	2023-08-21 13:44:49 -07:00
Godfrey M	5076b45a0d	adds id to history info	2023-08-21 13:40:39 -07:00
snipe	c39579b170	New strings ... Signed-off-by: snipe <snipe@snipe.net>	2023-08-21 20:11:25 +01:00
Ivan Nieto Vivanco	25c58a8486	Fix typo in language variable name	2023-08-15 14:17:39 -06:00
snipe	1c2f3cd552	Fixed translation typo ... Signed-off-by: snipe <snipe@snipe.net>	2023-08-15 20:39:00 +01:00
snipe	253975ce72	Updated translation ... Signed-off-by: snipe <snipe@snipe.net>	2023-08-15 20:27:55 +01:00
snipe	e41368daac	Merge pull request #12050 from cram42/develop ... New Label Engine	2023-08-15 17:58:57 +01:00
snipe	d1ce1b6f18	Updated language strings from CrowdIn ... Signed-off-by: snipe <snipe@snipe.net>	2023-08-15 13:21:35 +01:00
Ivan Nieto Vivanco	71cb16118d	Change error string for a better (?) one	2023-08-14 20:52:00 -06:00
Ivan Nieto Vivanco	d365565b6d	Add message in the acceptance assets view to indicate when the user can\'t accept nor deny the asset	2023-08-14 20:51:04 -06:00
snipe	a6a742d8d8	Merge pull request #13407 from marcusmoore/feature/sc-23465 ... Added messaging to category edit page to improve clarity around when users will be emailed	2023-08-09 10:36:19 +01:00
Ivan Nieto Vivanco	9ca163e8cf	Stop asset acceptances from shown to user if full company support is enabled and companies not match	2023-08-02 19:22:35 -06:00
Marcus Moore	65de9c5e07	Extract translation strings	2023-08-01 15:21:49 -07: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
akemidx	e289e95721	no ? needed	2023-07-24 17:22:10 -04:00
akemidx	b082d27c42	removing :item	2023-07-24 17:12:12 -04:00
snipe	7f761000b4	Use slightly less terrifying and more accurate language ... Signed-off-by: snipe <snipe@snipe.net>	2023-07-21 14:46:39 +01:00
snipe	33fd904c18	Merge pull request #13330 from akemidx/merge_users_typo ... merge users page typo fix	2023-07-19 10:26:57 +01:00
akemidx	064e696521	merge users page typo fix	2023-07-18 15:33:33 -04:00
snipe	3078cab7ee	Added ability to show/hide custom fields in list views by default ... Signed-off-by: snipe <snipe@snipe.net>	2023-07-14 09:09:43 +01:00
snipe	4027acee46	Merge pull request #13184 from akemidx/department_in_side_bar ... User department now visible in side pane of asset view page	2023-07-13 21:01:48 +01:00
akemidx	d0212d4bda	formatting fix	2023-06-29 15:39:19 -04:00
slong753	826ea0ded8	move colon to blade based on a comment	2023-06-29 10:40:04 -05:00
snipe	a3096e1b47	Merge pull request #13219 from inietov/features/cancel_request_asset ... Cancel requested assets without checkin/out [ch-17606]	2023-06-29 16:18:13 +01:00
akemidx	af03b9f140	user department clarification & translation for that phrase. will be used in a later PR	2023-06-28 17:45:13 -04:00
slong753	8923206ac8	translation string	2023-06-28 13:08:34 -05:00
Ivan Nieto Vivanco	85e717bc4e	Fix cancel button style and translate title	2023-06-28 10:38:44 -06:00
snipe	161f4c8d83	Merge pull request #13045 from akemidx/feature/sc-23261 ... Checkin/out info on side bar	2023-06-28 16:41:21 +01:00
slong753	8b8e7cb5ee	couple translation strings	2023-06-28 10:17:28 -05:00
Marcus Moore	b0177d513a	Fix translation	2023-06-27 12:37:19 -07:00
slong753	8cbff0179c	translation strings	2023-06-26 16:35:53 -05:00
snipe	157a4341ea	Merge pull request #13041 from snipe/features/refactor_importer_for_localization ... Refactor importer for localization	2023-06-13 18:12:07 +01:00
snipe	0bb8cc63c5	Updated translation strings ... Signed-off-by: snipe <snipe@snipe.net>	2023-06-13 17:12:01 +01:00