3898 commits

Author	SHA1	Message	Date
snipe	19d19a4c42	Updated language string ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-07 19:18:32 -08:00
snipe	383b5b43bb	Added a few more jquery options for prevoew flexibility ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-07 18:54:38 -08:00
snipe	379c5f6790	Reworked the layout for logo upoloads ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-07 18:54:09 -08:00
snipe	e55d02fd59	Added new string ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-07 18:53:53 -08:00
Brady Wetherington	09c1298e03	Merge branch 'develop' into livewire_importer_2_squashed_and_rebased ... I'll be taking in the changes to the importer front-end elsewhere	2023-03-07 18:51:05 -08:00
Brady Wetherington	fe699737eb	Add improved field-guessing logic; make sure 'do not map' fields work	2023-03-07 18:26:59 -08:00
snipe	e60fa15414	Nicer layout, but it kinda dosn’t work :( ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-07 17:02:52 -08:00
Godfrey M	69944853f9	more translations	2023-03-07 15:57:58 -08:00
Godfrey M	35dd0d8def	adds generalized webhooks, updates settings page, translations, validation	2023-03-07 15:48:21 -08:00
snipe	ea54f540de	Dynamically determine target route for expected checkin emails ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-07 13:42:51 -08:00
akemidx	ec5836dab4	cloning accessories first bit	2023-03-07 16:41:48 -05:00
snipe	1ebbc767f1	Merge pull request #12624 from snipe/features/added_vip_and_byod_to_importer ... Added `vip` and `byod` to importer	2023-03-06 17:11:28 -08:00
snipe	16bd2cde0f	Updated string for file not found ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-06 15:09:45 -08:00
snipe	f460d881da	Updated vue ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-06 14:27:53 -08:00
Achmad Fienan Rahardianto	0b3becee7a	enable sortable for ID column	2023-03-04 11:27:00 +07:00
Brady Wetherington	7edec26e73	Fixes to layout, improvements to import types, better icons for processing.	2023-03-01 17:18:36 -08:00
Godfrey M	aae178a606	gets select working, placeholders update dynamically	2023-03-01 17:10:10 -08:00
snipe	778787db3c	Rip out jquery for location parent ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-01 15:36:01 -08:00
Godfrey M	354f04534e	add multi array, migration, still having issues	2023-03-01 12:30:32 -08:00
Brady Wetherington	9b80e86306	Actually display name of company in Accessories Report	2023-03-01 11:34:30 -08:00
Brady Wetherington	54cb38603b	Cleaned up the last of the FIXME's (or downgraded them to TODO's)	2023-02-28 22:34:44 -08:00
Brady Wetherington	5cf66851f7	Finalizing the Livewire Importer! Just going to do some testing now	2023-02-28 21:58:02 -08:00
snipe	44e2796645	Merge pull request #12579 from Godmartinz/gh12571_sidebar_adjustment ... Fixes the sidebar margin top	2023-02-28 20:30:07 -08:00
Brady Wetherington	2f94bf96ff	Everything's all wired up; just need to clean up all the FIXME's and stuff	2023-02-28 18:36:52 -08:00
snipe	1f7ae08d76	Merge branch 'develop' into features/make_eol_sortable	2023-02-28 18:05:09 -08:00
snipe	af9f9d2523	Convert string to date object for formatting ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-28 15:48:45 -08:00
akemidx	25f3e4d41a	Adding ability to see boolean values when using normal export	2023-02-28 16:01:23 -05:00
Godfrey M	e8fbb0608f	adjusts the sidebar margin top	2023-02-28 09:30:02 -08:00
Brady Wetherington	53db266b69	WIP: cleaning up extraneous gunk and trying to standardize on one single Livewire Select2 implementation	2023-02-27 14:29:02 -08:00
Brady Wetherington	fb201e61f3	More wiring up Livewire to the back-end.	2023-02-27 14:29:02 -08:00
Brady Wetherington	e1c8f155bb	Wiring up more bits to Livewire	2023-02-27 14:29:02 -08:00
Brady Wetherington	5c97e45d00	WIP - trying to get select2 wired up for importer	2023-02-27 14:29:02 -08:00
Brady Wetherington	8009ee79db	I think I have, now, full parity on the base Importer level ... Meaning that you can upload new files, delete old files, have error messages, have status updates - and all of them seem to work.	2023-02-27 14:29:02 -08:00
Brady Wetherington	0a085af0a0	Getting the basic wiring of the importer over into Livewire ... WIP: Wiring up more and more of the actions on the importer Files now upload okay, a little glitchy on the display-side though add to readmes so i dont forget	2023-02-27 14:28:59 -08:00
Godfrey M	e8fc895e51	"adds variables, but still not working"	2023-02-27 09:19:59 -08:00
snipe	5e6ebb9a65	Merge pull request #12410 from uberbrady/paginate_accessories_report ... Paginate accessories report	2023-02-23 12:26:17 -08:00
snipe	8e72da42e8	Merge pull request #12406 from akemidx/vip_tag ... Added a checkbox to notate VIP status	2023-02-23 12:23:29 -08:00
snipe	eb6357636a	Merge pull request #12467 from marcusmoore/fix/scope-people-with-full-multiple-companies ... Fix full company scoping in user selects	2023-02-23 10:36:33 -08:00
Marcus Moore	6c8de181cf	Properly close tag in mail template	2023-02-22 17:52:47 -08:00
Marcus Moore	aae2106658	Use existing language translation string	2023-02-22 12:02:14 -08:00
snipe	81cb29db5e	Merge pull request #12509 from inietov/fixes/add_images_to_user_inventory_mail_report ... Added images to emailed user inventory report [sc-19801]	2023-02-22 10:38:07 -08:00
snipe	4bf1566d2a	Merge pull request #12124 from Godmartinz/feature/sc-16946/add-checkbox-to-allow-skipping-a-user-during ... Adds Boolean to Users Table for Auto Assigning Licenses	2023-02-21 20:10:46 -08:00
snipe	0c3115553e	Merge branch 'develop' into vip_tag	2023-02-21 20:03:49 -08:00
snipe	942fee4d43	Merge pull request #12447 from akemidx/user_setup_translation ... FIXED: Translations on the User Creation setup page	2023-02-21 19:53:00 -08:00
snipe	29158dece5	Two more translations ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-21 09:19:34 -08:00
snipe	04d3938f0c	Updated the general translation file with new strings ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-21 09:04:13 -08:00
snipe	f109218e16	Re-added dropped translations from CrowdIn ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-21 09:00:10 -08:00
snipe	a0b05bac8d	Updated translations with new strings and new translations ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-21 03:54:55 -08:00
akemidx	f33b6a3e26	Update user.blade.php	2023-02-17 12:52:54 -05:00
akemidx	dfc2aa35f4	Update general.php	2023-02-17 12:51:58 -05:00
snipe	71334b5eae	More tweaking for top button alignment ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-15 18:13:38 -08:00
snipe	f124249e1c	More padding twiddles ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-15 18:08:11 -08:00
snipe	e451ca1a5c	Stray semicolon ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-15 17:37:53 -08:00
snipe	3e111fca6e	Cleanup some small UI bugaboos (padding, etc) ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-15 17:13:40 -08:00
snipe	df64e0e291	Merge pull request #12523 from Godmartinz/bug/sc-20041/slack-ui-livewire-tweaks ... Fixes slack settings submit button availability	2023-02-15 16:28:57 -08:00
snipe	51c9a7d4f8	Merge pull request #12521 from akemidx/weird_checkout_text ... Fixed awkward checkout text in checkedout side panel	2023-02-15 16:28:05 -08:00
akemidx	d8d713426d	indent?	2023-02-15 19:24:20 -05:00
akemidx	7dd789d5c0	translate no assets at checkout	2023-02-15 19:22:13 -05:00
Godfrey M	2d8c8e8f48	removes lazy loading	2023-02-15 16:16:14 -08:00
Godfrey M	7b510d5f2b	greys out submit button conditionally	2023-02-15 15:46:05 -08:00
snipe	d4634e83c9	Nicer padding, removed unused ids ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-15 14:45:18 -08:00
snipe	6c3ffa7918	Removed unused CSS ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-15 14:39:24 -08:00
snipe	27e5832a28	Use existing slack translations ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-15 14:06:52 -08:00
snipe	2d0bd2b292	Make spinner actually spin ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-15 14:06:40 -08:00
akemidx	b96f2f738d	fixed weird phrasing in asset checkout screen	2023-02-15 16:47:48 -05:00
snipe	ff895739f4	Merge pull request #12446 from Godmartinz/livewire_slack_inputs ... Adds Livewire slack inputs	2023-02-15 13:27:07 -08:00
snipe	de4f7bd274	Merge pull request #12408 from snipe/fixes/stricter_date_rectrictions_on_validation ... Enforce Y-m-d as date format for date fields	2023-02-15 12:54:22 -08:00
Godfrey M	793cf4823b	missing things like mr magoo	2023-02-14 14:35:54 -08:00
Godfrey M	c0d8ff1676	simplified to an else instead of elseif	2023-02-14 14:21:24 -08:00
Godfrey M	0cd558593d	adds the red x icon to a false deployable status	2023-02-14 10:34:36 -08:00
Godfrey M	d03e042eda	adds a red icon next to broken- not fixable status label	2023-02-14 09:55:48 -08:00
snipe	1520c9c6a7	Merge pull request #12506 from marcusmoore/fix/use-translation-strings-for-importer-errors ... Use translation strings for importer exceptions	2023-02-13 14:17:47 -08:00
Marcus Moore	4bdb1cf552	Improve error message wording	2023-02-13 13:34:20 -08:00
Marcus Moore	2349f54013	Use translation strings for importer exceptions	2023-02-13 13:30:36 -08:00
snipe	2bbbc8158b	Merge pull request #12477 from akemidx/apple_warranty_link ... Added functionality to Apple Warranty link	2023-02-13 13:02:33 -08:00
snipe	2f5b4c8e1b	Merge pull request #12498 from akemidx/layout_trans ... Translations for the layout setup	2023-02-13 13:01:58 -08:00
Ivan Nieto Vivanco	f0bf16d784	Fix more uneven tags	2023-02-12 12:01:40 -06:00
Ivan Nieto Vivanco	9a68a747a0	Fix uneven tags	2023-02-12 11:59:56 -06:00
Ivan Nieto Vivanco	81cc9f3700	Adds images to emailed user inventory report	2023-02-12 08:23:50 -06:00
akemidx	5714824aa7	translations for the layout setup	2023-02-09 17:24:34 -05:00
snipe	e79818967d	Merge pull request #12490 from akemidx/manufacturer_marker ... Removed "required" marker for manufacturer on asset models (since it is not actually required)	2023-02-09 12:43:14 -08:00
akemidx	32ed70259e	sweedish chef fixes up your typos	2023-02-09 15:39:10 -05:00
akemidx	1a651b33fc	manufacturer marker removal	2023-02-08 17:31:39 -05:00
snipe	a4a3c03a7c	Merge pull request #12478 from inietov/fixes/added_translation_strings_inventory_report ... Fixed #12064 Mail-Template missing translation strings	2023-02-08 10:02:19 -08:00
snipe	16fcc6dc44	Fixed UI bug where download button was missing for non-images ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-07 18:40:00 -08:00
Ivan Nieto Vivanco	49b6a1cc53	Adds translation strings to theinventory report sent to users	2023-02-07 18:29:19 -06:00
akemidx	75f3cb3079	fixing external if statement	2023-02-07 19:02:12 -05:00
akemidx	c0074baa26	functionality to Apple Warranty link	2023-02-07 17:27:39 -05:00
Marcus Moore	0e57e4836e	Add translation for Company	2023-02-06 12:21:23 -08:00
Marcus Moore	45e8e9bbed	Move company name to better location	2023-02-06 12:21:09 -08:00
Marcus Moore	78343ddb7c	Add asset's company name to checkout page	2023-02-06 10:58:10 -08:00
Godfrey M	74c64c1fc5	adds validation to the update hook, removes typos and deadlines	2023-02-06 09:40:57 -08:00
snipe	dc414d3552	Updated model restore route ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-02 23:38:59 -08:00
snipe	bbf6e5e69e	Merge pull request #12421 from akemidx/hardware_blades_translations ... Fixed: translations added for the hardware blades	2023-02-02 13:02:46 -08:00
akemidx	37ce68af5b	once again fixing an apostrophe	2023-02-02 15:54:05 -05:00
akemidx	29851c626f	Merge branch 'develop' into user_setup_translation	2023-02-02 14:34:09 -05:00
snipe	7344bbdd7f	Added checkout/checkin note to user history ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-02 11:26:33 -08:00
snipe	78dca7fd32	Handle missing userfiles more gracefully ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-02 10:49:36 -08:00
akemidx	69c38bf686	translations on the User Creation page	2023-02-01 20:32:16 -05:00
Godfrey M	3a86547ef5	fixes messages for integration test, removes slack request file, rehouses ajax method	2023-02-01 16:51:05 -08:00
snipe	d9cdb92014	Merge branch 'develop' into vip_tag	2023-02-01 16:03:23 -08:00
snipe	2da4578aa5	Merge branch 'develop' into slack_message	2023-02-01 13:43:09 -08:00
snipe	1a8fb5bcfe	Merge pull request #12423 from snipe/features/edit_fieldset_name ... Fixed #12418 - added ability to edit custom field names via GUI	2023-02-01 13:39:39 -08:00
snipe	4a6250a08c	Merge pull request #12409 from akemidx/component_checkin_limit ... Fixed: Checkin limit string translation for components	2023-02-01 13:37:56 -08:00
akemidx	0ffd40a217	fixing syntax	2023-02-01 16:30:07 -05:00
akemidx	33d819fd41	fixing pr	2023-02-01 16:13:53 -05:00
akemidx	90c1bfe03d	fixing pr	2023-02-01 16:12:39 -05:00
akemidx	3702dd87ce	fixing pr	2023-02-01 16:10:30 -05:00
akemidx	4d9d73483f	fixing pr	2023-02-01 16:09:19 -05:00
akemidx	4e5b8fa213	fixing pr	2023-02-01 16:05:50 -05:00
akemidx	a8643e5d35	cleaning up/adding variable	2023-02-01 15:55:16 -05:00
Godfrey M	f95a904d90	adds integration button, working on its functionality	2023-02-01 12:08:13 -08:00
snipe	f7ae5db4f3	Merge branch 'develop' into features/fixed_12382_added_checked_out_count_to_accessories	2023-01-31 19:56:43 -08:00
snipe	de1141491a	Replaced help text ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-31 19:41:42 -08:00
Brady Wetherington	02ca5248b1	Don't append username to the user's name if it's already there	2023-01-31 17:44:09 -08:00
Godfrey M	1e0c58c3cf	saves data correctly now	2023-01-31 11:32:05 -08:00
Ivan Nieto Vivanco	a7a578bf51	Added head only logo to be used as default in apple-touch-icon	2023-01-31 00:13:44 -06:00
Godfrey M	fc044528b8	validation is working, success message appears, database is not updating	2023-01-30 16:10:02 -08:00
akemidx	214a1af61a	apostrophe updates	2023-01-30 16:54:23 -05:00
snipe	583a0412fe	Added edit fieldsets translations ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-26 17:03:23 -08:00
snipe	a16604285c	Normalize the fieldset form ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-26 17:03:07 -08:00
snipe	37f5cfa8ce	Added edit button for fieldsets ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-26 17:02:53 -08:00
Godfrey M	a63ea560ae	adds submit button, getting setAttribute error	2023-01-26 15:17:08 -08:00
akemidx	79d9cff22a	translations added for the hardware blades	2023-01-26 16:26:31 -05:00
Godfrey M	a69cb6204a	adds rest of inputs, and corrects Data binding	2023-01-25 16:22:34 -08:00
Godfrey M	2e22eeade5	adds one input	2023-01-25 14:29:20 -08:00
akemidx	53d8008a5f	Merge branch 'vip_tag' of github.com:akemidx/snipe-it into vip_tag	2023-01-25 17:14:29 -05:00
akemidx	b363524305	vipuser label updated to vip	2023-01-25 15:58:44 -05:00
snipe	4c3354b778	Merge branch 'develop' into vip_tag	2023-01-24 20:29:43 -08:00
Brady Wetherington	b00333c9f5	Merge remote-tracking branch 'upstream/develop' into develop	2023-01-24 17:36:39 -08:00
Brady Wetherington	c9f0f5fe8b	Change Accessories report to use server-side pagination from URL	2023-01-24 17:35:44 -08:00
snipe	a61ccbb965	Added very clunky but better error messages on that validation for date_format ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-24 17:33:49 -08:00
snipe	91394f7262	Removed duplicate comment section ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-24 17:23:06 -08:00
akemidx	3ba79600fb	checkin limit for the components checkin	2023-01-24 18:17:49 -05:00
akemidx	cafe8f3074	notification for slack message	2023-01-24 16:20:20 -05:00
akemidx	596846a94a	Add VIP Checkbox	2023-01-24 15:29:27 -05:00
Godfrey M	4b51424723	fixes a couple buttons color choices in high contrast	2023-01-24 09:42:03 -08:00
Godfrey M	0f8ee22053	Creates Slack Setting Form	2023-01-24 09:25:05 -08:00
snipe	7a9ea91be0	Merge pull request #12387 from snipe/fixes/inconsistent_UI_for_image_delete ... Updated - Refactored ImageHandler request to be more re-usable, and checkboxes with missing `minimal` class for iCheck	2023-01-23 21:39:55 -08:00
cram42	c2c009a018	Merge branch 'develop' into develop	2023-01-24 09:53:42 +08:00
akemidx	25996cbe03	translating the quick info printed out on accept x eula blades	2023-01-23 16:18:21 -05:00
snipe	4104d7260f	Include new eol date picker blade ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-22 00:55:31 -08:00
snipe	3587017591	Updated EOL date in view blade ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-22 00:55:19 -08:00
snipe	8040d08e8c	Removed formatter from EOL date ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-22 00:54:37 -08:00
snipe	abad579306	Added eol date picker ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-22 00:45:33 -08:00
snipe	72295c093a	Add CSS to the div to correct the weird indenting - fixes #12388 ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 18:24:23 -08:00
snipe	2dc1182582	Don’t offer the delete option if there is no avatar currently ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 18:20:26 -08:00
snipe	93ad0d02b9	Use fieldname for aria labels too ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 18:20:02 -08:00
snipe	3674f46ce0	Added arial labels ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 16:42:44 -08:00
snipe	cfa342c81a	Updated HTML for “standard” image edit/delete ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 16:23:04 -08:00
snipe	563a252d18	Updated checkboxed with missing minimal class for iCheck ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 14:57:52 -08:00
snipe	2bdf3d3f44	Missed a few strong HTML tags ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 14:44:10 -08:00
snipe	56090bc645	Re-ordered notes to be more consistent, fixed missing iCheck class ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 14:38:35 -08:00
snipe	fd73bee850	Fixed hardcoded string and added new checkout count to accessory view ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 14:38:05 -08:00
Marcus Moore	0fa956403c	Fix row divider overflow	2023-01-19 14:16:28 -08:00
Ivan Nieto Vivanco	f045008237	Add index to deleteFile() call, so it knows what element delete	2023-01-19 13:04:49 -06:00
snipe	fa9116b184	Merge pull request #12369 from snipe/features/add_byod_to_assets ... Added BYOD to assets	2023-01-18 16:09:45 -08:00
Marcus Moore	c089f6eff2	Reference the accessory instance instead of the model	2023-01-18 13:48:01 -08:00
Marcus Moore	e506ed7950	Remove extra quote	2023-01-18 13:42:09 -08:00
Marcus Moore	07744ca7bd	Reference the consumable instance instead of the model	2023-01-18 13:41:58 -08:00
snipe	0c39c7a53d	Updated blades to add byod as a “status” ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-18 13:25:46 -08:00
snipe	fce620b54f	Added byod to blades ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-18 13:11:02 -08:00
snipe	33fe2b57f7	Added new byod strings ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-18 13:10:48 -08:00
Marcus Moore	ca1198ceb2	Constrain the bottom bar to the content window	2023-01-18 12:55:20 -08:00
Marcus Moore	b31e000165	Have Info and History tables in accessory show page span entire width of row	2023-01-18 12:54:52 -08:00
Godfrey M	7ce230fadc	missed a few renames	2023-01-18 08:57:59 -08:00
Godfrey M	6fbb484dfd	renames db column for auto_assign boolean, rewords trans string, default value of 1 now	2023-01-18 08:43:03 -08:00
Marcus Moore	5282ca47b3	Allow users with consumables.files ability to upload files for consumables	2023-01-17 17:16:50 -08:00
Marcus Moore	1f12137245	Close divs in correct location	2023-01-17 17:09:55 -08:00
Marcus Moore	6c89f08193	Register the accessories.files ability and allow users with the ability to upload files for accessories	2023-01-17 16:59:50 -08:00
Marcus Moore	1fef992fa8	Allow users with components.files ability to upload files for components	2023-01-17 15:58:11 -08:00
snipe	50cc69c427	Added South Sudan to country list ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-13 13:23:57 -08:00
snipe	d508374c57	Disallowed category type change string ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 16:15:51 -08:00
snipe	f50b622eb8	Disallow editing of category type once created, added help text ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 16:15:40 -08:00
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
snipe	7518cab7c8	Merge pull request #12194 from Godmartinz/FDD32094_Icon_color_change ... changes the life-ring icon color with themes	2022-12-01 10:04:55 -08:00
Ivan Nieto Vivanco	8d36971c8b	Properly select 'CUSTOM REGEX' from the select list if the format declares onee	2022-11-30 16:21:23 -06:00
Godfrey M	371a5bf4d6	changes the icon color with themes	2022-11-30 10:37:47 -08:00
snipe	8bf01715a9	Merge pull request #12182 from akemidx/translate_inventory_notification ... Fixed #12119 - updated user inventory language to use strings	2022-11-29 13:14:32 -08:00
akemi	55f5e7866d	edits for PR	2022-11-29 15:59:36 -05:00
snipe	9c205f63ae	Merge remote-tracking branch 'origin/develop'	2022-11-28 19:21:19 -08:00
snipe	e21d0729c1	Add jobh title to header in print assets view ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-28 19:19:42 -08:00
snipe	c46dc99e86	Merge remote-tracking branch 'origin/develop'	2022-11-28 17:20:57 -08:00
snipe	8de59d117f	Added serial number to emailed inventory report ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-28 17:14:38 -08:00
snipe	d5e702ac74	Merge remote-tracking branch 'origin/develop'	2022-11-28 14:12:38 -08:00
snipe	6113afe36e	Merge pull request #12125 from inietov/fixes/email_issues ... Fixed #11699 and #12065 Email issues	2022-11-28 14:09:42 -08:00
snipe	305df42f92	Merge pull request #12167 from inietov/features/no_submit_until_status_selected ... Fixed #11980 Submit button deactivated in Users' Bulk Checkin if no status selected	2022-11-28 13:17:33 -08:00
akemi	39e06a8856	Update to PR#12119, adding inventory notification to messages and changing code to be dynamicaly translated	2022-11-28 14:16:22 -05:00
Godfrey M	8d861cfd82	adds age to the asset table	2022-11-28 10:59:18 -08:00
Godfrey M	078e7281cd	adds asset age to asset view	2022-11-28 10:45:58 -08:00
Ivan Nieto Vivanco	b1985a08c4	Checks the status before activate the submit button on users bulk-checkin	2022-11-23 17:45:59 -06:00
Ivan Nieto Vivanco	9bafe795b0	Corrected the view when editing custom fields values	2022-11-23 16:34:29 -06:00
Ivan Nieto Vivanco	feeb1c7ac8	Corrected the view when editing custom fields values	2022-11-23 12:21:07 -06:00
snipe	27898e660c	Inherit the background color, since the field isn’t actually technically readonly ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-22 08:54:48 -08:00
Aaron	7c854c0a5c	Fix restore icon in table view ... Signed-off-by: Aaron <admin@datahoarder.dev>	2022-11-19 10:45:10 +01:00
snipe	f0c5560c1b	Merge pull request #12141 from Godmartinz/adds_serial_number_to_history ... Added `serial` column to the user history page	2022-11-17 21:15:26 +00:00
Godfrey M	0a9fd0b867	adds serial to activity report page	2022-11-17 13:09:06 -08:00
Godfrey M	5c94ca1403	removes dead space	2022-11-17 13:06:07 -08:00
Godfrey M	86bc409d3a	adds serial column to the action logs	2022-11-17 12:57:53 -08:00
Instead of looking elsewhere, it is better to come here together	9056d48775	Fixed: 12095	2022-11-16 18:16:45 +08:00
Godfrey M	8a0517fb5d	removes data dump	2022-11-15 15:59:47 -08:00
Godfrey M	90828e3a87	fixes variable name	2022-11-15 15:51:52 -08:00
Godfrey M	45636b8114	adds should_autoassign boolean to users table	2022-11-15 15:42:57 -08:00
snipe	60d7128a5e	Replace error suppression with better logic ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-15 17:41:57 +00:00
Ivan Nieto Vivanco	f0ecab7bb1	Fix typo in variable (ah-hyuck!)	2022-11-15 11:00:40 -06:00
Ivan Nieto Vivanco	7cc8b39863	Checks if settings let URL's be shown in email notifications	2022-11-15 10:55:54 -06:00
Ivan Nieto Vivanco	cd2997b674	Determine if email_logo or logo setting needs to be used in the Forgot Password email	2022-11-15 08:08:26 -06:00
snipe	8122236944	Merge pull request #12096 from snipe/features/add_custom_field_option_to_view_assets ... Added custom field option to view assets	2022-11-14 22:45:26 +00:00
snipe	602c2698d2	Fixed broken table header tag ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-14 22:06:23 +00:00
snipe	d4ac7530b6	Removed download button for files that don’t exist on the server ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-14 22:04:06 +00:00
snipe	4aded5e117	FIxed 500 error if model files are missing ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-14 22:01:33 +00:00
snipe	077d343f01	Prevent 500 if license file is missing ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-14 17:42:40 +00:00
Cram42	60ef5686ab	Add "Pop Out" button for preview	2022-11-12 19:02:38 +08:00
Cram42	af0872dc23	Fix form refresh after bootstrap-table	2022-11-11 14:23:38 +08:00
Cram42	30a7a31724	Move label preview to alpine component	2022-11-11 14:23:02 +08:00
Cram42	67d021e457	Add alpinejs to deferred scripts	2022-11-11 11:25:41 +08:00
snipe	ae95ee49f1	Hide the option if the field is encrypted ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-10 17:56:50 +00:00
snipe	2ac558494d	Set column width instead of letting BS tables guess ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-10 17:21:07 +00:00
snipe	ede16ad2c2	Removed unused block ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-10 17:19:35 +00:00
snipe	7a5fcfb87a	Loop through fields array ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-10 16:46:59 +00:00
Cram42	7108156072	Fix button disabling	2022-11-10 19:24:02 +08:00
Cram42	a4b93d4bbd	Create Field Definitions helper control	2022-11-10 19:20:18 +08:00
Godfrey M	92ae271292	adds validation for department names at Company locations	2022-11-09 13:11:33 -08:00
snipe	097821b818	Slight revamping of column layouts and also added new general.display_in_user_view column ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-08 15:28:19 +00:00
snipe	2e56c9b521	Added new general.display_in_user_view field to form ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-08 15:27:59 +00:00
snipe	b95d24b5eb	Additional translations ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-08 15:27:44 +00:00
snipe	236684ec92	Fixed model file image path/variable ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-03 14:12:49 -07:00
snipe	7cb1ca8754	Fixed image path to show preview ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-03 13:51:48 -07:00
Cram42	fd9616683c	Label preview auto-refresh	2022-11-03 10:20:12 +08:00
Cram42	f5fac50e91	Add preview pane	2022-11-02 19:31:34 +08:00
Cram42	4bb40adfce	Add Asset Tag as separate supported feature	2022-11-02 16:07:50 +08:00
snipe	eb81c290dc	Accessory file upload ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 19:50:39 -07:00
snipe	71a7176a6e	Updated component blade ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 19:28:57 -07:00
snipe	def89bfa0c	Added some generic file translations ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 19:28:49 -07:00
snipe	2106b64da6	Fixed some layout issues ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 19:06:49 -07:00
Cram42	cde2ba7720	Fix: Oops	2022-11-02 09:51:02 +08:00
snipe	fa79a6c15f	Skip storage:: facade on missing images ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 18:19:13 -07:00
snipe	761da534f3	Updated consumables UI to allow uploads and display files ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 17:53:08 -07:00
Cram42	6b2fe582ca	Merge branch 'feature-label2' into develop	2022-11-01 20:12:28 +08:00
Cram42	d37605ff18	Add localization strings	2022-11-01 20:01:18 +08:00
Cram42	6de48b4dc8	Implement settings for labels	2022-11-01 20:00:53 +08:00
snipe	a930661150	Check for valid category ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-31 12:16:39 -07:00
snipe	c233d7fb1c	Removed extra spaces ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-26 10:51:06 -07:00
snipe	dea0fcefbd	Reflect color in sidenav if one is given ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-26 10:48:42 -07:00
snipe	e670ffe349	Added Assets Assigned to tab ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-26 00:16:06 -07:00
snipe	b503b672ba	Merge pull request #11951 from Godmartinz/AccessKey_shortcuts ... adds shortcuts for listing, creating, and saving	2022-10-25 15:53:57 -07:00
snipe	85a85082b7	Changed button icon for importer ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-21 16:59:19 -07:00
snipe	515b14a001	Updated JS to better handle input IDs ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-20 19:21:09 -07:00
snipe	4eed2baa31	Added default tab to locations ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-20 19:06:58 -07:00
Godfrey M	f9ac447dd1	adds default group to LDAP	2022-10-18 15:18:09 -07:00
snipe	23e613f903	Fixed kit parse error on model edit ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-18 15:00:33 -07:00
snipe	2543fa6b98	Fixed user icon for tab ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-17 20:04:42 -07:00
snipe	7c34652da0	Fixed incorrect icons for mobile view on location tabs ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-17 20:02:27 -07:00
snipe	fb228d6ded	Updated strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-13 12:57:10 -07:00
snipe	1360ce90a5	Updated strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-13 12:52:45 -07:00
snipe	3549afe157	Added strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-13 12:43:24 -07:00
snipe	cfb780b20b	Remove unused files ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-13 12:39:10 -07:00
snipe	eb9f17122e	Updated strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-13 12:21:09 -07:00
snipe	2ef45afb2b	Removed extraneous files ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-13 12:18:57 -07:00
snipe	e7ae7742b0	Merge pull request #11949 from nh314/Remove-required-mark ... Remove required mark	2022-10-12 10:55:49 -07:00
snipe	06803092c5	Merge pull request #11952 from snipe/features/clearer_activated_helptext ... Added clearer LDAP activated helptext	2022-10-12 10:52:56 -07:00
Ivan Nieto Vivanco	ab0c5bcd9d	Add precision parameter to the diffForHumans() Carbon function to report	2022-10-12 12:16:13 -05:00
snipe	5ba01728d9	More text tweaking ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-11 12:51:25 -07:00
snipe	ae0eb378e4	Additional clarification ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-11 12:43:54 -07:00
snipe	ad8a2387f0	Updated help text to be more clear ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-11 12:38:37 -07:00
Godfrey M	4fa01350c3	adds shortcuts for listing, creating, and saving	2022-10-11 12:00:15 -07:00
Phan Nguyen	d3161fad02	Remove required mark ... Because it actually not required by model.	2022-10-11 15:49:56 +07:00
snipe	15da3b831d	Merge pull request #11937 from Godmartinz/gh11868_sidebar_unclickable ... Fixes the margin top adjustment for desktop	2022-10-06 10:43:27 -07:00
Godfrey M	0c6441ebed	removes the margin top adjustment for desktop	2022-10-06 10:35:28 -07:00
Ivan Nieto Vivanco	f1edbc9810	Send item variable that the datepicker needs	2022-10-06 09:15:00 -05:00
snipe	ca937667b4	Indented divs per @uberbrady ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-05 17:21:39 -07:00
snipe	3605aa8f5a	Added clear button to generic datepicker and made it wider ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-05 16:59:06 -07:00
snipe	0817308822	Added start/end to edit/view screens ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-05 16:58:49 -07:00
snipe	d23e178c62	Adde language strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-05 16:56:10 -07:00
snipe	18663c2599	Merge pull request #11925 from inietov/fixes/checkbox_customfields_comma_issues ... Fixed #11710 - Validation of checkbox data with multiple values	2022-10-05 16:48:32 -07:00
Ivan Nieto Vivanco	5b8e0b3af1	Use a regex (gulp) to admit ',' (comma) and ', '(comma plus space) as customfields checkbox value delimiter	2022-10-05 18:40:07 -05:00
snipe	018f71a157	Switched to translations for better autoglossonym support ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-05 11:46:42 -07:00
snipe	c70c8ce856	Merge pull request #11916 from Godmartinz/gh11868_sidebar_unclickable ... fixes mobile views and clickability of sidebar menu	2022-10-04 18:07:02 -07:00
snipe	81d2a3acda	Updated lnaguage strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-04 17:48:43 -07:00
snipe	ba0483b33e	Phrasing! ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-04 16:21:10 -07:00
snipe	97b9f96030	Added nag alert for unaccepted assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-04 16:16:21 -07:00
snipe	891b5b2882	Added routes, language ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-04 15:45:25 -07:00
Godfrey M	e21660ae05	off by a pixel	2022-10-04 12:11:37 -07:00
Godfrey M	53392d6069	fixes mobile views and clickability of sidebar menu	2022-10-04 12:01:13 -07:00
snipe	3469e49470	First UI overhaul ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-03 21:28:22 -07:00
Brady Wetherington	0424308863	Modified dashboard tooltips to add percentage as well as count	2022-09-29 13:46:56 -07:00
Brady Wetherington	420c216973	Added counts to Dashboard Pie Chart legends and tooltips	2022-09-29 13:20:58 -07:00
snipe	70c766e8b3	Added setting to choose dashboard type ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-29 04:16:46 -07:00
snipe	0b2ce7be07	Fixed #11521 - switch to using status meta from status label name ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-29 03:48:58 -07:00
snipe	8168ca4074	Merge pull request #11853 from Godmartinz/ldap_test_results_color ... Fixes the color choice for the ldap_test_results	2022-09-27 14:46:46 -07:00
snipe	c194c8a0c8	Merge pull request #11764 from BasO12/master ... Added notes to audit mail notification	2022-09-27 14:43:50 -07:00
Ivan Nieto Vivanco	06ba9356ca	Delete another set of duplicates	2022-09-26 18:57:35 -05:00
Ivan Nieto Vivanco	e034f7b674	Delete another duplicate that somehow has survived	2022-09-26 18:56:24 -05:00
Ivan Nieto Vivanco	4d14243f57	Delete duplicate fields from the importer dropdown menu	2022-09-26 18:51:13 -05:00
snipe	9d93c72534	Use BS datepicker’s built in clear button ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-26 14:34:35 -07:00
Ivan Nieto Vivanco	23cf556a8b	Adds cursor:pointer to indicate a clickable link	2022-09-20 22:24:52 -05:00
Ivan Nieto Vivanco	f75917d34d	Add a link used to clear the purchase date input	2022-09-20 17:53:55 -05:00
Godfrey M	c55f2d5417	corrects color for query and results of ldap sync test	2022-09-20 10:35:55 -07:00
Godfrey M	571ce5b741	corrects the color choice for the ldap_test_results	2022-09-19 11:59:02 -07:00
snipe	dcab1381e7	Check for licenses.files permissions ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-16 14:00:27 -07:00
snipe	ca70988879	Larger checkbox in lists ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-15 21:42:16 -07:00
snipe	62ad3fad1c	Remove DL button if file doesn’t exist ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-15 16:11:27 -07:00
snipe	eb1e287c15	Better handle missing files ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-15 16:08:13 -07:00
snipe	1885e73704	Ignore warning icon if no purchase date ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-15 15:42:47 -07:00
snipe	24910433a1	Fixed 500 when depreciation is set but no purchase_date ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-15 15:39:47 -07:00
Ivan Nieto Vivanco	9b2eda2d70	Save and show the default values properly on custom fields of type checkbox	2022-09-15 11:52:49 -05:00
Ivan Nieto Vivanco	20220764bb	Add possible values for custom fields of type checkbox	2022-09-15 11:18:54 -05:00
snipe	72feaee6c0	Added Applecare lookup link if manufacturer is apple ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-14 19:43:48 -07:00
Godfrey M	9b448227f7	tinkering to no avail	2022-09-13 11:40:10 -07:00
snipe	93428e1ed4	Increased colspan for checkboxes ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-31 13:34:27 -07:00
Godfrey M	193b31e427	select options working, testing sync then done	2022-08-31 12:58:33 -07:00
Godfrey M	70ac8af9c4	.	2022-08-31 09:53:20 -07:00
BasO12	61e1650542	Add files via upload	2022-08-31 13:08:09 +02:00
BasO12	ab54ac9408	Add files via upload	2022-08-31 13:07:05 +02:00
snipe	dcbd407698	Merge pull request #11661 from inietov/fixes/notifications_asset_acceptance ... Send notifications when Acceptance Assets actions occur [sc-9917]	2022-08-30 12:14:58 -07:00
Godfrey M	0c362e8b57	gets the groups selector to appear but options are blank	2022-08-29 12:09:56 -07:00
snipe	9cf5f30c77	Set safeMode to true and use helper for all parsedown ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-29 11:26:47 -07:00
David Sferruzza	f60ea9581d	Fixed #11742: display correct file sizes when using S3(-like) storage	2022-08-28 12:07:14 +02:00
Godfrey M	fc6fefdb4e	adds migration, variables, checkbox,working on groups	2022-08-25 15:19:38 -07:00
snipe	36ab794adc	Added signature field to user history ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-24 18:05:43 -07:00
snipe	a5fd9ebbb1	Added style to readonly datetime picker field ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-24 17:10:15 -07:00
Ivan Nieto Vivanco	581cae94ab	Add readonly property to datepickers	2022-08-24 18:21:54 -05:00
snipe	af34fc207c	Suppress error output if file doesn’t exist on server ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-24 13:47:56 -07:00
Godfrey M	2994c3613a	adds clearfix to settings page	2022-08-22 10:46:15 -07:00
snipe	368bd5da3f	Adds the category in the side info on Models > View ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-14 14:01:58 -07:00
snipe	7b3be076b4	Make location field the same width ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-11 18:38:34 -07:00
snipe	2c68ec927a	Use trans_choice for string ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-11 18:30:59 -07:00
snipe	a0ba33ed7c	Added checkboxes ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-11 18:25:22 -07:00
snipe	70bb4cd746	Added translation ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-11 18:25:15 -07:00
Ivan Nieto Vivanco	a33ca39237	Figure out declined notifications	2022-08-11 16:00:21 -05:00
Ivan Nieto Vivanco	d2c486bb1e	Create the mail template for the acceptance	2022-08-11 15:28:30 -05:00
Ivan Nieto Vivanco	509bbbc685	Create Notifications classes for accepted and declined and add some necesary lang strings	2022-08-11 13:01:21 -05:00
snipe	acd666fdf5	Added notes to user consumables tab ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 15:34:07 -07:00
snipe	8de7e9a2ab	Use route name in case the user biffs the checkout twice ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 15:17:52 -07:00
snipe	dd0260c3be	Use old note on validation failure ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 15:15:29 -07:00
snipe	fb3d7bf82e	Made button wider ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 15:07:58 -07:00
snipe	0d9eccb7eb	Addeed note field ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 15:03:12 -07:00
snipe	637604dfaf	Fixed #8928 - add URL and ID to custom asset report ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 13:51:47 -07:00
Brad Coudriet	77a1fcb1fc	There was actually a missing p tag too	2022-08-09 06:36:53 -04:00
Brad Coudriet	0cf0598936	Added a closing div tag around the mail text help block, this was causing labels further down the page to be formatted in correctly	2022-08-09 06:32:03 -04:00
snipe	c39bf7b7e6	Added German (Informal) to select list ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-08 15:30:58 -07:00
snipe	9db0b038a5	Updated translation strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-08 15:29:28 -07:00
snipe	095dd3ecf2	Added configuration, PAT test strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 20:19:28 -07:00
snipe	5a1b8bc4b6	Fixed icheck checkbox class ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 20:19:19 -07:00
snipe	975b4dee2f	Added deleted header ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:58:17 -07:00
snipe	9ae7c66b77	Fixed indenting ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:50:21 -07:00
snipe	77ab4ac1b5	Fixed labels on radio buttons in custom report ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:48:41 -07:00
snipe	da1c1dbdd9	Added warning icon ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:19:08 -07:00
snipe	56b6904564	Added time difference ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:13:02 -07:00
snipe	10e64deafe	Updated method name in mail ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:12:44 -07:00
snipe	0a9bd07f20	Disallow checkout if qty = 0 ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 12:27:58 -07:00
snipe	8027039754	Hide requested assets if the user cannot see requestable items ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 11:48:45 -07:00
snipe	031b7998c9	Merge pull request #11603 from inietov/fixes/actions_on_licenses ... Use apropiate string for license actions	2022-08-02 10:40:20 -07:00
Ivan Nieto Vivanco	13053b85ef	Remove Actions button and pass the correct variable to the routes	2022-08-02 12:37:27 -05:00
snipe	e3b13143bf	Merge pull request #11594 from Godmartinz/adds_deleted_asset_options_to_custom_reports ... Adds options to include Deleted assets to custom asset reports	2022-08-02 10:33:57 -07:00
Godfrey M	e150ab58e9	reworded trans	2022-08-02 10:31:06 -07:00
Godfrey M	ff080a2d8f	replace checkboxes with radiobuttons	2022-08-02 10:27:55 -07:00
Ivan Nieto Vivanco	a63d00bb5c	Use apropiate string for license actions	2022-08-02 11:55:11 -05:00
snipe	e07532dd1b	Applied master fix to develop ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 18:55:28 -07:00
snipe	4133ac6ef0	Applied date formatter to Current Date output on location print assigned ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 18:47:29 -07:00
snipe	4834c33861	Missed a named route ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 18:43:54 -07:00
snipe	e79a819724	Fixed inconsistency in naming ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 17:45:39 -07:00
snipe	af7ccf3beb	Handle logout route names ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 16:17:40 -07:00
snipe	3e48f436af	Handled user route names ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 16:13:30 -07:00
snipe	5e488bd81f	Handle components route names ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 16:10:39 -07:00
snipe	53ff28d2b0	Handle consumables route names ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 16:07:56 -07:00
snipe	4a4636bd03	Handle accessories route names ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 16:06:28 -07:00
snipe	744d0d299e	Handle model route names ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 16:03:45 -07:00
snipe	b035003546	Handled hardware route names ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 15:59:54 -07:00
Godfrey M	842dafefec	adds options to include Deleted assets to custom asset reports	2022-08-01 14:52:12 -07:00
snipe	a51b446a10	Merge pull request #11578 from snipe/fixes/conditionally_add_nbsp ... Switched to conditionally adding the nbsp; that the table needs for proper layout if cell is empty	2022-08-01 14:07:50 -07:00
snipe	8b30992a11	Added bulk edit to company view ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 14:06:18 -07:00
snipe	33de45d8fb	Swirtched to conditionally adding the nbsp; that the table needs for proper layout if cell is empty ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-29 00:57:20 -07:00
snipe	c5530104ff	Fixed #11549 - dark skin dropdowbn menu fixes ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-22 15:36:51 -07:00
snipe	a1fe2a8d58	Fixed translation reference ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-20 18:01:55 -07:00
snipe	25cc46e416	Fixed button string ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-20 18:01:41 -07:00
snipe	458d61fafe	Front-end updates for checkin without delete ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-20 17:57:39 -07:00
snipe	32010d5387	Updated language strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-20 17:57:27 -07:00
snipe	b7c7e6c623	Added/updated language strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-20 17:56:58 -07:00
snipe	f0a9de72b1	Use icheckbox formatting on BOM and archived checkboxes ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-18 12:12:22 -07:00
snipe	58499c2322	Fixed #11508 - font size in alert menu ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-15 17:09:17 -07:00
snipe	0ccd7e09de	Merge pull request #11488 from Godmartinz/feature/sc-19107/add-box-to-custom-reports-to-not-include ... adds a checkbox to exclude archived assets from custom reports	2022-07-12 12:59:18 -07:00
mikeroq	5efe45226d	Fixes Email List of All Assigned being "successful" when the user has no email ... Added check in view to disable button if there is no email Added translation for title on disabled button and for email check in controller Fixed missing trans for user not found message	2022-07-11 20:02:10 -05:00
snipe	8114d01799	Only show sig file if there is a value for accepted sig ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-11 14:46:45 -07:00
Godfrey M	75844c5942	adds a checkbox to exclude archived assets from custom reports	2022-07-11 09:56:58 -07:00
mikeroq	397e89cbed	Fixes modal showing entire model data instead of just the name	2022-07-09 14:09:40 -05:00
snipe	723454b04d	Changed model file icon ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-07 16:17:35 -07:00
snipe	9c86b4bf88	Fixes padlock icon ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-07 15:57:33 -07:00
snipe	bae9792f01	Missed two ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-07 14:36:09 -07:00
snipe	b98af0f50f	Upgrade font-awesome to v6 ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-07 14:22:08 -07:00
snipe	bfc8c18675	Merge pull request #11451 from mikeroq/fixes/populate_custom_fields_from_asset_model_create ... Fixes custom fields not populating when creating asset from asset model page	2022-07-05 17:31:08 -07:00
snipe	ef17fd41f7	Merge branch 'develop' into develop	2022-07-05 16:26:53 -07:00
snipe	dae53a1128	Updated translations ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-05 16:18:53 -07:00
mikeroq	2781bd02b5	Add TODO to indicate future refactoring.	2022-07-05 18:02:37 -05:00
Daniel Reeder	7772ef22db	Quick typo fix	2022-07-04 21:57:54 +00:00
snipe	afab167e8c	Fixed restore button in listings ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-02 13:08:46 -07:00
snipe	af14ee0d47	Merge pull request #11453 from mikeroq/fixes/asset_restore_not_working ... Fixes #11452 - Asset Restore routes/buttons also asset models/users restore as well	2022-07-02 13:07:29 -07:00
Mike Roquemore	07ac4087a3	Remove link from alert since there is already a restore button on the side	2022-07-02 14:34:22 -05:00
Mike Roquemore	123963c14c	Modify genericActionsFormatter restore link to be a button instead since it's in a form. ... Changed user restore route to POST	2022-07-02 14:34:22 -05:00
Mike Roquemore	1b45170ca3	Adds check if request has model_id, if so call fetchCustomFields on document ready	2022-07-01 20:15:11 -05:00
snipe	b910db0617	Fixed #11393 - reject acceptance if no file is present ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-30 21:01:58 -07:00
snipe	df1e2687d6	Updated languages ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-30 17:35:02 -07:00
snipe	46d055cf74	Fixed weird extra padding on crown ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-30 14:17:53 -07:00
Godfrey M	fc636ea888	removed redundant header	2022-06-29 12:01:56 -07:00
Godfrey M	e471aa8639	adds button to email user list of assets from profile	2022-06-29 11:15:15 -07:00
snipe	5b02d9ed06	Merge branch '9813-duplicate-accept-asset' of https://github.com/dampfklon/snipe-it into dampfklon-9813-duplicate-accept-asset ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # resources/views/account/accept/create.blade.php	2022-06-29 04:58:13 -07:00
snipe	be9e6fe847	Another typo ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-29 00:24:33 -07:00
snipe	b0e13611f7	Fixed typo ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-29 00:24:08 -07:00
snipe	f3075facb4	Added delete button ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 16:25:22 -07:00
snipe	ed95adb45c	Show model files on hardware page ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 16:17:46 -07:00
snipe	95d4f7c62e	Added models router to BS tables ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 15:56:18 -07:00
snipe	c90ed9f25f	Allow models uploads ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 15:50:07 -07:00
snipe	7f664a7971	Layout changes for file upload ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 12:32:12 -07:00
snipe	4a3f56acf2	Removed old cooke stuff ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-27 16:35:54 -07:00
snipe	e33a4c2ef2	Added disclosure arrows to use screen ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-27 16:35:44 -07:00
Brady Wetherington	34b4499178	Remember the state of the disclosure triangles in Assets	2022-06-27 12:57:19 -07:00
snipe	8f900fb4e1	More UI tweaks ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-27 12:15:11 -07:00
snipe	9355689dd4	Nicer output for custom fields error ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-27 11:52:51 -07:00
snipe	0909feaa6b	Few more UI tweaks ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-27 11:01:19 -07:00
snipe	7f18180105	Fixed toggle ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-27 10:26:37 -07:00
snipe	08525a3c20	Few more changes ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-27 09:43:32 -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
snipe	8c85d7bc97	Merge pull request #11370 from inietov/fixes/customfields_default_values_not_validating ... Adds validation to custom fields' default values	2022-06-24 18:11:16 -07:00
snipe	be0f0fc421	Merge pull request #11388 from snipe/features/disable_purge_in_env ... Disallow purge backup deletion by default and, enable via .env	2022-06-24 16:12:00 -07:00
Brady Wetherington	3b3f1a817e	Typo of 'general' was in the migration blade a few places	2022-06-24 16:00:15 -07:00
snipe	75d19d815d	Still show the purge button even if not allowed to avoid confusion ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-24 15:59:40 -07:00
snipe	fce4f0dc0e	Disable delete button if not allowed ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-24 15:49:07 -07:00
snipe	657039882c	Added purge and backup strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-24 15:48:46 -07:00
snipe	77bf28bcb6	Disallow purge ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 20:11:43 -07:00
snipe	ce2362459c	Layout tweak for search and back placement ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 19:30:52 -07:00
snipe	4e568bec8a	Moves the settings search box higher ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 19:25:30 -07:00
snipe	86d2c2b153	Small naming changes ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 19:11:59 -07:00
snipe	f0cc418965	Merge pull request #11383 from snipe/features/adds_user_id_to_users ... Added created_by to users	2022-06-23 18:48:42 -07:00
snipe	62ab867051	Fixed url param ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 18:43:10 -07:00
snipe	3e559044b2	Changed method and scope names ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 18:41:13 -07:00
snipe	75a631b91f	Merge pull request #11375 from Godmartinz/bootS_dropdown_menu_fix ... fixes dropdown column select font color in bootstrap tables	2022-06-23 18:31:36 -07:00
snipe	1c25057e42	Merge pull request #11379 from Godmartinz/license_acceptance_eula ... adds eula blade for licenses/consumables/components and fixes assigned_to for dom_pdf	2022-06-23 18:26:19 -07:00
snipe	590630e4e0	Merge pull request #11386 from snipe/fixes/default_skin_settings_colors ... Small fixes to default blue	2022-06-23 18:23:45 -07:00
snipe	35365882ac	Used new settings_button class in settings index ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 18:10:28 -07:00
snipe	ea254ccc04	Tweaked default @blue ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 18:10:14 -07:00
snipe	06d5b5f4b1	Small change to color in overrides ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 18:10:03 -07:00
snipe	2536b02ace	Fixed some colors on default skin ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 18:09:52 -07:00
snipe	6b8abb1511	Fixed missing archived tooltip ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 17:32:39 -07:00
snipe	e63183649a	Show admin in user view ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 17:17:48 -07:00
snipe	1a4579b770	Missed one ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 16:00:27 -07:00
snipe	398c77bfdc	Use new scope for additional tabs ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 15:37:39 -07:00
snipe	d45d322b54	Use scoped query for asset count ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 13:43:23 -07:00
Godfrey M	b0897a1fc9	adds acceptance for consumables and components	2022-06-23 11:52:35 -07:00
snipe	e2b1494511	Reordered and added xlsx to export list ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 11:18:59 -07:00
Godfrey M	df76e6eacf	adds eula blade for licenses and fixes assigned_to for dom_pdf	2022-06-23 11:15:15 -07:00
Godfrey M	541ae919d9	fixes dropdown column select font color in bootstrap tables	2022-06-23 09:38:44 -07:00
Ivan Nieto Vivanco	7976401aa2	Add error message when the default customfield values can't be validated	2022-06-22 22:17:05 -05:00
Ivan Nieto Vivanco	7e10abe605	Fix the date control in custom fields' default values form to show the selected date	2022-06-22 21:47:08 -05:00
Ivan Nieto Vivanco	afdf93ca63	Adds controls for custom fields of type date in the default value form	2022-06-22 21:37:11 -05:00
snipe	cae66753fb	Merge pull request #11323 from Godmartinz/bug/sc-19255/issues-with-black-light-sk ... fixes non-dark mode black theme	2022-06-22 15:47:55 -07:00
snipe	f0f37df76e	Added missing postal code from user view ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-22 12:18:57 -07:00
snipe	89c234b1c2	Merge pull request #11358 from snipe/fixes/missing_token_lang ... Fixed missing password.token string and checked for user existing before attempting to send reset email	2022-06-22 11:15:08 -07:00
snipe	a7a61a3620	Fixed #11351 - add link on asset view to order number ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-22 11:07:54 -07:00
snipe	d67afc3bd0	Merge pull request #11359 from uberbrady/dont_show_images_on_checkin_email_if_not_requested ... Fixes issue where asset images were showing up in checkin emails	2022-06-21 19:34:22 -07:00
Brady Wetherington	1156eea8af	Fixes issue where asset images were showing up in checkin emails	2022-06-21 19:11:16 -07:00
snipe	2f258a3e3d	Make the strings match ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 18:48:22 -07:00
snipe	1b6df232aa	Updated string ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 18:41:02 -07:00
snipe	de048e1009	Updated language ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 16:13:59 -07:00
snipe	68150d11b7	Make logo clickable ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 16:13:52 -07:00
snipe	d4c53945d9	Tweaked language ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 14:19:49 -07:00
snipe	21875100b6	Fixed missing password.token string and checked for user existing before trying to reset ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 14:15:38 -07:00
snipe	a111482217	Use number_format on badges ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-15 14:59:06 -07:00
snipe	b3605fa141	Merge remote-tracking branch 'origin/develop'	2022-06-15 11:39:16 -07:00
snipe	677e5a8cf1	Added tab badges to company detail view ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-15 11:37:44 -07:00
snipe	872600a7a7	Link company on license page ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-15 11:37:26 -07:00
Godfrey M	3a879bda4a	more adjustments	2022-06-15 11:08:42 -07:00
Godfrey M	a6852cf4d2	fixes non-dark mode black theme	2022-06-15 10:20:25 -07:00
snipe	5fe1078013	Squashed commit of the following: ... commit a011b07d99 Merge: b392ed269 6059e9e11 Author: snipe <snipe@snipe.net> Date: Tue Jun 14 17:52:50 2022 -0700 Merge pull request #11315 from snipe/features/adds_fullscreen_option_to_tables Added fullscreen option to tables commit b392ed269b Merge: 693043e64 e6d792bdf Author: snipe <snipe@snipe.net> Date: Tue Jun 14 17:52:41 2022 -0700 Merge pull request #11316 from snipe/fixes/smaller_padlock_on_table_header Tweaked CSS for smaller padlock commit 6059e9e119 Author: snipe <snipe@snipe.net> Date: Tue Jun 14 17:49:00 2022 -0700 Added fullscreen option to tables Signed-off-by: snipe <snipe@snipe.net> commit e6d792bdf7 Author: snipe <snipe@snipe.net> Date: Tue Jun 14 17:43:12 2022 -0700 Tweaked CSS for smaller padlock Signed-off-by: snipe <snipe@snipe.net> Signed-off-by: snipe <snipe@snipe.net>	2022-06-14 17:54:18 -07:00
snipe	a011b07d99	Merge pull request #11315 from snipe/features/adds_fullscreen_option_to_tables ... Added fullscreen option to tables	2022-06-14 17:52:50 -07:00
snipe	6059e9e119	Added fullscreen option to tables ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-14 17:49:00 -07:00
snipe	e6d792bdf7	Tweaked CSS for smaller padlock ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-14 17:43:12 -07:00
snipe	f16a4b6aef	Removed footer from show category ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-14 17:16:14 -07:00
snipe	693043e645	Merge pull request #11313 from snipe/fixes/nicer_suppliers_mfgs_ui ... Nicer suppliers and manufacturers UI	2022-06-14 17:14:53 -07:00
snipe	cc6a2f2d49	Use the Deja Vu font to be able to support cyrllic, etc ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-14 16:23:30 -07:00
snipe	bfec0059c5	Improved manufacturers UI ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-14 16:10:36 -07:00
snipe	aea9dd1de5	Improved suplpiers UI ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-14 16:06:56 -07:00
snipe	f1a63f25e7	Partialize and add data atributes to statuslabel bulk ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-14 12:50:26 -07:00
snipe	88dfdb7538	Fixed bug in uncheck ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-14 12:50:10 -07:00
snipe	9072f7c6c9	Added click-to-select to tables ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-14 12:49:50 -07:00
snipe	e8973f08b5	Added a back button ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-13 20:47:35 -07:00
snipe	dd9c9520fb	Correctly filter by category_id ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-13 20:42:21 -07:00
snipe	aec033d8d2	Use better phrasing for tab ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-13 20:33:37 -07:00
snipe	5496b62b33	Split categories into two tabs if the type = asset ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-13 20:30:50 -07:00
snipe	e393e2eb4b	Fixed issue in BS tables where uncheck-all then checking a few would not uncheck properly ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-13 20:30:35 -07:00
snipe	10781a6e4b	Use new bulk edit partial ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-13 20:29:17 -07:00
snipe	5a86004081	Created new models bulk edit partial ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-13 20:29:08 -07:00
snipe	d4a7811078	Merge pull request #11282 from Godmartinz/new_Yellow_skin ... redone none dark mode yellow skin	2022-06-13 19:48:24 -07:00
snipe	cb8dbcc172	Merge pull request #11281 from Godmartinz/chore_dark_mode_color_clean_up ... cleans up dark modes	2022-06-13 19:48:15 -07:00
snipe	495e68d23c	Merge pull request #11258 from Godmartinz/bug/sc-19123/link-colors-slightly-different-settings ... Fixed colors in light color skins	2022-06-13 19:48:05 -07:00
snipe	20a0c4e3b5	Merge pull request #11272 from inietov/fixes/date_localization_in_customfields ... Fixes #8143 Date localization not working on custom fields	2022-06-13 19:47:20 -07:00
snipe	bcb9804be8	Added a little more context to mail template ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-13 19:44:18 -07:00
snipe	5e59fa2598	Default to $snipeSettings->site_name ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-13 19:29:46 -07:00
snipe	6ea722d41e	Merge pull request #11271 from inietov/fixes/bulk_delete_not_checking_assignedto_type ... Fix typo in language files	2022-06-13 19:24:08 -07:00
snipe	93e4d23143	Changed font-awesome leading class ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-13 18:36:13 -07:00
Godfrey M	b3559ac74e	redone none dark mode yellow skin	2022-06-08 13:59:46 -07:00
Godfrey M	4252bd2348	cleans up dark modes	2022-06-08 13:17:16 -07:00
Godfrey M	c8bc0eff11	fixes translation references in the users ldap blade	2022-06-08 09:52:55 -07:00
snipe	063893c109	Added new JS data attributes for assets in manufacturers ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-08 04:18:05 -07:00
Ivan Nieto Vivanco	44f4f20187	Only fix typo in 'en' file	2022-06-07 19:09:59 -05:00
Ivan Nieto Vivanco	792b18f845	Return language files to previous state	2022-06-07 19:09:03 -05:00
Ivan Nieto Vivanco	d2fc27e21d	Add formatted date to EOL field in asset detailed view	2022-06-07 18:22:09 -05:00
Ivan Nieto Vivanco	740f27198f	Evaluate if a custom field is a Date to present it with the correct format	2022-06-07 18:00:46 -05:00
Ivan Nieto Vivanco	064f4b3fc6	Fix typo in language files	2022-06-07 16:30:18 -05:00
Godfrey M	8c1843b351	updates colors in light color modes	2022-06-06 11:40:57 -07:00
snipe	c9e86ac194	Merge remote-tracking branch 'origin/develop'	2022-06-06 10:23:37 -07:00
snipe	f7449921e9	Merge pull request #11253 from snipe/features/nicer_locations_ui ... Nicer locations UI	2022-06-06 10:23:04 -07:00
snipe	5f79534f4a	Merge remote-tracking branch 'origin/develop'	2022-06-05 22:44:53 -07:00
snipe	01348187c8	Fixed #11224 - only show menu options if the user is allowed ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-05 22:41:53 -07:00
snipe	b26a4ad333	Added missing headers ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-05 21:35:57 -07:00
snipe	89f45d3d05	Removed extra console logs and unused variable ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-05 21:16:29 -07:00
snipe	e83a062eda	Use translation string for model editing ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-05 21:11:50 -07:00
snipe	1ea667e709	Update views with additional data fields ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-05 21:03:56 -07:00
snipe	5326ebd136	Removed toolbar div we weren’t using ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-05 21:03:45 -07:00
snipe	4db9892f8c	Use partial in overdue audit screen ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-05 21:03:12 -07:00
snipe	880828379e	Update bulki partials with new values ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-05 21:02:51 -07:00
snipe	9b54077409	Additional tweaks to BS tables partial ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-05 21:02:19 -07:00
snipe	9f478b51e2	Additional JS tweaking ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-05 20:13:51 -07:00
snipe	7c77e03c5a	Initial rework of locations display ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-05 18:08:15 -07:00
snipe	5bc5e9f108	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # resources/lang/en/admin/locations/general.php	2022-06-05 17:14:31 -07:00
snipe	985e683896	Small display improvements ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-05 16:59:53 -07:00
snipe	514db05770	Merge remote-tracking branch 'origin/develop'	2022-06-03 13:29:04 -07:00
snipe	7ca617f077	Merge pull request #11246 from snipe/fixes/clearer_placeholder_text_for_ldap ... Added explicit “Example:” text in placeholders	2022-06-03 13:28:40 -07:00
snipe	8f5ac5fb55	Removed quotes around filter query ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-03 13:01:53 -07:00
snipe	54f828743e	Merge remote-tracking branch 'origin/develop'	2022-06-03 12:54:13 -07:00
snipe	f519fb747f	Merge pull request #11248 from snipe/fixes/corrected_gate_on_assetmodels ... Updated Asset Model gate to correctly display the button on view	2022-06-03 12:53:52 -07:00
snipe	36f714e414	Updated Asset Model gate to correctly display the button on view ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-03 12:52:53 -07:00
snipe	3071a83ae0	Added the validation strings for user creation password options ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-03 12:00:56 -07:00
snipe	1c4864a3cc	Added explicit “Example:” text in placeholders ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-03 11:25:18 -07:00
snipe	eebc56d54b	Merge remote-tracking branch 'origin/develop'	2022-06-02 16:33:04 -07:00
snipe	4e03ebe284	Don’t use the formatted date for diff days in audit report ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-02 16:30:26 -07:00
snipe	7577fc61e4	Merge pull request #11235 from Godmartinz/gh_5644-checkout_history_for_accessories ... fixed issue with misplaced div	2022-06-01 17:03:23 -07:00
Godfrey M	d302675056	fixed a div placement	2022-06-01 16:58:29 -07:00
Godfrey M	5316f41eba	fixed a div placement	2022-06-01 16:56:01 -07:00
snipe	fa6c463d46	Merge pull request #11046 from Godmartinz/gh_5644-checkout_history_for_accessories ... Added history tab to accessories	2022-06-01 12:46:38 -07:00
snipe	23a441e7c8	Merge remote-tracking branch 'origin/develop'	2022-06-01 10:27:50 -07:00
snipe	1dbc1f4aa2	Fixed #11232 - missing closing div ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-01 10:26:26 -07:00
Achmad Fienan Rahardianto	fe65de1207	implements cookie to maintain display preference	2022-06-01 11:54:05 +07:00
snipe	089704c4f9	Merge remote-tracking branch 'origin/develop'	2022-05-31 14:17:23 -07:00
Ivan Nieto Vivanco	3e44f39f4d	Set the new File column as not visible by default	2022-05-25 19:19:25 -05:00
Ivan Nieto Vivanco	f208869aff	Add column to show filenames in Activity Report if the log action is 'uploaded'	2022-05-25 18:50:32 -05:00
snipe	2db6cf85a7	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php	2022-05-24 15:10:46 -07:00
snipe	5be7dee3d3	Updated language strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-24 15:07:14 -07:00
snipe	d8a8e03bf6	Nicer styling ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-24 14:39:01 -07:00
snipe	a243823e5e	Merge pull request #11190 from inietov/fixes/requested_assets_models_workflow ... Adjust requested assets and models workflow a little bit.	2022-05-24 14:31:40 -07:00
Ivan Nieto Vivanco	a4cf601c98	Remove extra tag and other stylistic changes	2022-05-24 16:27:55 -05:00
Ivan Nieto Vivanco	1e3c0d597e	Use @can view directive instead of @if superadmin	2022-05-24 15:53:26 -05:00
snipe	91822d2e45	Use shorter helper config method ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-24 13:26:29 -07:00
snipe	5d83516659	Fixed typoe on maintenance screen ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-24 13:15:01 -07:00
snipe	67616dbcf4	Updated language strings from activated to able to login ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-24 13:12:02 -07:00
snipe	4839985f38	Added forced space after admin/superadmin badge ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-24 12:59:36 -07:00
Ivan Nieto Vivanco	aa841a4674	Check permission before show links or not in requestable asset models view	2022-05-24 14:40:32 -05:00
Ivan Nieto Vivanco	6d1de73cad	Fixes some html structure in the requested assets view	2022-05-24 14:06:05 -05:00
Ivan Nieto Vivanco	0a6626891e	Add links to requestable Models' name	2022-05-24 13:36:13 -05:00
snipe	64eafb062e	Fixed bug where username wasn’t showing for regular users ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-24 10:48:02 -07:00
snipe	e34ea32a5e	Fixed translation styring reference ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-23 20:15:22 -07:00
snipe	8333089278	Merge pull request #11172 from snipe/rebased_added_gitkeep_to_to_eula_pdfs ... Accept asset/accessory improvements and fixes	2022-05-23 12:59:01 -07:00
snipe	70344cc02e	Merge pull request #11149 from Godmartinz/gh11129_setting_disclosure_arrow ... Fixed #11129 - settings treeview won't stay active.	2022-05-23 12:55:11 -07:00
Godfrey M	4adb990a5d	removed line breaks and deadspace	2022-05-23 09:37:20 -07:00
Godfrey M	160a147a58	removed line breaks and deadspace	2022-05-23 09:35:19 -07:00
snipe	bd384d3f10	Small formatting fixes ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	f439970e7a	Fixed typo ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	a37a576ee5	FIxed translation string ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	2bd0679a81	A few more tweaks to PDFs ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	8c64e7359a	Added signature column, removed stored_eula_file column ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	14495cd1da	Nicer PDF display ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	8449b5ca1e	Merge pull request #11160 from uberbrady/improve_default_custom_field_value_on_asset_create ... Fixed: #11098 - Smartly overwrite fields with default values for custom fields	2022-05-18 16:12:12 -07:00
Brady Wetherington	e4b24e17f3	Improve comments because the logic is complicated and unintuitive	2022-05-18 16:06:39 -07:00
Brady Wetherington	981741062b	Try to intelligently overwrite fields with default values for custom field	2022-05-18 15:51:32 -07:00
snipe	a55adfc0a1	Merge pull request #11152 from Godmartinz/link_inconsistentcies ... Thanks!	2022-05-18 15:45:30 -07:00
snipe	891009dc67	Nicer formatting for buttons in bulk user edit ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-18 15:35:57 -07:00
Godfrey M	ab23e04c65	re-adds Request::is to setting categories	2022-05-18 14:33:41 -07:00
Godfrey M	877b1bd0a3	re-adds Request::is to setting categories	2022-05-18 14:31:03 -07:00
Godfrey M	eaeb74c576	readded comment	2022-05-18 13:13:38 -07:00
Godfrey M	23891054dc	removed dead space and unused namespace	2022-05-18 13:11:20 -07:00
Godfrey M	cfc4c58da3	fixes the Settings Tree menu to remain active when opened	2022-05-18 13:06:06 -07:00
Godfrey M	0ed59753da	updated less files for license details to adhere to dark skin themes	2022-05-18 10:55:57 -07:00
Godfrey M	75f5f3a0a8	fixes inconsistencies with links styling	2022-05-18 09:37:53 -07:00
Godfrey M	07679aa376	settings treeview won't stay active. still experimenting with potential solutions	2022-05-18 08:40:37 -07:00
snipe	4078e4e323	Added spinner onClick for file upload button on backups ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-18 02:40:32 -07:00
snipe	ceffbb950f	Fixed #11120 - custom fields not showing when textarea is present as field type ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-18 00:47:22 -07:00
snipe	0f9559c1ff	Fixed #11124 - updated maintenance page ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-17 19:01:37 -07:00
Travers Carter	1fc0adf7b7	Fixed #11126: don't entitise custom CSS on the labels view	2022-05-18 00:16:18 +10:00
snipe	a973c0626e	Merge pull request #11114 from uberbrady/bad_header_label_for_size_in_backups ... We inadvertently used the wrong label for one of the headers	2022-05-16 17:02:31 -07:00
Brady Wetherington	213d990e47	We inadvertently used the wrong label for one of the headers on the backups page	2022-05-16 17:00:22 -07:00
snipe	925529923a	Fixed #11112 - use correct formatter for locations on dashboard ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-16 16:50:47 -07:00
snipe	ed8e82a606	Removed sr-only class for now - not sure why it’s interfering with the submit button JS ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-14 11:02:02 -07:00
snipe	8eed01bfa4	Merge pull request #11078 from snipe/fixes/show_encrypted_on_custom_field_view ... Adds encrypted status to custom fields overview	2022-05-14 10:25:45 -07:00
snipe	5030c7e5ff	Added missing backups help string ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-14 10:24:03 -07:00
snipe	91fb27ee00	Adds encrypted status to custom fields overview ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-14 10:20:04 -07:00
snipe	5f1f6baee9	Fixed unrelated typo ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-14 10:19:12 -07:00
snipe	3fe0e04d52	Fix roite for people file deletion ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-14 08:25:22 -07:00
snipe	3a31104b5c	Fixed #11052 - add file sizes to upload displays ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 19:33:14 -07:00
Brady Wetherington	b6284e6651	Fix 'cancel' button in two-factor screen	2022-05-13 14:49:37 -07:00
snipe	d8a4509b22	Fix logout on 2fa ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 14:36:20 -07:00
snipe	c0868a68fb	Removed console.log cruft ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 13:44:38 -07:00
snipe	eccc5e7cf0	Make logout a post on 2FA cancel ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 13:35:13 -07:00
snipe	b36bfad0ca	Set maxlength on password confirmation form element ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 05:27:47 -07:00
snipe	6b27c0311d	Updated help text on groups for more info on deselecting ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 05:23:12 -07:00
snipe	93454decec	Fixed broken quotes ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 05:14:53 -07:00
snipe	deb2d958d8	Sets maxlength of user fields to 191 ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 04:54:12 -07:00
snipe	714f6d80f2	Merge pull request #11059 from Godmartinz/feature/sc-19017/change-bootstrap-tables-export-to-be-landscape ... Bootstrap tables export as landscape	2022-05-12 09:28:47 -07:00
Godfrey M	54f5e268a0	removed change from tableExport.js	2022-05-12 09:20:19 -07:00
Godfrey M	83d0743ab8	saves bootstrap pdf tables in landscape	2022-05-12 09:18:44 -07:00
snipe	91cc08d3fb	Merge pull request #11050 from uberbrady/fix_encrypted_textareas ... Make sure to decrypt Textareas as well as input type=text	2022-05-11 19:03:02 -07:00
Godfrey M	8ebe64e630	fixes final visual issue	2022-05-11 12:13:36 -07:00
Brady Wetherington	e3696ff84c	Make sure to decrypt Textareas as well as input type=text	2022-05-10 18:39:03 -07:00
snipe	446e44deb6	Merge pull request #11048 from Godmartinz/bug/sc-18989/purchase-cost-can-be-negative ... Fixed validation for purchase cost allowed to be negative	2022-05-10 17:36:01 -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
Godfrey M	33b1ab3658	prevents values for assets being negative through validation	2022-05-10 16:19:06 -07:00
Godfrey M	c07a244bab	fixes 1/2 visual issues, adds history tab to accessories	2022-05-10 11:20:42 -07:00
snipe	d5edb0908b	Added translation string to the correct file this time ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 14:07:05 -07:00
snipe	89fee23d32	Commented out console log that was pooping up the joint ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 08:34:30 -07:00
snipe	2982d78899	Added translation for no assets selected ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:42:02 -07:00
snipe	304cd75af5	Fixed extra divs ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:20:44 -07:00
snipe	59a0f4722b	Use partial for asset bulk edit ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:20:35 -07:00
snipe	418a797e7e	Use partial for asset bulk edit ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:20:29 -07:00
snipe	0c20543c49	Remove conflicting toolbar call in model listing ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:15:58 -07:00
snipe	fe98e505fe	Use the new partial for bulk asset edit ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:15:31 -07:00
snipe	78a9c16761	Minor formatting improvements ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:15:10 -07:00
snipe	c4bf0045c8	Fixed stray < tag ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:14:55 -07:00
snipe	c64f34ebcc	Check the "do not change” radio button by default ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:14:31 -07:00
snipe	cf0548bd1f	Create a new partial for asset bulk actions ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:11:52 -07:00
snipe	caef98d36d	Patched #11025 to develop ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 02:06:12 -07:00
snipe	fba731ac1c	Missed a few hard coded english strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 02:01:17 -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	39ee825ba2	Fixed html lang specification ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 01:32:20 -07:00
snipe	c0e9393092	Fixed #10890 - use translation strings in user asset printout ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 01:30:58 -07:00
snipe	3a415b2fce	Use full app_url in favicon paths ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 00:19:32 -07:00
snipe	5370c2ca42	Merge pull request #10941 from Godmartinz/gh8856_signature_not_showing_in_print_all ... [Fix] changes the query for the accept signature on print blade	2022-05-05 13:32:37 -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
snipe	c01f0880ef	Changed language string ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-05 10:52:57 -07:00
Johnson Yi	281c6df7b3	Customize login page when REQUIRE_SAML is enabled	2022-04-29 15:35:40 +00:00
snipe	edab4e1371	Uses str_slug for filename for JS export (like we do elsewhere) ... Signed-off-by: snipe <snipe@snipe.net>	2022-04-28 21:55:26 +01: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
Achmad Fienan Rahardianto	dafe353050	Implements #8155 to improve the workflow during asset creation ... - adding 2 options to hide optional information	2022-04-23 14:41:38 +07:00
Godfrey M	380cb38b7d	changes the query for the accept signature on print blade	2022-04-14 17:17:28 -07:00
snipe	5fba8202d6	Updated translations ... Signed-off-by: snipe <snipe@snipe.net>	2022-04-11 15:40:58 +01:00
Brady Wetherington	4db7cb0e21	This disables the display of HTML content during exports, without enabling XSS attacks	2022-04-07 16:37:32 +01:00
Brady Wetherington	5a776af091	This disables the display of HTML content during exports, without enabling XSS attacks	2022-04-07 16:27:06 +01:00
snipe	01342ca266	Fixed activity report ... Signed-off-by: snipe <snipe@snipe.net>	2022-04-05 22:58:25 +01:00
snipe	8195a664a9	Merge pull request #10883 from inietov/fixes/update_existing_value_import_develop ... Fixes Importer always update existing values develop	2022-04-05 21:11:24 +01:00
Brady Wetherington	6756dd193e	SCIM integration using the 're-do-the routes' approach, which seems like a dead-end ... Cleaning up routes to match laravel-scim-server's recommended implementation Some actually *working* changes for SCIM support?! Whoops, forgot my route file Fix public SCIM routes Removed Ziggy, removed old generated file, yanked Ziggy references Resolves the first set of comments for SCIM Ensure all /api routes have baseUrl prepended Fix the parent:: call to be, uh, actually correct :P Clarify the route-ordering, as it is quite tricky This gets it so that users can actually be saved.. Work around the lack of callbacks with some inheritance Mapped a bunch more fields from SCIM into Snipe-IT's user table More baseUrl shenanigans since we yanked Ziggy :/ Properly map job title and work with some other necessary attributes Map more fields... Finalized basic mapping for core and enterprise namespaces Latest tuned settings for SCIM config to work with Azure (and others)	2022-04-05 20:26:37 +01:00
Ivan Nieto Vivanco	2d213a9c77	Make the report take the dates of pivot table instead of asset log	2022-04-05 12:57:49 -05:00
snipe	08588a2e6a	Merge pull request #10901 from veenone/fix/invalid_consumable_date_in_user_view ... Fixes #10898 (invalid consumable date time info in user view)	2022-04-05 18:30:23 +01:00
Achmad Fienan Rahardianto	231a34ace3	FIX: #10898 (invalid consumable date time info in user view)	2022-04-05 15:31:27 +07:00
Ivan Nieto Vivanco	1a448cc4b6	Take the values from the importer form to configure the used importer	2022-03-29 17:31:43 -06:00
snipe	8ccf148799	Fixed #10881 - bad merge with bootstrap-tables changes ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-29 22:57:00 +01:00
snipe	b2056816c9	Use the same string for both radio buttons in bulk user edit ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-29 16:45:55 +01: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	bdabbbd4e9	Logout user when their activated status is switched to off ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-29 13:44:53 +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
Brady Wetherington	e50ad8a442	Don't crash JS when there are no data-export-options (as is true in Dashboard)	2022-03-27 07:18:12 +01: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
snipe	729b23c0cf	Merge pull request #10857 from uberbrady/fix_bs_tables_export_options ... Fix bs tables export options	2022-03-22 17:03:18 +00:00
Brady Wetherington	af9f3d5e1e	Clean up the bootstrap table export options	2022-03-22 16:05:08 +00:00
Brady Wetherington	00ca30a205	WIP: fix bootstrap table export options	2022-03-22 15:12:11 +00:00
Ivan Nieto Vivanco	7571c0b850	Add support for boolean type customfields	2022-03-21 18:48:42 -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	760b78b584	Fixed #10819 - use full url for label barcodes ... I don’t know when/why this would really be necessary, since it would be weird to call /hardware/123/label, but this fixes the broken barcodes Signed-off-by: snipe <snipe@snipe.net>	2022-03-21 13:57:18 +00:00
snipe	42220cc566	Merge pull request #10809 from inietov/fixes/customfields_boolean_format_not_saving ... Fixes Customfields with boolean format not saving [ch-9973]	2022-03-19 22:10:54 +00:00
Ivan Nieto Vivanco	6ed9ed0e79	Add field type boolean to custom fields list all	2022-03-16 17:21:05 -06:00
Godfrey M	b2e78e3382	formats most of the pdf blade	2022-03-16 15:53:32 -07: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	781b426018	Fixed #10826 - parse error on translation string for print all assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-16 08:50:47 -07:00
snipe	54d6a4d978	Fixed #10825 - selectlists in modals b0rked ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-16 08:23:50 -07:00
Godfrey M	b2f7262cd2	adds table structure for asset history	2022-03-14 19:38:36 -07:00
Dampfklon	29e1d657e3	fix missed rename	2022-03-11 21:33:25 +01:00
snipe	84aa26dd50	Merge pull request #10728 from Godmartinz/gh10191-css-dropdownmenu ... Fixed #10191 - font color contrast on mobile menu	2022-03-10 13:02:45 -08: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
Ivan Nieto Vivanco	86bd90c564	Show icons in the asset view for boolean customfields	2022-03-09 21:46:19 -06:00
snipe	c817daa4da	Merge pull request #10767 from uberbrady/fix_double_request_datatable ... One attempt to fix the 'datatable double-request' problem.	2022-03-08 20:34:15 -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
Ivan Nieto Vivanco	657cfddd3c	Add a condition to show customfields as the user wants in localization settings	2022-03-08 18:28:13 -06:00
Ivan Nieto Vivanco	2410b1a146	Add a condition to show customfields as the user wants in localization settings	2022-03-08 18:25:15 -06:00
snipe	def570db4b	Finer grain for > 200 ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-07 18:51:49 -08:00
snipe	fcb81b9505	Use the max_results env value in the paginator ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-07 18:39:39 -08:00
Brady Wetherington	8d49d35463	Remove another data-toggle="table" - possibly the last one	2022-03-07 12:52:57 -08:00
Brady Wetherington	6f3e9033c2	One attempt to fix the 'datatable double-request' problem.	2022-03-07 12:52:57 -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	06a05e6340	Added remote to view ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 05:37:28 -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	a9069e65e5	Don’t show groups in menu if there are none yet ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 04:39:39 -08:00
snipe	1400c610a1	Use correct button translation ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 04:22:44 -08:00
snipe	0d787fcc94	Updated language files ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 22:21:44 -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	5266b2c71f	Added notes field to view blades ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 20:30:27 -08:00
Godfrey M	14bd07e97d	gerge branchevelop' into gh10191-css-dropdownmenu	2022-03-03 10:14:30 -08:00
Godfrey M	708dc08b4f	mixes color contrast on dropdown menu from navbar ... on file	2022-03-03 09:27:52 -08:00
snipe	dc1e0ecdb7	Merge pull request #10739 from insert-waffle/fixes/prevent_double_values_email ... Feature: Prevent showing of double values in a checkin or checkout email	2022-03-02 14:28:22 -08:00
Jens Maes	9b88f650d2	Prevents showing double values ... - If the asset name and tag are the same, the tag does not get shown in an email. - If the model name is the same as the model number (when importing from LanSweeper for example), do not show the model number.	2022-02-25 08:19:46 +01:00
snipe	d243b822e7	Merge pull request #10729 from insert-waffle/fix-10708 ... Fixes 10708: removed line height of manufacturer and changed size of fa-hdd to 2x	2022-02-24 14:46:51 -08:00
Ivan Nieto Vivanco	64fa7e23fc	Separate notes on assets and asset models	2022-02-24 16:05:03 -06:00
Ivan Nieto Vivanco	577dc6b02c	Separate notes on assets and asset models	2022-02-24 15:50:59 -06:00
Jens Maes	57e93e4e92	Fixes 10708: change size of fa-hdd to 2x	2022-02-24 11:05:40 +01:00
Jens Maes	c0893c44a3	Fixes 10708: Removed line heigt from manufacturer list item.	2022-02-24 10:29:39 +01: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	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
snipe	34ebc629c2	Remove unusued translation string ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-20 11:15:56 -08:00
snipe	eaf4fefc90	Merge pull request #10700 from insert-waffle/develop ... Fixes #10699: Added 2 breaks in message.blade.php	2022-02-20 11:12:20 -08:00
Jens Maes	e5f6b48115	🧑‍🔧 Added 2 breaks in message.blade.php ... The uploaded logo does not align properly, therefor I added 2 breaks which make sure the site title is BELOW the logo and not next to it.	2022-02-18 10:27:12 +01:00
Ivan Nieto Vivanco	f1ba5c7742	Changed the warning message in the Backups page	2022-02-17 22:47:35 -06: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	13832856f1	Added strings for unique ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 13:47:59 -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
Dampfklon	0d49fc3a2e	remove unused route, controller functions and view	2022-02-13 12:10:19 +01:00
Dampfklon	43d92bec5b	apply translation to view ... rearrange eula on top small design fixes	2022-02-13 12:02:20 +01:00
snipe	05c0819776	Updated language string ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-11 15:55:42 -08:00
snipe	99541f0bee	Fixed string ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-10 21:05:23 -08:00
snipe	8b8e93d703	Fixed #10659 - wrong translation string reference ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-10 21:03:09 -08:00
snipe	d406dc43c2	Check for valid user before trying to present the auditor name ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-10 20:13:02 -08:00
snipe	2ce44bd4e6	Line break for easier debugging ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-10 20:06:55 -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
Ivan Nieto Vivanco	413e44be2f	Add custom date to checkin actionlogs and show it in the history of the asset tab	2022-02-08 11:58:23 -06:00
Ivan Nieto Vivanco	d71aa859fc	Add custom date to checkin actionlogs and show it in the history of the asset tab	2022-02-08 11:43:24 -06:00
Ivan Nieto Vivanco	796a0ebdaa	Add initial support for default values in checkboxes customfields	2022-02-07 22:17:40 -06:00
Godfrey M	5a70bba51b	changed model for default currency requirement check	2022-02-07 09:51:35 -08:00
snipe	8add47739e	Merge pull request #10604 from inietov/fixes/column_activated_cannot_be_null ... Fixes: Column activated cannot be null [sc-18528]	2022-02-02 12:21:31 -08:00
snipe	c0cc90066f	Merge pull request #10605 from inietov/fixes/column_activated_cannot_be_null_develop ... Fixes: Column activated cannot be null for develop [sc-18528]	2022-02-02 12:16:39 -08:00
Ivan Nieto Vivanco	fa2f8409f9	Add a casting to a truthy/falsy that needs to be integer	2022-02-02 14:09:23 -06: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	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
snipe	2815e0d36e	Fixed audit email template (applies #10592 to master) ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-01 17:27:32 -08:00
Brady Wetherington	eaba560877	We had a markdown failure in the upcoming audits table, this fixes it.	2022-02-01 14:06:01 -08:00
snipe	16fb2213b5	Updated language strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-28 12:40:03 -08:00
snipe	a65fb63b6b	Merge pull request #10511 from inietov/features/audit_date_in_importer ... Adds audit dates in the asset importer	2022-01-27 10:58:53 -08:00
snipe	0eab249819	Merge pull request #10569 from inietov/fixes/donked_layout_required_field_error_depreciation_develop ... Fixes donked layout required field error depreciation in develop[sc-17111]	2022-01-27 10:57:33 -08:00
Ivan Nieto Vivanco	a87478d3ac	Set the actual field we are evaluating as required (months)	2022-01-26 23:02:27 -06:00
Ivan Nieto Vivanco	34819ec5cf	Fixes the appearance of some error messages	2022-01-26 23:00:52 -06:00
Ivan Nieto Vivanco	44349db597	Fixes the appearance of some error messages	2022-01-26 22:58:02 -06:00
snipe	b153138d1e	Merge pull request #10534 from inietov/feature/add_remaining_address_field_to_user_import_develop ... Add Zip field in the User Importer for develop [sc-18556]	2022-01-26 16:58:37 -08:00
Ivan Nieto Vivanco	7383ec7f1e	Add an early return if the model id is not set (for new Asset Models)	2022-01-21 11:45:45 -06:00
Ivan Nieto Vivanco	c86ed892ab	Add Zip field in the User Importer	2022-01-19 13:52:15 -06:00
Ivan Nieto Vivanco	1fc71a4111	Add Zip field in the User Importer	2022-01-19 13:35:54 -06:00
Ivan Nieto Vivanco	9ae03f21dc	Adds condition to only charge custom field's livewire when the model is updated	2022-01-15 12:14:34 -06:00
snipe	af2e407543	Normalize array format in en language to the new shitty way ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-13 21:30:35 -08:00
snipe	ddfa5776c5	Updated language strings ... This absolutely sucks. Something changed in CrowdIn or something else, which results in this push being *thousands* of files because someone somewhere decided that `return [];` was vastly inferior to `return array();` I'll try to fix it. :( FML Signed-off-by: snipe <snipe@snipe.net>	2022-01-13 21:27:29 -08:00
snipe	da47f62d17	Added strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-13 21:20:38 -08:00
Ivan Nieto Vivanco	949fe2a14a	Adds last_audit_date and next_audit_date in the asset importer	2022-01-13 15:14:20 -06:00
snipe	67ba8a6281	Removed extra spaces ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-12 23:18:39 -08:00
snipe	9368ddeaf0	Added badge count on requestable assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-12 23:17:54 -08:00
snipe	f206d4ed4e	Fixed double div in current purchase value ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-12 22:26:56 -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
snipe	df0da0f3bc	Fixed escaped string ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-12 11:20:31 -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	d9624b59b4	Merge pull request #10264 from nuraeil/added-localized-strings ... Added #10242: Improved localized strings	2022-01-10 14:48:52 -08:00
snipe	b98c97b00e	Merge pull request #10265 from uberbrady/remove_old_ldap ... Remove old ldap	2022-01-10 14:34:34 -08:00
snipe	b18b3812df	Back to master: Added some BS tables style overrides for mobile ... This repeats 06e8e826, which alone improves the mobile view immensely, on master.	2022-01-10 15:23:43 -06:00
Wächtler, Yannick	f906dbd81e	Added missed translation strings, fixed the column width for the date selector (too small in certain languages)	2022-01-10 09:21:23 +01:00
Nuraeil	5bb2f6fa0f	Merge branch 'develop' into added-localized-strings	2022-01-09 17:40:54 +01:00
Wächtler, Yannick	b77e7f88d4	fix(bootstrap-table): adds locale env to table init, adds bootstrap-table-locale-all to webpack-mix	2022-01-09 17:35:28 +01:00
snipe	0f5bb0e65d	Localize bakcup restore strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-07 16:50:19 -08:00
Wächtler, Yannick	c3ab4c7512	Fixed the tables not displaying the correct language	2022-01-06 14:29:10 +01: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
Nuraeil	271c364ef8	Merge pull request #9 from snipe/develop ... Merge snipe/snipe-it:develop into nuraeil/snipe-it:added-localized-strings	2022-01-04 10:48:51 +01: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
Alex Janes	5fe2083688	Adjusted the phrasing around auto-incrementing asset tags.	2021-12-31 16:33:30 -05:00
snipe	8be6d10dbe	Fixed #10467 - Safari only font-awesome bug ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-24 12:30:34 -08:00
snipe	f4ef828332	Fixex js table export ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-24 11:17:36 -08:00
Alex Janes	ea93f82bde	added the notes field to allow users to quickly add notes to multiple checkins at once	2021-12-23 17:37:48 -05:00
snipe	312200bf44	Removed duplicate "department" entry in importer, pulls #10460 to master ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-21 13:37:20 -08:00
Ivan Nieto Vivanco	e03a8cc721	Delete an extra entry for Departments when importing Users via GUI	2021-12-21 14:42:51 -06:00
Alex Janes	2e5820e29d	small phrase change	2021-12-20 23:31:10 -05:00
Alex Janes	b01a4468c7	refactored from bulkcheckin to quickscancheckin	2021-12-20 23:27:36 -05:00
snipe	48d3bfef03	Merge pull request #10421 from Robert-Azelis/patch-5 ... Create new user account from asset form - additional fields	2021-12-20 17:05:38 -08:00
Alex Janes	55b8d080b9	more lang changes	2021-12-20 19:39:06 -05:00
Alex Janes	fcc9815c6e	Revert "Added phrase to all language files to prevent errors (translation still needs to happen)" ... This reverts commit 87ef37b0b4.	2021-12-20 18:05:21 -05:00
Alex Janes	cb14abfc54	Revert "fixed zh-CN file format" ... This reverts commit 20f66a1b55.	2021-12-20 18:05:09 -05:00
Alex Janes	3841c3560b	changed a page title	2021-12-20 16:52:00 -05:00
Alex Janes	20f66a1b55	fixed zh-CN file format	2021-12-20 14:05:13 -05:00
Alex Janes	08cb8c354b	more cleanup to fit formatting convention	2021-12-19 19:11:24 -05:00
Alex Janes	87ef37b0b4	Added phrase to all language files to prevent errors (translation still needs to happen)	2021-12-19 18:50:55 -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	ead142cdf7	Corrected a tiny HTML typo in the SAML view. (Unrelated to this PR)	2021-12-18 12:00:07 -05:00
Alex Janes	227ca61301	Changed phrasing of "SAML Force Login" to "SAML Default Login" (English only at this point)	2021-12-18 11:56:36 -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
snipe	4ca2252e3b	Switches GET to POST for request assset ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-16 20:32:29 -08:00
Wächtler, Yannick	2901525194	Merge branch 'snipe-develop' into added-localized-strings	2021-12-17 00:22:08 +01:00
Wächtler, Yannick	279fced877	merge	2021-12-17 00:14:36 +01: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
Nuraeil	c3b7576d99	Merge pull request #7 from snipe/develop ... Develop	2021-12-14 19:51:40 +01:00
Wächtler, Yannick	484b996879	fixed merge conflicts	2021-12-14 19:48:59 +01:00
snipe	52322806fa	Merge pull request #10434 from inietov/fixes/v6_components_error ... Fix route to checkout components from the details page	2021-12-14 10:41:24 -08:00
Wächtler, Yannick	4397a12efc	Merge branch 'develop' of https://github.com/snipe/snipe-it into snipe-develop	2021-12-14 19:37:27 +01:00
Ivan Nieto Vivanco	d083f89f30	Delete extra character remaining from previous tests :(	2021-12-14 12:32:30 -06:00