2908 commits

Author	SHA1	Message	Date
snipe	62bf7b1bce	Merge remote-tracking branch 'origin/develop'	2023-01-10 01:56:27 -08:00
snipe	c5c37fa95f	Fixed copypasta ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 01:54:26 -08:00
snipe	9dc016aecc	Fixed issue where assets sidenav would collapse if custom status label is selected ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 01:31:00 -08:00
snipe	e67bd5a275	Merge remote-tracking branch 'origin/develop'	2023-01-09 16:00:33 -08:00
snipe	8d35583634	Merge pull request #12324 from snipe/features/add_username_to_asset_list ... Added username to display in asset listings	2023-01-09 16:00:01 -08:00
snipe	b39a9e0fe1	Merge remote-tracking branch 'origin/develop'	2023-01-09 15:54:04 -08:00
Brady Wetherington	cbffd105a2	Fix LDAP default group feature	2023-01-09 15:23:19 -08:00
snipe	a57315aed5	Added username to display in asset listings ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-09 12:58:58 -08:00
snipe	014eab3abc	Updated language strings ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-09 11:09:26 -08:00
snipe	91d0c383df	Production assets ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-05 18:47:55 -08:00
snipe	e05764ac34	Truncate URL with ellipsis if too long ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-05 18:42:26 -08:00
snipe	4d0fc99773	Merge remote-tracking branch 'origin/develop'	2023-01-05 14:19:51 -08:00
snipe	ace73acba1	Merge pull request #12263 from Godmartinz/gh12211_label_padding_adjustment ... Fixed: page-break and padding at the end of document for labels	2023-01-05 09:59:35 -08:00
Godfrey M	301c4fda6e	fixes conflicts	2023-01-05 09:55:25 -08:00
snipe	9c63f426d9	Added missing translation string ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-04 14:09:14 -08:00
snipe	b77d5801fa	English is hard, apparently ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-04 13:56:16 -08:00
snipe	d187174f00	Merge pull request #12090 from Godmartinz/deparmtnet_name_validator ... Added: validation for department names at Company locations	2022-12-22 11:29:12 -08:00
snipe	6d3c5e0659	Merge pull request #12264 from Godmartinz/gh12253_display_notes_accessories ... Added: notes to the accessories tab for user detail view	2022-12-21 19:04:11 -08:00
snipe	a6c7471bf5	Merge remote-tracking branch 'origin/develop'	2022-12-20 15:11:36 -08:00
Brady Wetherington	75a757d6f5	There was a bug with select-all where some bits didn't quite work	2022-12-20 14:57:58 -08:00
Godfrey M	e791e6592a	adds notes to the accessories tab under users	2022-12-20 10:37:19 -08:00
Godfrey M	38575e93e8	fixes the rules for adding page-break and padding at the end of document	2022-12-20 09:45:41 -08:00
snipe	d0c5ba70f6	Merge pull request #12242 from inietov/features/add_purchase_cost_column ... Added `purchase_cost` to user's default view [sc-19680]	2022-12-15 12:42:29 -08:00
Ivan Nieto Vivanco	d9a21cce00	Add other items' purchase_cost columns to the same permission	2022-12-15 14:12:05 -06:00
snipe	3e7975b2c3	Merge pull request #12250 from akemidx/grey_out_pw_reset_button ... Fixed: Grey out pw reset button for consistency	2022-12-15 11:25:53 -08:00
akemidx	d870bc3b02	nested if loop	2022-12-15 14:19:51 -05:00
snipe	227fef76ee	Merge pull request #11736 from Godmartinz/gh6508_ldap_default_group ... Adds a permission group selection for directory sync	2022-12-15 11:06:53 -08:00
Godfrey M	2e228ccb0b	redid a few things. should be good now :)	2022-12-15 10:45:42 -08:00
Ivan Nieto Vivanco	b142f8e012	Add the permission to show purchase cost column to non-admin sessions	2022-12-14 23:00:35 -06:00
snipe	b89979fbec	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json	2022-12-14 17:06:26 -08:00
snipe	8043b86786	Upgraded font awesome to 6.2.1 ... Signed-off-by: snipe <snipe@snipe.net>	2022-12-14 16:41:56 -08:00
snipe	d13a237000	Merge pull request #12205 from Godmartinz/sc19675_add_remote_to_importer ... Adds remote field to the user importer	2022-12-14 12:13:18 -08:00
akemidx	b114ffd2c3	Grey out button pw reset button for consistency ... When user has no email in their profile, the box is greyed out for consistency accross all buttons on the user profile	2022-12-14 14:48:59 -05:00
snipe	fabefa61b0	Merge pull request #12243 from akemidx/new_grey_out_when_no_assets ... Created method in users.php for adding up all assigned to user and pr…	2022-12-13 14:00:48 -08:00
akemidx	f3e57d7dc0	fixing PR	2022-12-13 16:00:59 -05:00
snipe	389ec3a3cb	Merge pull request #12247 from Godmartinz/gh12225_serial_added_to_components ... adds serial to components tab of assets	2022-12-13 12:57:50 -08:00
Godfrey M	6a72c344b7	removed the cuddlers	2022-12-13 12:32:30 -08:00
Godfrey M	4442b446b9	adds serial to components tab of assets	2022-12-13 10:30:37 -08:00
snipe	c432fb9d70	Merge pull request #12181 from Godmartinz/gh12163_asset_age ... Adds asset age to asset index and asset view pages	2022-12-13 10:28:17 -08:00
akemi	07ae91b00f	Created method in users.php for adding up all assigned to user and providing an integer value. this then used to grey out buttons on user view if user has nothing assigned.	2022-12-12 15:47:53 -05:00
Ivan Nieto Vivanco	450ad3dcec	Added the column purchase_cost to user's default view	2022-12-12 14:17:08 -06:00
snipe	e26036e998	Merge remote-tracking branch 'origin/develop'	2022-12-08 17:36:01 -08:00
snipe	00ed197651	Fixed #12215 - string for “Hello, :name” in pt-BR was using % ... Signed-off-by: snipe <snipe@snipe.net>	2022-12-08 17:21:55 -08:00
snipe	163b3f6c0b	Merge remote-tracking branch 'origin/develop'	2022-12-08 14:37:35 -08:00
snipe	743264fd0e	Merge remote-tracking branch 'origin/develop'	2022-12-07 16:23:50 -08:00
Godfrey M	ec854ddc1d	adjusts the margin and padding for img barcode in labels	2022-12-07 14:52:23 -08:00
snipe	43acd3b488	Fixed typo ... Signed-off-by: snipe <snipe@snipe.net>	2022-12-07 13:11:17 -08:00
snipe	97731cd7c8	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # 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-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/mix-manifest.json	2022-12-05 16:34:34 -08:00
Godfrey M	36901d271b	adds csvmatch for remote. Im a bit lost though lol	2022-12-05 16:28:19 -08:00
snipe	9ca40716ce	Merge pull request #12197 from inietov/fixes/custom_regex_defaults_to_any ... Fixed #11682 Custom field type of CUSTOM REGEX defaults back to ANY on editing	2022-12-05 13:24:22 -08:00