snipe-it

mirror of https://github.com/snipe/snipe-it.git synced 2024-11-16 02:24:09 -08:00

Author	SHA1	Message	Date
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
Ivan Nieto Vivanco	2402f00a2e	Fix route to checkout components from the details page	2021-12-14 12:26:46 -06:00
Ivan Nieto Vivanco	c80aa2a289	Add title column to custom reports	2021-12-14 12:05:33 -06:00
Ivan Nieto Vivanco	0037cdb00c	Add title column to custom reports	2021-12-13 20:27:23 -06:00
snipe	1854d7d668	Updated language strings Signed-off-by: snipe <snipe@snipe.net>	2021-12-13 11:28:01 -08:00
Robert-Azelis	01608d81ab	Update user.blade.php Create new user account from asset form - additional fields #10420	2021-12-13 09:22:25 +01:00
snipe	39b0dc136c	Added LDAP strings back Signed-off-by: snipe <snipe@snipe.net>	2021-12-11 10:14:35 -08:00
snipe	e1bf3b50f4	Added model number to accessory report Signed-off-by: snipe <snipe@snipe.net>	2021-12-10 15:09:29 -08:00
snipe	ff97b359ad	Removed form request on ajax, cleaned up some other things Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 17:58:46 -08:00
snipe	cde2bad297	Small mods to slack jquery Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 15:56:05 -08:00
snipe	713fbdc0a6	Merge pull request #10239 from Godmartinz/Adds-info-on-how-to-nullify-reorder-alerts adds info on how to nullify reorder alerts for consumables, component…	2021-12-08 14:26:22 -08:00
snipe	6d84482104	Merge pull request #10388 from snipe/features/switch_to_dusk WIP - Fixing unit tests, switching to dusk	2021-12-06 14:19:36 -08:00
snipe	0ba55e0eaf	Merge pull request #10393 from aranar-pro/fix/#10365-Total-Purchase Fixed #10365: Snipe-IT has a wrong total purchase cost when reaches m…	2021-12-06 14:08:24 -08:00
snipe	ebdbc20740	Adds stricter validation for slack endpoints Signed-off-by: snipe <snipe@snipe.net>	2021-12-06 11:40:24 -08:00
Andrew Roth	d1d3b84f77	Fixed #10365 : Snipe-IT has a wrong total purchase cost when reaches million. Fixed to remove multiple commas in +1M per item.	2021-12-06 13:06:23 -05:00
snipe	cae62fd4c7	Merge pull request #9902 from SidingsMedia/sum_cost_by_quantity Fixed #5676: Sum cost by quantity	2021-12-02 12:13:04 -08:00
snipe	d08c1787a1	First steps at getting dusk working Signed-off-by: snipe <snipe@snipe.net>	2021-11-30 20:09:29 -08:00
Nuraeil	d3972888dc	Merge pull request #6 from snipe/develop Develop	2021-11-30 06:37:17 +01:00
snipe	3b68a6f1be	Merge pull request #10345 from leitwerk-ag/master Fixed #10344 and #9135: don't prepand fields with a whitespace in text based export formats	2021-11-24 19:43:21 -08:00
snipe	4afd598df7	Merge pull request #10356 from bestlong/fix_modal_dialog_html_typo fix modal-title html tag unpaired.	2021-11-24 19:39:58 -08:00
Shao Yu-Lung	55d05eeae3	fix modal-title html tag unpaired.	2021-11-24 10:28:10 +08:00
Ivan Nieto Vivanco	d95d3dc282	Add the call to defaultValue() function in custom fields with date format	2021-11-23 17:21:46 -06:00
Ivan Nieto Vivanco	741eb28622	Add the call to defaultValue() function in custom fields with date format	2021-11-23 17:11:21 -06:00
Klaus J. Mueller	a85fa14f9c	fix #10344 and #9135	2021-11-22 17:58:26 +01:00
Matthew Nickson	9381ba2404	Merge branch 'develop' into sum_cost_by_quantity	2021-11-21 18:59:34 +00:00
Wächtler, Yannick	1b76185798	Added TODO: comments to pages, where there are non-localized strings, in order to keep track of them	2021-11-19 15:32:13 +01:00
Wächtler, Yannick	9164daf5bc	Added localized strings for admin/settings	2021-11-19 15:23:48 +01:00
Wächtler, Yannick	6917d59185	Added localized strings for reports	2021-11-19 12:39:19 +01:00
Wächtler, Yannick	04fec144a0	Added localization strings for partials, added file structure	2021-11-19 12:12:11 +01:00
Nuraeil	7084703b5a	Merge pull request #4 from snipe/develop Merge current develop into branch	2021-11-18 21:30:45 +01:00
Wächtler, Yannick	5a2f8788a9	Fixed merge issue in view.blade.php and added translatable string	2021-11-16 19:34:20 +01:00
Wächtler, Yannick	f2c3e51a83	Catching up to snipe-it/develop branch	2021-11-16 19:25:23 +01:00
Wächtler, Yannick	6feb39f6b9	Merge branch 'develop' of https://github.com/snipe/snipe-it into snipe-develop	2021-11-16 08:50:45 +01:00
snipe	bbb0d1be17	Possible fix for asset model editing when no custom fieldset is associated Signed-off-by: snipe <snipe@snipe.net>	2021-11-15 21:09:35 -08:00
snipe	65d1855b38	Display app_locked message on front-end Signed-off-by: snipe <snipe@snipe.net>	2021-11-15 19:50:55 -08:00
snipe	f2f8f96991	Merge remote-tracking branch 'origin/master' into develop Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # app/Http/Controllers/Api/AssetsController.php # app/Http/Transformers/AssetsTransformer.php # app/Importer/ConsumableImporter.php # app/Models/Consumable.php # config/version.php # package-lock.json # package.json # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/build/app.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/views/custom_fields/fieldsets/view.blade.php # resources/views/layouts/default.blade.php # routes/web.php # routes/web/fields.php	2021-11-15 19:24:38 -08:00
Ivan Nieto Vivanco	b07db3b324	Added the current_value string to correspondig 'en' language directory	2021-11-11 14:43:47 -06:00
snipe	bc21875324	More refinements to the UI Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 18:15:38 -08:00
snipe	1a703bf78b	Added logout clarification Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 17:59:52 -08:00
snipe	494c72d92b	Fixed typo Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 17:58:04 -08:00
snipe	69fe3c0299	Added some comments on the JS Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 17:57:15 -08:00
snipe	e2702186a9	Slightly reworked UI Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 17:48:59 -08:00
snipe	b069eec43a	Fixed upload disabled button Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 16:01:22 -08:00
snipe	f8cf65bbb3	Small layout fixes Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 13:01:02 -08:00
snipe	ec2a3b0f35	Updated label names Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 01:44:34 -08:00
snipe	230a568145	Added help text and more info in the modal Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 01:44:11 -08:00
snipe	856b9294f8	Improved BS tables on backups Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 00:08:43 -08:00
snipe	8590e5d67e	UNRELATED: fixed wrong html tag for license view badge count Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 00:08:15 -08:00
snipe	cf070866f0	INCOMPLETE: Added more generic language strings Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 00:07:47 -08:00
snipe	05c6254fdc	Updated snipeit.js with "restore" modal code Signed-off-by: snipe <snipe@snipe.net>	2021-11-09 22:39:33 -08:00
snipe	fb21712a68	Added restore modal HTML Signed-off-by: snipe <snipe@snipe.net>	2021-11-09 19:38:40 -08:00
Brady Wetherington	a58c5ce27f	Better documentation, disable AdLdap2-based "Add domain" setting	2021-11-08 17:11:47 -08:00
snipe	edf98cb795	Merge pull request #10279 from snipe/fixes/turn_get_into_post_for_custom_field_required Turn custom fields required/optional/remove into POST requests	2021-11-08 14:37:36 -08:00
snipe	38c36af6fc	Changes logout to POST Signed-off-by: snipe <snipe@snipe.net>	2021-11-08 12:53:11 -08:00
snipe	0d811d067c	Turn cusotm fields required/optional/remove into POST requests Signed-off-by: snipe <snipe@snipe.net>	2021-11-05 10:53:48 -07:00
Wächtler, Yannick	6b2801867d	Renamed account/api to account/general to match naming schema, changed the associated account/api trans() to account/general	2021-11-04 20:15:23 +01:00
Wächtler, Yannick	97030866e4	Adding newly added template files	2021-11-04 20:12:47 +01:00
Wächtler, Yannick	63b30489df	Added localized strings for notifications	2021-11-02 15:44:57 +01:00
Wächtler, Yannick	670b70c7e1	Added localized strings for models	2021-11-02 15:34:50 +01:00
Wächtler, Yannick	c0891e6827	Added localized strings for modals	2021-11-02 15:27:13 +01:00
Wächtler, Yannick	30d30490a3	Added localized strings for locations	2021-11-02 15:14:54 +01:00
Wächtler, Yannick	4af6412da6	Added localized strings for licenses	2021-11-02 14:55:49 +01:00
Wächtler, Yannick	4fcd4a930f	Added localized strings for layouts	2021-11-02 14:45:58 +01:00
Wächtler, Yannick	8bad9c5140	Added localized strings for kits	2021-11-02 14:25:21 +01:00
Wächtler, Yannick	26e056fb3c	Added localized strings for improter, added en structure	2021-11-02 14:09:22 +01:00
Wächtler, Yannick	c16ade2d87	Added localized strings for hardware	2021-11-02 14:02:48 +01:00
Wächtler, Yannick	167bf97d46	Added localized strings for groups	2021-11-02 12:03:41 +01:00
Wächtler, Yannick	e825fa81aa	Added localized strings for depreciations	2021-11-02 11:50:56 +01:00
Wächtler, Yannick	a96c53784c	Added localized strings for custom_fields	2021-11-02 11:27:53 +01:00
Wächtler, Yannick	c11af0e222	Added missing localized strings for account/accept/index.blade.php and view-assets.blade.php	2021-11-02 10:40:41 +01:00
Wächtler, Yannick	433d6fd3e0	Added localized strings for admin/companies	2021-11-02 10:23:15 +01:00
Wächtler, Yannick	b784e63aa8	Added localized strings for account	2021-11-02 10:13:22 +01:00
Godfrey M	1683b04244	changed min_amt_help message	2021-11-01 11:05:44 -07:00
Matthew Nickson	90ca66834b	Fixed sumFormatterQuantity if using 1.234,56 fomat Previously sumFormatterQuantity used the parseFloat to convert the string purchase_cost to a floating point number. parseFloat does not return the correct value when using the comma format. To fix this sumFormatterQuantity now used the cleanFloat function to convert purchase_cost to a float. Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2021-10-30 22:48:45 +01:00
Brady Wetherington	31933a56fa	Trying to get the login screen working	2021-10-28 18:18:11 -07:00
snipe	798f6d65de	Merge pull request #9847 from inietov/bug/ch15357/requested_assets_allow_to_cancel_if_checkedout_to_self Adds a check to know if the asset is checked out to the logged in user to allow check the state in the view	2021-10-28 17:53:24 -07:00
snipe	76cc46c419	Merge pull request #9814 from 01ste02/importMinAmt Improved Consumable Import: Import min_amt for consumables	2021-10-28 17:49:44 -07:00
snipe	dc71f6ddc6	Merge pull request #9871 from jethron/patch-1 Fixed: double slashes in branding logo URL path	2021-10-28 17:36:43 -07:00
snipe	3ede7c7f18	Use icon and string for maintained value in license view Signed-off-by: snipe <snipe@snipe.net>	2021-10-28 17:26:03 -07:00
snipe	645529ba78	Merge pull request #9889 from ncareau/api-licenses Add licenses api parameters and fix a missing variable in license view.	2021-10-28 17:20:09 -07:00
snipe	3951de1669	Merge branch 'develop' into bug/sc-17129/v6-integration-pie-chart-disappears-if-you	2021-10-28 17:13:37 -07:00
snipe	52ef9280ba	Adds reqestable as model bulk edit field Signed-off-by: snipe <snipe@snipe.net>	2021-10-28 15:15:54 -07:00
snipe	668e8a357c	Fixed labels in profile form Signed-off-by: snipe <snipe@snipe.net>	2021-10-28 12:57:27 -07:00
Godfrey M	b0da936c5c	changed get to receive in the message	2021-10-27 16:41:38 -07:00
Godfrey M	8719667c44	adds info on how to nullify reorder alerts for consumables, components and accessories	2021-10-27 16:36:04 -07:00
snipe	aa8f1378c9	Merge remote-tracking branch 'origin/master' into develop Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Http/Controllers/Accessories/AccessoriesController.php # app/Http/Controllers/Api/AssetMaintenancesController.php # app/Http/Controllers/Api/AssetModelsController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetMaintenancesController.php # app/Http/Controllers/Assets/AssetFilesController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Assets/BulkAssetsController.php # app/Http/Controllers/Components/ComponentsController.php # app/Http/Controllers/Consumables/ConsumablesController.php # app/Http/Controllers/Licenses/LicenseFilesController.php # app/Http/Controllers/Licenses/LicensesController.php # app/Http/Controllers/Users/UserFilesController.php # app/Http/Transformers/AssetsTransformer.php # app/Http/Transformers/LicensesTransformer.php # app/Importer/UserImporter.php # app/Models/Asset.php # config/app.php # config/version.php # package-lock.json # public/js/build/app.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/lang/en/admin/users/message.php # resources/lang/is/button.php # resources/lang/ja/admin/kits/general.php # resources/lang/ro/admin/users/general.php # resources/lang/zh-HK/admin/depreciations/general.php # resources/lang/zh-HK/admin/models/general.php # resources/views/hardware/qr-view.blade.php # resources/views/hardware/view.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/users/view.blade.php # routes/web.php # routes/web/hardware.php # routes/web/models.php # routes/web/users.php	2021-10-20 17:26:41 -07:00
snipe	365349fd91	Center custom fields email icon Signed-off-by: snipe <snipe@snipe.net>	2021-10-18 18:39:46 -07:00
snipe	bda23bb1e6	Fixes possible XSS on all-file-types export Signed-off-by: snipe <snipe@snipe.net>	2021-10-15 11:50:52 -05:00
snipe	4095a3f8c4	Removed dupe bars Signed-off-by: snipe <snipe@snipe.net>	2021-10-12 12:31:08 -07:00
snipe	94c4265524	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2021-10-12 12:30:39 -07:00
snipe	4a98519c1f	Compiled assets Signed-off-by: snipe <snipe@snipe.net>	2021-10-12 12:30:25 -07:00
snipe	892fc0004a	Fixed misisng hamburger menu Signed-off-by: snipe <snipe@snipe.net>	2021-10-12 12:09:46 -07:00
Matthew Nickson	8996c24d1f	Merge branch 'develop' into sum_cost_by_quantity	2021-10-10 13:01:44 +01:00
Dampfklon	ab4a234e20	fix rebase errors	2021-10-07 21:32:57 +02:00
Dampfklon	4418ad2340	Enable display of deleted acceptances, strike deleted users, add date, enable sorting	2021-10-07 21:03:46 +02:00
Dampfklon	12ee06deb6	add Download All Button, change route analogue to activity report	2021-10-07 21:01:50 +02:00
Dampfklon	ed99532c30	Unaccepted Assets Report Actions (send reminder, delete) added Unaccepted Assets Export fixed	2021-10-07 20:53:02 +02:00
snipe	7848a3c3dc	Use Storage:: facade for image preview for models Signed-off-by: snipe <snipe@snipe.net>	2021-10-06 13:12:42 -07:00
snipe	f306401e7e	Fixed SVG XSS vuln Signed-off-by: snipe <snipe@snipe.net>	2021-10-06 12:26:45 -07:00
Brady Wetherington	bbeedc026d	A lot of cleanups to the Livewire stuff, and got it kinda-sorta basically working.	2021-10-04 22:07:29 -07:00
Brady Wetherington	d80604f2ac	Most of the basics are working, but not done and lots of debug messages are about I picked up the change that picked a point-release difference on the AWS library since that usually works out for us (x.y.1 vs. x.y.2 - usually a good call)	2021-10-04 22:06:48 -07:00
snipe	dc3af7cc74	Resolved conflicts Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 20:39:24 -07:00
snipe	903609b5a5	Updated languages Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 19:59:55 -07:00
snipe	e491a93892	Removed restore link Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 19:56:56 -07:00
snipe	b20c841a89	Fixed asset models restore Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 19:29:13 -07:00
snipe	8fe59f8383	Switch users restore over to POST Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 19:22:38 -07:00
snipe	8bf09d9f89	Make form-based restore button on asset view Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 19:01:16 -07:00
snipe	3594ec9905	Handle bulk check and uncheck Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 17:58:16 -07:00
snipe	52caee2a9f	Handle checking and unchecking for bulk actions Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 17:18:26 -07:00
snipe	52ea172e5d	Fix ID array Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 17:18:07 -07:00
snipe	89e650f842	Fixed typo Signed-off-by: snipe <snipe@snipe.net>	2021-09-30 16:01:56 -07:00
snipe	43a437000b	Slightly better right-padding on row-new-striped Signed-off-by: snipe <snipe@snipe.net>	2021-09-29 11:20:32 -07:00
snipe	85b5f52cd8	Nicer mobile view for user view icons Signed-off-by: snipe <snipe@snipe.net>	2021-09-28 23:04:30 -07:00
snipe	61f16f47a2	Use Helper alias Signed-off-by: snipe <snipe@snipe.net>	2021-09-28 19:44:55 -07:00
Brady Wetherington	ae466be153	Fix license output, tweak CleanFloat function to handle numbers over 1 million	2021-09-28 19:10:25 -07:00
Brady Wetherington	f380da3f19	Try to ensure all currency output is formatted correctly.	2021-09-28 16:45:47 -07:00
snipe	9a83b90e44	Make row-new-striped 100% width Signed-off-by: snipe <snipe@snipe.net>	2021-09-28 15:04:57 -07:00
snipe	9311f8694f	Fixed incorrect icon for map marker Signed-off-by: snipe <snipe@snipe.net>	2021-09-28 09:35:48 -07:00
NMC	c680977791	Merge branch 'develop' into api-licenses	2021-09-27 15:02:51 -04:00
snipe	1657ba396f	Added available license seat count to top tabs for licenses Signed-off-by: snipe <snipe@snipe.net>	2021-09-26 15:03:56 -07:00
snipe	f0da1977fb	Small visual improvements on consumables view Signed-off-by: snipe <snipe@snipe.net>	2021-09-26 14:32:51 -07:00
snipe	450da5661d	Add additional info on accessories view page Signed-off-by: snipe <snipe@snipe.net>	2021-09-26 03:59:04 -07:00
snipe	a6632a7b9f	Use new row striping on licenses detail page Signed-off-by: snipe <snipe@snipe.net>	2021-09-26 03:58:53 -07:00
snipe	7e41c74cc3	Updated more fa icons Signed-off-by: snipe <snipe@snipe.net>	2021-09-26 01:11:08 -07:00
snipe	8738451685	Fixed font awesome caret Signed-off-by: snipe <snipe@snipe.net>	2021-09-25 23:17:35 -07:00
snipe	65a6da5bd2	Added files tab back to assets Signed-off-by: snipe <snipe@snipe.net>	2021-09-25 22:59:02 -07:00
snipe	a7b3f98e9f	Updated angle icon with new font awesome Signed-off-by: snipe <snipe@snipe.net>	2021-09-25 22:57:27 -07:00
snipe	8ee00d0f42	Changed paperflip to file icon Signed-off-by: snipe <snipe@snipe.net>	2021-09-25 22:57:06 -07:00
snipe	667639b9fb	Backed out the ribbon CSS for now Signed-off-by: snipe <snipe@snipe.net>	2021-09-25 22:56:54 -07:00
snipe	67d898e897	Updated map icons Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 14:30:36 -07:00
snipe	a9b306f2d2	Backing out the ribbon - too finicky on mobile :( Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 14:30:29 -07:00
snipe	e03d7b7016	More fa icon updates Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 13:07:02 -07:00
snipe	20e23c1248	Fixed 500 on wrong association Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 12:54:47 -07:00
snipe	5875cf1e9e	Removed test code Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 12:33:34 -07:00
snipe	decc771459	Starting to refactor the hardware page Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 12:05:48 -07:00
snipe	78fa6452ee	Fixed typo Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 12:05:18 -07:00
snipe	2c141813f1	Better formatting Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 11:51:52 -07:00
snipe	3317b5107a	Added ribbon to show on user's photo that they are an admin Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 11:13:55 -07:00
snipe	0d1bd5b470	Updated more fa icons Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 11:13:34 -07:00
snipe	8d1c3106b5	Building assets again Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 11:13:15 -07:00
snipe	299ad681f7	More fa icons Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 07:21:30 -07:00
snipe	b2dc92b088	And a few more missed icons Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 06:44:38 -07:00
snipe	ad6f073c82	Few more icon updates Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 06:38:23 -07:00
snipe	8aba37522d	More FA icons Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 06:18:22 -07:00
snipe	dbe93d91cd	Updated fontawesome icons Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 06:07:46 -07:00
snipe	06e8e826bc	Added some BS tables style overrides for mobile Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 04:12:41 -07:00
snipe	4a8f06b0f1	Added badge counters to tabs Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 04:12:22 -07:00
snipe	8937396a26	Added padding to the sidenav on mobile Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 03:02:57 -07:00
snipe	fd7c6179d5	Show the user's photo frst on mobile view Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 03:02:47 -07:00
snipe	9a299973ff	Mobile CSS overrides Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 03:02:19 -07:00
snipe	7f41bdf0b0	Use new striping on hardware page Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 02:17:57 -07:00
snipe	90c22caa4b	Rework user page to no longer use tables for data layout This also fixes the weird display when lines break Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 02:17:40 -07:00
snipe	12df310449	Updated assets Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 02:16:58 -07:00
snipe	d37dedb654	Merge pull request #10123 from takuy/patch-1 Fixed #9928: update expected field name for response list	2021-09-23 18:57:02 -07:00
snipe	fedf51dda4	Fixed typo Signed-off-by: snipe <snipe@snipe.net>	2021-09-23 18:29:47 -07:00
Sam	d0f284129a	Update expected field for response list The existing code to handle the "enter key" / auto selections broke at some point. It was expecting results to be in an "items" list, not a "results" list. This should close #9928 hopefully. Tested locally.	2021-09-23 20:12:45 -04:00
snipe	0f40ba2b34	Check for admin rights before displaying admin permission options Signed-off-by: snipe <snipe@snipe.net>	2021-09-22 19:31:49 -07:00
snipe	39a702397a	Add user permissions message if the user is not an admin or better Signed-off-by: snipe <snipe@snipe.net>	2021-09-22 19:05:02 -07:00
snipe	61cf9ec009	Small conflict handling bits Signed-off-by: snipe <snipe@snipe.net>	2021-09-22 00:00:44 -07:00
snipe	e27065fe16	Merge branch 'develop-v6-integration' into develop-v6-rc1 Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Console/Commands/ResetDemoSettings.php # app/Helpers/Helper.php # app/Http/Controllers/Api/AccessoriesController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/CategoriesController.php # app/Http/Controllers/Api/ComponentsController.php # app/Http/Controllers/Api/ConsumablesController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/StatuslabelsController.php # app/Http/Controllers/Api/SuppliersController.php # app/Http/Controllers/AssetMaintenancesController.php # app/Http/Controllers/Auth/ForgotPasswordController.php # app/Http/Controllers/DepreciationsController.php # app/Http/Controllers/ReportsController.php # app/Http/Controllers/SettingsController.php # app/Http/Requests/ImageUploadRequest.php # app/Http/Transformers/ActionlogsTransformer.php # app/Http/Transformers/DepreciationsTransformer.php # app/Listeners/CheckoutableListener.php # app/Models/Accessory.php # app/Models/Asset.php # app/Models/Company.php # app/Models/Ldap.php # app/Models/User.php # app/Presenters/AssetPresenter.php # app/Presenters/CategoryPresenter.php # composer.json # composer.lock # config/version.php # database/factories/AssetModelFactory.php # database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php # database/seeds/AssetModelSeeder.php # package-lock.json # public/css/build/AdminLTE.css # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/css/dist/skins/skin-black-dark.css # public/css/dist/skins/skin-black-dark.min.css # public/css/dist/skins/skin-black.css # public/css/dist/skins/skin-black.min.css # public/css/dist/skins/skin-blue-dark.css # public/css/dist/skins/skin-blue-dark.min.css # public/css/dist/skins/skin-blue.css # public/css/dist/skins/skin-blue.min.css # public/css/dist/skins/skin-contrast.css # public/css/dist/skins/skin-contrast.min.css # public/css/dist/skins/skin-green-dark.css # public/css/dist/skins/skin-green-dark.min.css # public/css/dist/skins/skin-green.css # public/css/dist/skins/skin-green.min.css # public/css/dist/skins/skin-orange-dark.css # public/css/dist/skins/skin-orange-dark.min.css # public/css/dist/skins/skin-orange.css # public/css/dist/skins/skin-orange.min.css # public/css/dist/skins/skin-purple-dark.css # public/css/dist/skins/skin-purple-dark.min.css # public/css/dist/skins/skin-purple.css # public/css/dist/skins/skin-purple.min.css # public/css/dist/skins/skin-red-dark.css # public/css/dist/skins/skin-red-dark.min.css # public/css/dist/skins/skin-red.css # public/css/dist/skins/skin-red.min.css # public/css/dist/skins/skin-yellow-dark.css # public/css/dist/skins/skin-yellow-dark.min.css # public/css/dist/skins/skin-yellow.css # public/css/dist/skins/skin-yellow.min.css # public/js/build/app.js # public/js/build/vendor.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/assets/js/vue.js # resources/lang/af/validation.php # resources/lang/ar/admin/settings/general.php # resources/lang/ar/validation.php # resources/lang/bg/admin/settings/general.php # resources/lang/bg/validation.php # resources/lang/cs/admin/settings/general.php # resources/lang/cs/validation.php # resources/lang/cy/help.php # resources/lang/cy/validation.php # resources/lang/da/admin/settings/general.php # resources/lang/da/validation.php # resources/lang/de/admin/settings/general.php # resources/lang/de/validation.php # resources/lang/el/validation.php # resources/lang/en-GB/admin/settings/general.php # resources/lang/en-GB/validation.php # resources/lang/en-ID/admin/hardware/table.php # resources/lang/en-ID/admin/settings/general.php # resources/lang/en-ID/validation.php # resources/lang/es-CO/admin/settings/general.php # resources/lang/es-CO/auth/message.php # resources/lang/es-CO/button.php # resources/lang/es-CO/help.php # resources/lang/es-CO/validation.php # resources/lang/es-ES/admin/settings/general.php # resources/lang/es-ES/auth/message.php # resources/lang/es-ES/button.php # resources/lang/es-ES/help.php # resources/lang/es-ES/validation.php # resources/lang/es-MX/admin/settings/general.php # resources/lang/es-MX/validation.php # resources/lang/es-VE/admin/settings/general.php # resources/lang/es-VE/auth/message.php # resources/lang/es-VE/button.php # resources/lang/es-VE/help.php # resources/lang/es-VE/validation.php # resources/lang/et/validation.php # resources/lang/fa/validation.php # resources/lang/fi/admin/settings/general.php # resources/lang/fi/validation.php # resources/lang/fil/validation.php # resources/lang/fr/admin/settings/general.php # resources/lang/fr/validation.php # resources/lang/ga-IE/validation.php # resources/lang/he/admin/settings/general.php # resources/lang/he/general.php # resources/lang/he/validation.php # resources/lang/hr/validation.php # resources/lang/hu/validation.php # resources/lang/id/validation.php # resources/lang/is/admin/categories/general.php # resources/lang/is/admin/companies/message.php # resources/lang/is/admin/companies/table.php # resources/lang/is/admin/components/general.php # resources/lang/is/admin/components/table.php # resources/lang/is/admin/consumables/table.php # resources/lang/is/admin/depreciations/general.php # resources/lang/is/admin/depreciations/message.php # resources/lang/is/admin/hardware/form.php # resources/lang/is/admin/hardware/general.php # resources/lang/is/admin/hardware/message.php # resources/lang/is/admin/hardware/table.php # resources/lang/is/admin/kits/general.php # resources/lang/is/admin/licenses/form.php # resources/lang/is/admin/licenses/general.php # resources/lang/is/admin/locations/table.php # resources/lang/is/admin/manufacturers/table.php # resources/lang/is/admin/reports/message.php # resources/lang/is/admin/settings/general.php # resources/lang/is/admin/settings/message.php # resources/lang/is/admin/statuslabels/message.php # resources/lang/is/admin/suppliers/message.php # resources/lang/is/admin/suppliers/table.php # resources/lang/is/admin/users/table.php # resources/lang/is/mail.php # resources/lang/is/validation.php # resources/lang/it/admin/settings/general.php # resources/lang/it/validation.php # resources/lang/iu/validation.php # resources/lang/ja/mail.php # resources/lang/ja/validation.php # resources/lang/ko/validation.php # resources/lang/lt/validation.php # resources/lang/lv/validation.php # resources/lang/mi/validation.php # resources/lang/mk/validation.php # resources/lang/ml-IN/validation.php # resources/lang/mn/validation.php # resources/lang/ms/validation.php # resources/lang/nl/admin/settings/general.php # resources/lang/nl/validation.php # resources/lang/no/validation.php # resources/lang/pl/admin/settings/general.php # resources/lang/pl/validation.php # resources/lang/pt-BR/admin/settings/general.php # resources/lang/pt-BR/mail.php # resources/lang/pt-BR/validation.php # resources/lang/pt-PT/validation.php # resources/lang/ro/validation.php # resources/lang/ru/validation.php # resources/lang/sl/validation.php # resources/lang/sr-CS/admin/settings/general.php # resources/lang/sr-CS/validation.php # resources/lang/sv-SE/admin/settings/general.php # resources/lang/sv-SE/auth/message.php # resources/lang/sv-SE/button.php # resources/lang/sv-SE/mail.php # resources/lang/sv-SE/validation.php # resources/lang/ta/validation.php # resources/lang/th/validation.php # resources/lang/tl/validation.php # resources/lang/tr/mail.php # resources/lang/tr/validation.php # resources/lang/uk/admin/accessories/table.php # resources/lang/uk/admin/asset_maintenances/message.php # resources/lang/uk/admin/asset_maintenances/table.php # resources/lang/uk/validation.php # resources/lang/ur-PK/validation.php # resources/lang/vi/admin/settings/general.php # resources/lang/vi/validation.php # resources/lang/zh-CN/admin/settings/general.php # resources/lang/zh-CN/validation.php # resources/lang/zh-HK/validation.php # resources/lang/zh-TW/validation.php # resources/lang/zu/validation.php # resources/views/partials/bootstrap-table.blade.php # resources/views/partials/forms/edit/company-select.blade.php # routes/api.php	2021-09-21 23:46:50 -07:00
snipe	b4a90045e6	Added totals to depreciation report footer Signed-off-by: snipe <snipe@snipe.net>	2021-09-21 21:52:18 -07:00
snipe	9b78b25372	Grr. 100 should be 1000 Signed-off-by: snipe <snipe@snipe.net>	2021-09-21 21:28:59 -07:00
snipe	7df4f98e19	Bump number per page up to 1000 Use this shit at your own peril. Very large pages will load slowly, as these are very complex queries. Signed-off-by: snipe <snipe@snipe.net>	2021-09-21 21:25:22 -07:00
Godfrey M	941cba73b9	removed deadspace and unnecessary css changes	2021-09-21 19:27:17 -07:00
Godfrey M	4a0c8de82a	adds jquery eventlistner to monitor chart.js width and refresh accordingly	2021-09-21 19:13:09 -07:00
snipe	dacdf788bc	Reverted erroneous german text in UK language files	2021-09-21 17:50:13 -07:00
snipe	0d633ce618	Fixed issue where created_at date was not showing on uploads Signed-off-by: snipe <snipe@snipe.net>	2021-09-13 17:13:01 -07:00
snipe	c6b26965a0	Check for valid category name Signed-off-by: snipe <snipe@snipe.net>	2021-09-13 15:47:13 -07:00
Ivan Nieto Vivanco	1ae665b645	Use the property 'archived' so if the 'name' one changes it doesn't fails	2021-09-13 16:45:05 -05:00
Ivan Nieto Vivanco	1b433920f1	Delete an extra semicolon	2021-09-13 16:24:12 -05:00
Ivan Nieto Vivanco	2b64af0d34	Add a condition in the view 'print all assigned' from locations where it skips the assets in relation of if they're archived and that option is marked in the settings	2021-09-13 16:17:34 -05:00
snipe	514f9aa64a	Fixed #9973 - add use_default_eula to categories API endpoint Signed-off-by: snipe <snipe@snipe.net>	2021-09-10 20:23:49 -07:00
snipe	a4e307c4db	Updated languages Signed-off-by: snipe <snipe@snipe.net>	2021-09-08 13:49:33 -07:00
snipe	cfaa6679af	Merge pull request #10031 from inietov/fixes/checkout_date_not_saved_in_asset_history Fixed #10026: Checkout date not saved in asset history	2021-09-07 17:37:30 -07:00
snipe	387018c44e	Updated depreciation report blade to use server-side API Signed-off-by: snipe <snipe@snipe.net>	2021-09-01 17:05:31 -07:00
Ivan Nieto Vivanco	e621eaf456	Change date showed in the activity report view, the condition is now on action_date	2021-09-01 13:58:17 -05:00
snipe	d5a7955e1d	Fixed #10024 - use string for dashboard in side nav instead of hard coded Signed-off-by: snipe <snipe@snipe.net>	2021-08-31 22:25:00 -07:00
snipe	7e2def7896	Merge pull request #9880 from inietov/bug/fd18463/cannot_edit_departments Fixes: Can't update departments if Full Company Support is activated	2021-08-30 19:40:59 -07:00
snipe	4abb9baa95	Merge remote-tracking branch 'origin/develop'	2021-08-24 15:29:41 -07:00
Godfrey M	a407fe9312	removed more dead space	2021-08-24 15:07:56 -07:00
Godfrey M	53ddf5ae04	removed dead space	2021-08-24 15:07:18 -07:00
Godfrey M	a197b730a1	fixed a layout issue with the month field in depreciations [ch17111]	2021-08-24 15:02:42 -07:00
Ivan Nieto Vivanco	830ba470dd	Change the used function to only affect single and double quotes	2021-08-23 22:10:59 -05:00
Ivan Nieto Vivanco	80fb24e861	Fix issue caused for single and double quotes when used as listbox's values	2021-08-23 22:00:01 -05:00
snipe	70f6753f50	Merge pull request #9979 from uberbrady/add_client_side_ldap_certs Add client side ldap certs	2021-08-23 16:30:46 -07:00
snipe	4ec4e0f44e	Merge remote-tracking branch 'origin/develop'	2021-08-19 12:09:48 -07:00
Brady Wetherington	e28db2d221	Fix regression for NULL valued numbers in the summary calculation	2021-08-19 12:01:47 -07:00
snipe	24af2ab67a	Merge remote-tracking branch 'origin/develop'	2021-08-18 14:31:53 -07:00
Brady Wetherington	4519f6e180	Fixed sum total calculation on Bootstrap Table pages	2021-08-18 14:13:31 -07:00
snipe	04fa5f2022	Merge remote-tracking branch 'origin/develop'	2021-08-18 01:05:25 -07:00
snipe	923d2a79ae	Fixed weird layout on bulk audit [ch17146] Signed-off-by: snipe <snipe@snipe.net>	2021-08-18 01:05:09 -07:00
snipe	f99602c039	Merge remote-tracking branch 'origin/develop' Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json	2021-08-18 00:47:33 -07:00
snipe	8a6c7269d3	Fixed border radius for bulk checkout field [ch16936] Signed-off-by: snipe <snipe@snipe.net>	2021-08-18 00:44:55 -07:00
snipe	37f2c7beac	Nicer bulk asset select width Signed-off-by: snipe <snipe@snipe.net>	2021-08-18 00:44:16 -07:00
snipe	b5bb74b8ca	Merge remote-tracking branch 'origin/develop'	2021-08-17 22:01:23 -07:00
snipe	cce808c784	Fixed #9909 and #9714 - applies v6 currency formatter to v5 [ch16628] Duplicates `d4e46ee41f` but on v5 Signed-off-by: snipe <snipe@snipe.net>	2021-08-17 21:59:33 -07:00
Brady Wetherington	4d4badf830	Got the client-side LDAP setup working well enough for sync!	2021-08-17 14:43:36 -07:00
Godfrey M	9480709ea3	changed value to current value	2021-08-16 18:22:24 -07:00
Godfrey M	cef0e424e1	adds a Floor value for depreciation models	2021-08-16 18:14:10 -07:00
snipe	29c584289f	Merge remote-tracking branch 'origin/develop'	2021-08-14 14:09:31 -07:00
Godfrey M	01037cf9cb	initial commit: adds migration, input area and transformer modifications for depreciation minimum value [ch15358]	2021-08-10 18:26:43 -07:00
Computroniks	8121d904e7	Licence cost calculation Licences use diffrent key to track quantity. sumFormatterQuantity has been modified to detect which key to use. Signed-off-by: Computroniks <mnickson@sidingsmedia.com>	2021-08-04 22:33:39 +01:00
Computroniks	f994af16da	Added function to calculate cost based on quantity sumFormatterQuantity takes the same input as sumFormatter but instead of calculating the specified columns total it calculates the total purchase cost of an item based upon its quantity. Also updated affected pressenters to use this formatter. Signed-off-by: Computroniks <mnickson@sidingsmedia.com>	2021-08-04 22:09:50 +01:00
NMC	976957ddd4	Add Maintained filed in licenses view and api. + Expires in API	2021-08-01 14:30:16 -04:00
Ivan Nieto Vivanco	1b8156ac7f	Add a hidden field to handle departments inside Full Company Support config	2021-07-29 13:28:57 -05:00
Jethro Nederhof	d8fdd1b408	Fix branding logo URL path The current method adds an additional slash to the URL which results in the logo request producing a 404 error on for Storage drivers like S3 and GCS that don't automatically collapse additional forward slashes into single slashes. E.g. with the current code my logo URL renders like `https://storage.googleapis.com/mybucketname/public//setting-logo-Al0aKMhmYz.svg` (note the double slash after "public") when instead it should render like `https://storage.googleapis.com/mybucketname/public/setting-logo-Al0aKMhmYz.svg` For a local driver this should work fine since webservers handle the additional slashes case, but for key-based storage this 404s. Thanks for your work on Snipe-It, seems like a good system so far!	2021-07-28 14:55:34 +10:00
snipe	75d4a46fff	Merge pull request #9856 from inietov/bug/ch15413/model_number_is_not_on_accessory_import_dropdown Fixes: Model Number is not on the Accessory import dropdown of mappable fields [ch15413]	2021-07-24 01:05:26 -07:00
Ivan Nieto Vivanco	0f1c48cb6f	Add the field model_number to Accessory importer	2021-07-24 02:38:44 -05:00
Ivan Nieto Vivanco	35ffe8b902	Adds a check to know if the asset is checked out to the logged in user to allow check the state int the view	2021-07-20 18:56:22 -05:00
snipe	33e92c975a	Merge remote-tracking branch 'origin/develop' Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/css/dist/skins/skin-blue-dark.css # public/css/dist/skins/skin-blue-dark.min.css # public/css/dist/skins/skin-green-dark.css # public/css/dist/skins/skin-green-dark.min.css # public/css/dist/skins/skin-orange-dark.css # public/css/dist/skins/skin-orange-dark.min.css # public/css/dist/skins/skin-purple-dark.css # public/css/dist/skins/skin-purple-dark.min.css # public/css/dist/skins/skin-yellow-dark.css # public/css/dist/skins/skin-yellow-dark.min.css # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json	2021-07-15 13:29:00 -07:00
Godfrey M	44612e5eb7	Make non linked striped text the same for [ch16602]	2021-07-14 14:50:45 -07:00
Oskar Stenberg	5b5874499d	Added import for min_amt for consumables	2021-07-12 11:46:19 +02:00
snipe	4cfdaf89d8	Merge remote-tracking branch 'origin/develop'	2021-07-08 17:47:08 -07:00
Brady Wetherington	0ec2884c29	The custom settings section of SAML sometimes has bad linefeeds	2021-07-08 17:00:01 -07:00
snipe	f264cade7d	Merge remote-tracking branch 'origin/develop'	2021-07-08 16:05:32 -07:00
snipe	06806341c7	Nicer tab names for permissions Signed-off-by: snipe <snipe@snipe.net>	2021-07-08 15:57:41 -07:00
Ivan Nieto Vivanco	d2e94dfc1c	Added cookie option to assets Bootstrap Table to save the state of the table.	2021-07-08 14:05:40 -05:00
snipe	721b749ae1	Merge remote-tracking branch 'origin/develop'	2021-07-06 15:13:39 -07:00
snipe	2f10d946ec	Merge branch 'bug/ch16594/table-striping-on-dark-mode-skins-is-too' of https://github.com/Godmartinz/snipe-it into 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-blue-dark.css # public/css/dist/skins/skin-blue-dark.min.css # public/css/dist/skins/skin-green-dark.css # public/css/dist/skins/skin-green-dark.min.css # public/css/dist/skins/skin-orange-dark.css # public/css/dist/skins/skin-orange-dark.min.css # public/css/dist/skins/skin-purple-dark.css # public/css/dist/skins/skin-purple-dark.min.css # public/css/dist/skins/skin-red-dark.css # public/css/dist/skins/skin-red-dark.min.css # public/mix-manifest.json	2021-07-06 15:08:20 -07:00
Ivan Nieto Vivanco	131a285e2f	Fixes Vue issue with the import process.	2021-07-06 15:59:45 -05:00
snipe	b46e2b5990	Merge remote-tracking branch 'origin/develop'	2021-06-30 01:03:05 -07:00
snipe	a12ae19e32	Try deferring the load so it doesn’t query the server server 7 times for login This doesn’t work? Signed-off-by: snipe <snipe@snipe.net>	2021-06-29 10:50:32 -07:00
snipe	3332bbe072	Removed unused properties on login This may be dumb anyway - we probably don’t need to make so many round trips to the server just to see if things are required or not… But I’d really like to standardize the validation across the system Signed-off-by: snipe <snipe@snipe.net>	2021-06-29 10:27:44 -07:00
snipe	d5881523d9	Removed unused translations Signed-off-by: snipe <snipe@snipe.net>	2021-06-29 07:46:27 -07:00
snipe	704eb728bc	Added livewire the login screen Signed-off-by: snipe <snipe@snipe.net>	2021-06-29 02:16:57 -07:00
snipe	576e605f73	Make livewire less assy looking Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 22:40:18 -07:00
snipe	ebb0aa5532	Merge pull request #9766 from uberbrady/livewire_integration_v6 Livewire integration for Snipe-IT v6	2021-06-28 21:51:00 -07:00
Brady Wetherington	a6ac4f94f1	Breaking out field-listing into its own Livewire blade for use elsewhere	2021-06-28 21:00:20 -07:00
Brady Wetherington	ea1f1eb972	Get some basic Livewire going for 'edit model's default values.	2021-06-28 21:00:20 -07:00
Brady Wetherington	8e66abb926	Basic Laravel7 compatibility, starting getting Livewire going	2021-06-28 21:00:16 -07:00
Godfrey M	aba912001d	Table striping on dark mode skins is too [ch16594]	2021-06-28 20:41:56 -07:00
snipe	dc125af029	Fixed locations link on homepage module Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 19:56:41 -07:00
snipe	2365634139	Added dashboard module for locations [ch9199] Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 19:46:56 -07:00
Brady Wetherington	dce1dd41c8	Regenerate assets after repairing Vue integration	2021-06-28 16:38:05 -07:00
snipe	4af247f845	Added additional boxes to the dashboard Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 16:36:15 -07:00
snipe	d4e46ee41f	Added comma in US currency format [ch16628] Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 16:14:32 -07:00
snipe	f504d7ef5f	Merge remote-tracking branch 'origin/develop'	2021-06-28 13:12:10 -07:00
snipe	a016f4ecd0	Applies PR #9761 to integration Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 13:11:22 -07:00
snipe	30297e479e	Hide notes field by default Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 13:08:32 -07:00
snipe	a4fd0c9c6d	Fixed #9745 - added searchable, sortable notes field to status labels Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 11:52:57 -07:00
snipe	3ca3de9e4f	Merge remote-tracking branch 'origin/develop'	2021-06-23 20:05:38 -07:00
snipe	174d53aff9	Fixed #9729 - order number maxlength updated to 200 Signed-off-by: snipe <snipe@snipe.net>	2021-06-23 20:05:22 -07:00
snipe	1ea843248b	Fixed #9729 - bulk edit order number capped at 20 Signed-off-by: snipe <snipe@snipe.net>	2021-06-23 20:04:45 -07:00
Brady Wetherington	8268aca9fc	Removed Ziggy.baseUrl references for meta references that had baseUrl	2021-06-23 19:57:45 -07:00
snipe	32a6fa5f0c	Pushed less changes into integration branch Signed-off-by: snipe <snipe@snipe.net>	2021-06-23 18:00:33 -07:00
snipe	b5a75206fe	Merge remote-tracking branch 'origin/develop'	2021-06-23 17:19:48 -07:00
snipe	3f39cff225	Merge pull request #9738 from Godmartinz/bug/ch16594/table-striping-on-dark-mode-skins-is-too corrected a link color in the dark mode yellow skin	2021-06-23 16:39:02 -07:00
Godfrey M	a37edd5c5b	darkened back-sub-alt more	2021-06-23 16:34:41 -07:00
Godfrey M	f199098a59	undid the color change for links, darkened the back-sub-alt	2021-06-23 16:29:21 -07:00
snipe	7b51bf4f51	Merge remote-tracking branch 'origin/develop'	2021-06-23 14:41:27 -07:00
snipe	4db5a8f62b	Merge pull request #9695 from Joly0/master Update print.blade.php	2021-06-23 14:33:25 -07:00
snipe	b3ec4bb31b	Porting PR #9720 to v6 integration Signed-off-by: snipe <snipe@snipe.net>	2021-06-23 14:28:06 -07:00
snipe	ac52ea3463	Porting PR #9720 to develop Signed-off-by: snipe <snipe@snipe.net>	2021-06-23 14:27:15 -07:00
Godfrey M	154adeb9b2	corrected a link color in the dark mode yellow skin	2021-06-23 14:06:36 -07:00
Brady Wetherington	9456a03a88	Almost finished with the routes which is...hopefully? The last thing?	2021-06-22 16:58:23 -07:00
bmkalle	a330dca7d4	Update company-select.blade.php select should be disabled if full multiple companies is activated and the user isn't a superuser. otherwise the user get the ability to choose all companies.	2021-06-17 10:51:00 +02:00
Joly0	9a429952ff	update print.blade.php	2021-06-15 08:52:01 +02:00
snipe	3095a78664	Small tweaks to Dashboard controller Still gettiing a bizarre `Non-static method App\Http\Controllers\DashboardController::index() should not be called statically` error Signed-off-by: snipe <snipe@snipe.net>	2021-06-11 14:43:47 -07:00
Joly0	72f27ccc5b	Update print.blade.php	2021-06-11 11:05:39 +02:00
Laravel Shift	ec0dc681ba	Shift core files	2021-06-10 20:16:59 +00:00
Laravel Shift	934afa036f	Adopt Laravel coding style Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions. You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started. [1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer [2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200	2021-06-10 20:15:52 +00:00
Ivan Nieto Vivanco	9f944ad497	Added the 'required' attribute to the input file n the upload file form modal. Added a validation for the UserFilesController if the user doesn't select any file to upload [ch16471].	2021-05-27 15:48:13 -05:00
snipe	9f2b4c721d	Allow password reset from user profile Signed-off-by: snipe <snipe@snipe.net>	2021-05-26 15:32:23 -07:00
snipe	3f09d17389	Fixed typo “synchronization” Signed-off-by: snipe <snipe@snipe.net>	2021-05-25 18:45:06 -07:00
snipe	9eea46adef	Fixed parse error in user print view Signed-off-by: snipe <snipe@snipe.net>	2021-05-20 13:53:43 -07:00
Jonathon Reinhart	fd082addff	Fix incorrect case of ldap sync status string (#9563 ) Fixes #9562	2021-05-12 19:15:39 -07:00
snipe	76897f3a3a	Make label printing from asset page more consistent with normal UI Signed-off-by: snipe <snipe@snipe.net>	2021-05-12 17:08:53 -07:00
tbrconnect	a29ef73346	Feature #3088 Print labels from asset detail page (#9559 ) This PR adds a "Generate Label" button to the detail asset page as described in #3088. Fixes #3088 Co-authored-by: tilmann.bitterberg <tilmann@tbrglobal.com>	2021-05-12 13:38:26 -07:00
Brady Wetherington	62199f6255	Manually re-add support for Label Logos in Labels (#9552 )	2021-05-07 17:01:32 -07:00
snipe	9aac3ae628	Fixed HTML causing two backup headers to appear Signed-off-by: snipe <snipe@snipe.net>	2021-05-07 16:36:07 -07:00
snipe	ece627b3a3	Small fixes for location printing when relationships are missing/invalid, per #9521 Signed-off-by: snipe <snipe@snipe.net>	2021-05-05 10:23:46 -07:00
snipe	d8d3fa2293	Only show department if it’s valid Signed-off-by: snipe <snipe@snipe.net>	2021-05-05 10:13:19 -07:00
snipe	57b9b571dc	Fixed #9531 - highlight search box when filled, add clear button (#9534 )	2021-05-04 22:00:34 -07:00
snipe	b01baec7a8	Updated languages Signed-off-by: snipe <snipe@snipe.net>	2021-04-26 18:11:48 -07:00
snipe	32f043c5df	Set the body skin style if one was overridden by the user profile Signed-off-by: snipe <snipe@snipe.net>	2021-04-26 17:25:39 -07:00
snipe	23376c317e	Use correct URL for css for subdirs Signed-off-by: snipe <snipe@snipe.net>	2021-04-26 17:22:02 -07:00
snipe	b3b02933a5	Removed duplicate code Signed-off-by: snipe <snipe@snipe.net>	2021-04-26 17:21:48 -07:00
snipe	882732b2de	WTF kind of gendered language was this mess? Signed-off-by: snipe <snipe@snipe.net>	2021-04-26 17:18:17 -07:00
snipe	1d43eda21f	Features: improved UI for importer (#9467 ) * Small UI improvements for importer Signed-off-by: snipe <snipe@snipe.net> * And UI backup improvements Signed-off-by: snipe <snipe@snipe.net>	2021-04-21 20:16:17 -07:00
snipe	90f79eaf83	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2021-04-21 10:23:46 -07:00
aranar-pro	5127727730	Fixed #9424 : import history adds asset model to assigned user and respects checkin date (#9350 ) * Fixed #9294: Assets import history. Behaviour based on Checkin Date added, including assigning checked out items to users. * Fixed #9294: Fixed asset import history to respect checkin and update user with checked out items. * Fixed #9294: whitespace and comment cleanup for merge * Fixed #9294: Fixed asset import history to respect checkin and update user with checked out items.	2021-04-20 21:25:17 -07:00
snipe	d10d090d33	Moved status label help text to headline Signed-off-by: snipe <snipe@snipe.net>	2021-04-20 15:31:07 -07:00
snipe	aa6b1456b2	Added help text to custom fields headline Signed-off-by: snipe <snipe@snipe.net>	2021-04-20 15:29:43 -07:00
snipe	b2de0d4ade	Changed “Asset Categories” to “Categories” since there are more than asset categories now Signed-off-by: snipe <snipe@snipe.net>	2021-04-20 15:29:22 -07:00
Peter Sarossy	cacb707a7f	Added #9355 : include Accessories and Consumables on the location reports (#9356 )	2021-04-20 14:53:04 -07:00
Supapong Areeprasertkul	b28b245acc	Update labels.blade.php (#8441 ) - Make the qr_size bigger when no barcode printed. - BUG: Missing unit of font size for .qr-text class. - Reduce padding-right to remove the additional space above text when print from Google Chrome. (I do not know the cause. I tried "box-sizing: border-box" without success.)	2021-04-20 14:52:17 -07:00
Michael Pietsch	15e729f4b8	fix css when not runnin in webroot directory (#9445 ) Co-authored-by: Michael Pietsch <skywalker-11@mi-pietsch.de>	2021-04-20 14:49:57 -07:00
Masudul Haque Shihab	f3831fe010	Fixed #9447 change route parameter name in locations view (#9456 )	2021-04-20 14:49:05 -07:00
snipe	e4acf8d795	Merge remote-tracking branch 'origin/master' into develop	2021-04-20 14:44:01 -07:00
snipe	e8adf8d44c	One more category fix Signed-off-by: snipe <snipe@snipe.net>	2021-04-14 16:57:55 -07:00
snipe	b693e5202b	Check for category name Signed-off-by: snipe <snipe@snipe.net>	2021-04-14 16:54:36 -07:00
snipe	e1c6d4ced7	Merge branch 'develop' of https://github.com/Skywalker-11/snipe-it into Skywalker-11-develop Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # app/Http/Requests/SettingsSamlRequest.php	2021-04-14 15:15:07 -07:00
Joly0	31b2287a57	Update print.blade.php (#9426 ) Fixes #9418	2021-04-14 10:20:36 -07:00
Godfrey Martinez	5fab1d6f0d	FIxes Sum of purchase cost of components not taking quantity into account in Asset View > Components tab (#9424 ) * git commit -m * added text	2021-04-14 10:19:40 -07:00
Godfrey Martinez	246cc0eaa8	Feature/ch16172/adding other fields to ldap sync settings (#9416 ) * new branch, added manager as an additional field. Currently having DB issues * WIP DB Issue with eloquent * added department to LDAP sync * removed unused variables	2021-04-14 10:17:57 -07:00
Brady Wetherington	bf344fd707	Merge branch 'develop' mix-manifest I just picked one. version.php will get bumped by hand bootstrap table seems to just be another copy? Added it back.	2021-04-14 09:58:21 -07:00
Ivan Nieto Vivanco	9cf5fbd675	Logic added to handle when a cloned user is imported via LDAP. (#9429 )	2021-04-14 09:19:25 -07:00
Ivan Nieto Vivanco	3824a50e8b	Fixes an issue with CSS when the 'skin' value in settings table is empty. (#9423 )	2021-04-12 20:37:02 -07:00
snipe	bf2479c5d9	Fixed url to user-ridden style Signed-off-by: snipe <snipe@snipe.net>	2021-04-06 20:36:13 -07:00
snipe	ba92d751a3	Removed depreciated Input:: facade Signed-off-by: snipe <snipe@snipe.net>	2021-04-06 20:28:05 -07:00
Brady Wetherington	792a31cc7f	Merge branch 'develop'	2021-04-06 20:10:22 -07:00
snipe	390403ddb7	Fixed #9370 - listbox custom fields not decryoted on edit Signed-off-by: snipe <snipe@snipe.net>	2021-04-06 05:59:31 -07:00
Joel Pittet	af8509c4d0	Allow NPM packages to build for production (#9171 ) * add back changes before compiling assets * new css location and mix manifest * update papaparse, most vunerabilities attached to it * update axios and papaparse for security releases * removing security fixes that still allow npm run production to work * Update lodash	2021-04-05 22:01:11 -07:00
snipe	09887bdabd	Removed stray opening tag Signed-off-by: snipe <snipe@snipe.net>	2021-04-05 21:54:31 -07:00
Godfrey Martinez	f9f8ce6df6	Auditing feature improvement Better mobile [ch14328] (#9181 )	2021-04-05 21:53:19 -07:00
Tetrachloromethane250	157d9e4ebb	Added #5977 : Add permission to view files attached to licenses (#9264 ) * Add permission to view and modify files for licenses * Actually use the permission	2021-04-05 21:51:47 -07:00
snipe	b9bab05ac3	Merge branch 'master' of https://github.com/ajsy/snipe-it into ajsy-master Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # resources/views/users/print.blade.php	2021-04-05 20:55:49 -07:00
Godfrey Martinez	5ea759f615	Fixed #7211 , #9197 , #7864 , [ch15504] - Added additional LDAP fields to sync (#9318 ) * LDAP and Active Directory has plenty of other [ch15504] * removed department id from ldap sync * removed department id from ldap sync * Update 2021_03_18_184102_adds_several_ldap_fields.php	2021-04-05 19:26:04 -07:00
snipe	6f4215cfac	Fixed label name for field_values Signed-off-by: snipe <snipe@snipe.net>	2021-03-31 14:07:30 -07:00
snipe	b5f7cb534e	Fixed element name Signed-off-by: snipe <snipe@snipe.net>	2021-03-31 14:02:25 -07:00
snipe	70a7a8f20b	WTF. This shit is haunted. Signed-off-by: snipe <snipe@snipe.net>	2021-03-30 08:00:27 -07:00
snipe	a5b67965f2	Fixed CSS path (Fixes RB #14746) Signed-off-by: snipe <snipe@snipe.net>	2021-03-30 07:49:30 -07:00
Nikolay Didenko	06e641b782	Do not override per table data-id-cookie-table attribute by current route name globally (#7835 )	2021-03-29 20:05:24 -07:00
Marc Leuser	90b7d34c69	Added #6695 : add API endpoint for license seats (#8058 ) * remove miselading comment line * added dedicated API endpoint for license seats * don't display a seat name via API it makes no sense and we don't have any particular sorting order so the numbering would be inconsistent anyway * reduce amount of IFs * add sanity checks to show() * fix goofed logging logic * add tests for action log entries	2021-03-29 19:41:26 -07:00
NMC	3e934a1b96	Add a way for a user to override the site skin setting + fix mislabeled comment. (#6891 ) * Add a way for a user to override the skin setting. * Add site setting to allow user to change the skin. * Fix skin list. Co-authored-by: NMC <info@nmc-lab.com>	2021-03-29 19:09:23 -07:00
snipe	069e9e52fe	Try/catch barcodes so they don’t shit up the logs Signed-off-by: snipe <snipe@snipe.net>	2021-03-17 22:19:10 -07:00
Eli Young	97fa9663b1	Fixed #9299 : Use correct SVG MIME type for uploads (#9300 ) The correct MIME type of SVG is image/svg+xml. Out of an abundance of caution, I am leaving in image/svg to avoid potentially causing issues on very old browsers, but this can likely be removed without issue.	2021-03-15 16:42:11 -07:00
Ivan Nieto Vivanco	9ed226a0af	Fixes links in Models Actions, and to view the fieldset assigned to that Model. (#9232 )	2021-03-01 13:08:29 -08:00
Joel Pittet	c979779249	Fixes a couple blade templates for relative URLs (#9170 ) * Switched branch name to master * Production assets for better contrast in dark mode skins * Fixed #9115: Duplicate column name 'provider' (#9137) * Sigh. Real assets * fix blade templates with missing url() function wrapper for relative URLs * Develop to master (#9195) * Added saml custom setting retrieveParametersFromServer to enable fixing SLO issues with Azure AD (#9187) * [FIX] Lite test email won't use the mail component (#9092) * [FIX] Lite test email won't use the mail component * Revert "[FIX] Lite test email won't use the mail component" This reverts commit `6dab9aa1a8`. * Fix check for snipeSettings * Remove random text from message template * Revert "Fix check for snipeSettings" This reverts commit `887dcc7bbc`. * Fix test notification with setupCompleted Co-authored-by: johnson-yi <63399474+johnson-yi@users.noreply.github.com> Co-authored-by: Oliver Walerys <owalerys@users.noreply.github.com> * Changed branch from develop to master * fix blade templates with missing url() function wrapper for relative URLs * Re-apply patch against develop * Rebase against develop Co-authored-by: snipe <snipe@snipe.net> Co-authored-by: Kevin Köllmann <mail@kevinkoellmann.de> Co-authored-by: johnson-yi <63399474+johnson-yi@users.noreply.github.com> Co-authored-by: Oliver Walerys <owalerys@users.noreply.github.com>	2021-02-26 15:59:36 -08:00
Godfrey Martinez	b0078ff64d	Audit dark mode theme skins and check for [ch15847] (#9102 ) Co-authored-by: snipe <snipe@snipe.net>	2021-02-25 19:41:31 -08:00
snipe	f37d5d3d03	Fixed #9085 - asset models not showing proper pagination Huge thanks to @inietov for catching this one	2021-02-25 16:43:38 -08:00
snipe	57e52f0ba4	Fixed extraneous closing </i>	2021-02-25 13:35:05 -08:00
Oliver Walerys	c3166d491a	[FIX] Lite test email won't use the mail component (#9092 ) * [FIX] Lite test email won't use the mail component * Revert "[FIX] Lite test email won't use the mail component" This reverts commit `6dab9aa1a8`. * Fix check for snipeSettings * Remove random text from message template * Revert "Fix check for snipeSettings" This reverts commit `887dcc7bbc`. * Fix test notification with setupCompleted	2021-02-23 14:49:40 -08:00
snipe	c8f6318aba	Fixed funky layout in asset model modal window (broken HTML)	2021-02-19 10:51:56 -08:00
snipe	4ddab03792	Merge branch 'develop' of https://github.com/sw-mreyes/snipe-it into sw-mreyes-develop # Conflicts: # public/mix-manifest.json	2021-02-19 10:00:35 -08:00
snipe	9d50e0e8d0	Fixed weird table formatting in expected checkin report	2021-02-17 13:44:35 -08:00
snipe	9deb4204c8	Fixed #9116 - incorrect parameter name sent to hardware.show in expected assets report	2021-02-17 13:41:08 -08:00
Godfrey Martinez	8fb97da314	Color of asset selection in bulk checkout [ch15525] (#9145 )	2021-02-17 12:56:26 -08:00
Ivan Nieto	12ff465cdb	Added feature: Checkbox Custom Fields as list of values. (#9112 ) * Added functionality for checkboxes in custom fields. Similar to how radio buttons work. * Added the same functionality when the custom fieldset is encrypted. * Added missing bits, so the edit custom assets view shows what values have been already stored in database	2021-02-16 17:20:29 -08:00
Marcelo Reyes	4c3b46ea88	Fixed #9129 : add missing function formatDatalistSafe to snipeit_modals.js	2021-02-16 13:50:00 +01:00
snipe	0bbe0c85d7	Small improvement to topnav dropdown text colors in dark skins	2021-02-03 15:17:31 -08:00
snipe	49415806e1	Nicer formatting of the page if custom logout [ch15660]	2021-02-03 14:56:26 -08:00
ThoBur	c40b8334fc	Update edit.blade.php (#8876 ) Fix issue #8518	2021-02-03 11:59:05 -08:00
snipe	985193ffff	Fixed #9082 - allow deployable status type on checkout	2021-02-03 01:29:54 -08:00
snipe	e0a6f22489	Small fixes to dark mode skins	2021-02-03 00:49:09 -08:00
Brady Wetherington	9a224a07ba	Modified how we do Select2 dynamic drop-down menus to be more secure (#9079 ) * Modified how we do Select2 dynamic drop-down menus to be more secure As noted by the author of select2, the more-secure way of creating rich Select-dropdowns is to use jquery to create HTML snippets and carefully modify text attributes within there. This prevents any XSS from being brought to the page. As a side-effect, the extra escaping that we had to do in all of the internal selectlist calls is now no longer necessary, and has been removed. Rebased and squashed from the original. * Rebuilt all assets, but this still feels like it's too much stuff in here. * Whoops, need to run that in dev, not prod	2021-02-02 15:55:21 -08:00
Godfrey Martinez	cf368a4577	fixed an issue with links colors (#9073 ) * fixed an issue with links colors * corrected btn-default's color	2021-02-01 13:50:37 -08:00
snipe	fdb5b3baf1	Depreciation detail view fixes [ch15776] (#9059 ) * Allow sorting by months for depreciation list view * Added dataTableLayout to standardize the list display table * Implement the dataTableLayout() on the list view blade * Split the view into tabs so we can combine asset depreciations and license depreciations * Updated depreciation view to use tabbed interface for assets and licenses * Added asset models to depreciation details page * Make asset model category sortable * Added cateory as allowed to be sorted on * Added category sort scope * Removed offset variable * Small fixes to asset modes display in depreciation to bulk edit models	2021-01-27 17:44:05 -08:00
Ivan Nieto	6772835efc	Added support for radio buttons in Custom Fields. (#9053 )	2021-01-27 14:41:58 -08:00
snipe	fb482b0dd6	Fixed translation string in Depreciation view [ch15776]	2021-01-27 14:09:01 -08:00
snipe	0031fab0fe	Added termination date, depreciation in license column selection [ch14505] (#9052 )	2021-01-27 01:34:32 -08:00
snipe	d19c6ab8e7	Use fadeIn/fadeOut for password reset page for nicer look	2021-01-26 20:05:01 -08:00
snipe	d14b1e3825	Added better visual cues for login (#9051 ) * Added better visual cues for login * Changed box header class to box-header with-border to match other screens * Since we have all.js now, added class=“minimal” to use icheck	2021-01-26 19:57:39 -08:00
snipe	ba12ee9954	Specifically call out username in forgotten password	2021-01-26 18:00:50 -08:00
Lucas Pleß	f3a7467235	Added today as default Date for checkout Form. (#8938 )	2021-01-26 12:06:58 -08:00
Ivan Nieto	2da6f9136f	Add 'Last Audit Date/Next Audit Date' filter to custom report (#8989 ) * Add 'Last Audit Date/Next Audit Date' filter to custom report * Added a constraint: cannot require a report with a Last Audit Date in the future.	2021-01-26 12:05:31 -08:00
Godfrey Martinez	0dc78fdea6	fixed color schema on dark mode skins for links (#9034 )	2021-01-21 14:41:42 -08:00
snipe	75a8639a20	Fixed weird checkbox display TODO: fix the 500 on the save	2021-01-12 18:16:42 -08:00
snipe	380c6171b7	Check if the asset is deployed before prompting for an expected checkin date	2021-01-12 18:02:10 -08:00
snipe	d36d6b8e07	Added expected_checkout as editable field in asset edit	2021-01-12 16:48:49 -08:00
snipe	c00a1fa21b	Added new generic datepicker partial	2021-01-12 16:48:32 -08:00
Godfrey Martinez	444f9a81da	Bug/ch15603/read only text field in saml screen dark (#8993 ) * fixed dark mode skins read only color schema * fixed dark mode skins read only color schema	2021-01-11 14:07:55 -08:00
Ivan Nieto	72f9fe444d	Fix for default parameters in JS functions IE (#8973 ) * Small fix for IE which doesn't support default parameters in the function definition * Stylistic changes for better comprehension	2021-01-05 19:25:30 -08:00
snipe	382fb31670	Updated translations (Finnish, Polish, Japanese, Turkish, Spanish)	2020-12-30 12:51:09 -08:00
Brady Wetherington	0329028e2c	Fixed #8926 , #8252 - introduce circular reference check for location parent_id - rebased from #8253 (#8927 ) * Fixed #8252 - circular references in location parents * Remove non-translated translation changes * Fix typo * Add loop limit to avoid unforseen infinite loops * Remove check against parent_id in location controllers * Remove the Location->id=null piece (no longer needed) * Fix some formatting and whitespace * Re-introduce accidentally merged-out language file Co-authored-by: Travis Miller <milletr@tulsaschools.org>	2020-12-18 17:18:04 -08:00
Godfrey Martinez	55a526a6b3	corrected background color for bulk checkout listable items in all da… (#8916 ) * corrected background color for bulk checkout listable items in all dark schemas * resubmitting	2020-12-15 12:37:22 -08:00
Evgeny	bbf7fbcff4	Localization digit separator feature. (#8915 ) Provides an ability to localize the purchase_cost field in front-end hardware index table. Has two digit separator formats in admin settings with comma and dot.	2020-12-15 11:49:13 -08:00
snipe	c0aa6c153e	Better callout for warning on api token page	2020-12-09 08:19:04 -08:00
snipe	5f76e03616	Clarified API url info in account > api	2020-12-09 08:14:44 -08:00
snipe	82d8b2ab82	Fixed weird parsing in newer markdown	2020-12-08 20:04:01 -08:00
snipe	4ac15daee7	Fixed #8147 - allow webp image format for public file uploads	2020-12-01 19:06:53 -08:00
snipe	bfc60864dd	Fixed typo on route for licenses	2020-11-30 20:46:45 -08:00
snipe	4882b01787	Added purchase order and order number to user > licenses view	2020-11-30 12:54:15 -08:00
snipe	f475bdbb2d	Fixed #8797 - use html_entity_decode in fullName presenter for User	2020-11-25 08:54:23 -08:00
snipe	6f99ce2b07	Branding page UI improvements (image previews inline)	2020-11-25 00:45:46 -08:00
snipe	76ee5a679b	Fixed #8810 - email logo was not being used in emails	2020-11-25 00:05:02 -08:00
snipe	973eacf6c3	Small fixes for SAML The SAML routes are in a service provide (sigh), so they did not have the `web` middleware group assigned to it. I also added some additional checks so that the setup blade won’t fail (the migrations wouldn’t have been run yet, so outside of a try/catch, it would return an error since those tables don’t exist.)	2020-11-24 13:51:02 -08:00
snipe	b2660002b9	Fixed #8781 - added asset count by status type (#8806 )	2020-11-24 12:15:07 -08:00
johnson-yi	0cdd83aabf	Fixes #8584 , #8654 , #8727 - fixes and improvements for saml (#8795 ) * Let onelogin/php-saml know to use 'X-Forwarded-' headers if it is from a trusted proxy Gracefully handle the case where openssl_csr_new fails when openssl.cnf is invalid/missing * Improve ui of saml sp metadata by displaying it's url and a download button	2020-11-20 18:54:25 -08:00
snipe	57d6a7d35e	Fixed #8753 - create-asset-from-model did not preselect the model	2020-11-18 13:59:02 -08:00
snipe	2ea805b7ed	Added search/sort by Location OU, added to listing	2020-11-17 22:17:07 -08:00
snipe	68487e1200	Added img-responsive class to preview images	2020-11-17 16:15:25 -08:00
snipe	f19b9a44fc	Fixed #8773 - wrong path for suppliers image on suppliers edit	2020-11-17 16:10:54 -08:00
snipe	4898b58bdb	Fixed #8765 - UI not indicating model is required	2020-11-17 13:40:15 -08:00
snipe	9b1e7ba8a6	Updated translations with new strings	2020-11-17 13:22:53 -08:00
snipe	e3d2369151	Fixed #8769 - incorrect translation for “DELETE” in purge	2020-11-17 12:01:02 -08:00
snipe	5ba1659563	Removed dupe date	2020-11-16 23:56:48 -08:00
snipe	513faf2db5	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2020-11-16 21:34:59 -08:00
snipe	9e46bc6c28	Fix for spanish translation	2020-11-16 21:34:47 -08:00
Brady Wetherington	a97b15ec96	Re-add LDAP "test login" feature to LDAP settings (helps with #8751 ) (#8757 ) * Start work on re-adding back the "Test LDAP logins" feature to develop * Add back-end method to allow LDAP test users to try to log in.	2020-11-16 21:23:08 -08:00
snipe	fbaf6e2494	Fixed #8747 - upload path for uploaded images	2020-11-16 16:39:02 -08:00
Brady Wetherington	6e4ab5cd96	Fix for #8746 - missing comma in a translation file (#8756 )	2020-11-16 13:29:57 -08:00
snipe	1f5bcf2475	Added option to download activity report	2020-11-13 16:25:05 -08:00
snipe	0c0de5e351	Added clarity in language as to what the activated flag does on LDAP screens	2020-11-13 11:52:34 -08:00
snipe	10cadecd14	Moved a few of the user edit fields to make more sense (optional stuff further down)	2020-11-13 11:52:09 -08:00
snipe	07936ea901	Changed asset name to asset tag in maintenances	2020-11-13 03:38:31 -08:00
snipe	df5cc7525e	Merge remote-tracking branch 'origin/develop'	2020-11-12 23:39:09 -08:00
snipe	75b8c3455c	Fixed #8609 - custom fieldsets not draggable anymore (regression)	2020-11-12 23:38:12 -08:00
snipe	81d38a0ded	Fixed #8733 - typo in unaccepted assets report	2020-11-12 23:26:05 -08:00
snipe	b2a8af2fa9	Fixed #8647 - Added additional help info on importer page	2020-11-12 22:46:51 -08:00
snipe	9d2363741e	Improved 2FA reset layout	2020-11-12 22:25:07 -08:00
snipe	9db191f0b2	Fixes for #8732 - Flysystem paths, migrator script	2020-11-12 21:46:06 -08:00
snipe	7765c87387	Fixed #8669 - Allow application/xml in SAML upload in Safari	2020-11-12 18:47:19 -08:00
snipe	caeea9f530	Merge remote-tracking branch 'origin/develop'	2020-11-12 15:27:49 -08:00
snipe	0fdfd013e7	Fixed #8715 - wrong API url for unaccepted assets	2020-11-12 15:26:50 -08:00
Dampfklon	be114176a2	Refactor Expected Checkin Notification into markdown and enable translation (#8236 ) Co-authored-by: snipe <snipe@snipe.net>	2020-11-12 15:09:40 -08:00
Dampfklon	1f9b04405c	Enable translation of accept-asset page (#8237 )	2020-11-12 15:07:45 -08:00
Dampfklon	4ef11c463c	Enable translations of checkin notifications (#8235 )	2020-11-12 15:05:57 -08:00
Dampfklon	5fb31a5a3f	Use translated salutation from other notifications (#8234 )	2020-11-12 15:05:22 -08:00
snipe	5098d69c05	Fixed stupid auto-indent	2020-11-12 14:20:54 -08:00
snipe	b12de13041	Fixed markdown in expiring licenses alert	2020-11-12 14:10:45 -08:00
snipe	6a2e21f502	More in depth error reporting on mail test failure	2020-11-12 13:22:49 -08:00
snipe	c8d588871c	Merge remote-tracking branch 'origin/develop'	2020-11-11 14:47:30 -08:00
Godfrey Martinez	80f2d749a2	Corrected css to the bootstrap popovers for all dark mode skins (#8714 ) * added css to the bootstrap popovers in dark blue * corrects the tool tips css for all dark mode skins other than dark blue	2020-11-11 14:11:39 -08:00
snipe	31d0b4a46c	Merge remote-tracking branch 'origin/develop'	2020-11-10 12:39:55 -08:00
snipe	fd7c0bc5fb	Use newer blade facade for requests	2020-11-10 08:36:18 -08:00
snipe	547d1a5a93	Merge remote-tracking branch 'origin/develop'	2020-11-10 04:43:20 -08:00
snipe	adf64361e8	Updated most recent translations	2020-11-10 04:43:02 -08:00
snipe	c607d89817	Merge remote-tracking branch 'origin/develop'	2020-11-10 01:59:18 -08:00
snipe	8c19b11e73	Fixed #8448 - “undefined” when testing email from quickstart	2020-11-10 01:48:18 -08:00
snipe	178ed82dc4	Fixed [ch9336] - Removed time stamp in Depreciation report	2020-11-10 01:13:13 -08:00
snipe	6757df5a2d	Added Checkout Date Time to Asset Details Page [ch1418]	2020-11-10 01:02:08 -08:00
snipe	9e319e91d6	Merge remote-tracking branch 'origin/develop'	2020-11-09 23:56:33 -08:00
snipe	895a544d4c	Fixed [ch15347] - added status in Depreciation Report	2020-11-09 23:56:16 -08:00
snipe	8a7cd87644	Merge remote-tracking branch 'origin/develop'	2020-11-09 23:05:40 -08:00
snipe	1cdf6f8263	Fixed #8673 - added category to accessories listing on Account > Assigned Assets	2020-11-09 23:05:19 -08:00
snipe	b8ad930690	Merge remote-tracking branch 'origin/develop'	2020-11-09 22:55:42 -08:00
snipe	ec14a117b7	Display on the API token page the expiration in years TODO: Translate these strings	2020-11-09 22:55:27 -08:00
snipe	b7cc12a466	Merge remote-tracking branch 'origin/develop'	2020-11-09 22:53:23 -08:00
snipe	f4080a7aa9	Fixed created_at and expired_at order in API token screen	2020-11-09 22:53:07 -08:00
snipe	31bbb2d035	Merge remote-tracking branch 'origin/develop'	2020-11-09 22:43:41 -08:00
snipe	33dca84ec7	Show expiry and created at date on API token page	2020-11-09 22:43:27 -08:00
snipe	b2101a5188	Merge remote-tracking branch 'origin/develop'	2020-11-09 21:09:05 -08:00
snipe	ede20523f2	Fixed #8680 - location image path	2020-11-09 21:08:19 -08:00
snipe	63a8535de1	Merge remote-tracking branch 'origin/develop'	2020-11-09 19:11:37 -08:00
Brady Wetherington	a5423649f4	This is the smallest set of changes we can use to work around a change in functionality in Bootstrap Tables. This should remedy some of the issues we've been having with large GET strings being sent to the back-end by the Assets system.	2020-11-09 17:36:07 -08:00
snipe	48c3d0fd19	Merge remote-tracking branch 'origin/develop' # Conflicts: # resources/lang/es-VE/general.php	2020-11-09 14:55:11 -08:00
snipe	67f60127be	Updated translations with latest from CrowdIn	2020-11-09 14:52:11 -08:00
snipe	4b8e9a962b	Fixed Venezuelan translation file	2020-11-09 14:05:31 -08:00
snipe	6618e88a9a	Fixed spanish translation parse error	2020-11-06 10:19:32 -08:00
snipe	e8fd2a7fe8	Merge remote-tracking branch 'origin/develop'	2020-11-03 13:07:31 -08:00
snipe	df5972c4fa	Fixed send creds checkbox in create user form	2020-11-03 13:07:15 -08:00
snipe	4d003ac97a	Merge remote-tracking branch 'origin/develop' # Conflicts: # app/Http/Controllers/Auth/ResetPasswordController.php # config/version.php	2020-11-03 11:49:34 -08:00
snipe	44e5fec707	Fixed #8603 - Use correct CSS path for signature-pad.min.css	2020-11-03 10:01:55 -08:00
snipe	c800662f0c	Use username for forgotten password Since emails are not required to be unique	2020-11-02 23:57:00 -08:00
snipe	e6f53a53bc	Updated min requirement for passwords in lang files	2020-11-02 22:15:01 -08:00
snipe	a55694da2f	Added validation to disallow password to be the same as username, email, etc	2020-11-02 20:03:26 -08:00
snipe	33bda9b6d1	Added blade option for same_pwd_as_user_fields Disallows password form value to be the same as username, email, first name or last name	2020-11-02 17:47:25 -08:00
snipe	42347d0f0c	Added validation language for same_pwd_as_user_fields	2020-11-02 17:46:30 -08:00
snipe	c93f4ef0d5	Merge remote-tracking branch 'origin/develop'	2020-10-23 19:50:56 -07:00
snipe	89e36dbc42	Merge pull request #8606 from uberbrady/fix_cant_manage_self Add a new custom validator for Users	2020-10-23 19:16:11 -07:00
snipe	8ee9e5e059	Fixed #8537 - wrong sorting on dashboard	2020-10-23 18:33:10 -07:00
snipe	f357d9fc90	Include audit settings text in settings overview so they get picked up by the filter box	2020-10-23 18:13:28 -07:00
Brady Wetherington	0eda53c484	Add a new custom validator for Users to prevent someone from managing themselves	2020-10-23 16:55:10 -07:00
snipe	28612d8b61	Merge remote-tracking branch 'origin/develop'	2020-10-23 14:23:46 -07:00
snipe	2aa8e1e76b	Merge pull request #8596 from snipe/fixes/8462_move_accessory_notes Fixes #8462 - move accessory notes into pivot table	2020-10-23 14:19:51 -07:00
snipe	d74df93c48	Merge remote-tracking branch 'origin/develop'	2020-10-23 12:10:13 -07:00
snipe	b9a9949570	Use the form partial for avatars	2020-10-23 12:09:20 -07:00
snipe	2219c9ccb5	Merge remote-tracking branch 'origin/develop'	2020-10-23 06:55:39 -07:00
snipe	bf9e53fbe7	Updated markdown templates	2020-10-23 06:55:23 -07:00
snipe	f68580b482	Make the email table wider	2020-10-23 06:55:04 -07:00
snipe	aec2f2a249	Fixed #8576 - switch to HTML from markdown This is really stupid. A markdown table with over 3 columns doesn’t render correctly. :(	2020-10-23 06:54:45 -07:00
snipe	831da2d6d1	New mail vendor files	2020-10-23 06:17:07 -07:00
snipe	40c0ba9a95	Merge remote-tracking branch 'origin/develop'	2020-10-23 04:46:44 -07:00
snipe	2263dae8f4	Fixed HTML	2020-10-23 04:07:55 -07:00
snipe	88f03e6b55	Added last_checkout and notes from pivot for accessories	2020-10-23 00:44:26 -07:00
snipe	c3e8f64064	Merge remote-tracking branch 'origin/develop'	2020-10-22 23:24:56 -07:00
snipe	ec7d70cea0	Merge pull request #8551 from Godmartinz/bug/ch10148/error-when-using-dark-green-skin fixed the Green skin (dark mode) color scheme on the importer page and asset table	2020-10-22 21:16:52 -07:00
snipe	6c285b0273	Merge pull request #8586 from Godmartinz/Confusing_wording_in_LDAP reworded the ad_append_domain_help string	2020-10-22 21:15:35 -07:00
snipe	5d112be49a	Fixed #8585 - requested assets page blank	2020-10-22 20:08:33 -07:00
snipe	496b176d4e	Fixed #8589 - unable to accept asset	2020-10-22 19:46:40 -07:00
snipe	c71086d2f3	Fixed #8590 - unable to checkin and delete from user view	2020-10-22 19:32:51 -07:00
Godfrey M	fcdb945f5f	reworded the ad_append_domain_help string	2020-10-22 09:21:18 -07:00
snipe	a6d0209e93	Fixed #8567 - don’t require model for custom report	2020-10-21 12:23:27 -07:00
Godfrey M	4a3d8f2cc0	fixed the Green skin (dark mode) color scheme on the importer page and assets table	2020-10-20 15:22:38 -07:00
Bennett Blodinger	132f296f03	Fix typo	2020-10-20 08:13:52 -05:00
snipe	c1443aa6eb	Pull licenses, accessories, etc - the qty is not accurately reflected	2020-10-19 16:22:55 -07:00
snipe	fa41b74856	Fixed parse error in Columbian spanish translation	2020-10-09 17:24:48 -07:00
snipe	a39069bc45	Small UI improvements to API keys page	2020-10-09 16:02:30 -07:00
snipe	714ad071ca	Add API endpoint to API keys page // TODO - localize it	2020-10-09 14:46:11 -07:00
snipe	c0f9a35dea	Fixed password reset blade with correct username	2020-10-08 18:47:42 -07:00
snipe	d7e58a35bf	Revert "Updated translations" This reverts commit `aad14b4d7a`.	2020-10-08 18:43:06 -07:00
snipe	aad14b4d7a	Updated translations	2020-10-06 19:30:04 -07:00
snipe	01a98c38dc	Added welsh as an localization option	2020-10-06 19:16:29 -07:00
snipe	b49c5dbf06	Clarified language	2020-10-05 20:43:28 -07:00
snipe	6234c6e5fc	Fixed typo	2020-10-05 20:35:27 -07:00
snipe	0cd19c87bf	Added utility to delete barcode cache from labels/barcodes setting	2020-10-05 20:34:17 -07:00
snipe	14a10f60d9	Undo previous change (it was an intentional choice)	2020-09-29 15:24:50 -07:00
snipe	186e229190	Make date example reflect actual date	2020-09-28 19:01:58 -07:00
snipe	dafac4ceb3	Disable ldap_enabled on demo, fixed some incorrect error messages	2020-09-25 19:04:38 -07:00
snipe	695774a3fb	Corrected throttle string	2020-09-24 23:39:32 -07:00
snipe	98246de4c7	Disable SAML on the demo	2020-09-24 19:25:28 -07:00
Bennett Blodinger	83dfa2a28c	Merge branch 'develop' into gmaps-8465	2020-09-22 17:41:38 -05:00
Blodinger	471e0fd2fc	Changes the Google Maps window to be a bit more detailed	2020-09-22 14:30:38 -05:00
Brady Wetherington	0e823a962b	Fix for #8424 - where the ldap_server setting was grayed out	2020-09-17 13:32:14 -07:00
snipe	002ca52c83	Standardize feature disabled messages in UI	2020-09-16 15:09:58 -07:00
Brady Wetherington	8331be05aa	Some fancy JS to enable/disable Slack-test based on field values	2020-09-16 13:15:39 -07:00
snipe	e8dfb71682	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop # Conflicts: # resources/views/settings/slack.blade.php	2020-09-16 12:40:23 -07:00
snipe	7de685a1c1	Added demo disabled text on slack screen	2020-09-16 12:36:33 -07:00
snipe	b508482441	Merge pull request #8438 from snipe/features/nicer_slack_ui Nicer slack settings UI	2020-09-16 12:29:58 -07:00
snipe	30f8431bfb	Added required field indicator	2020-09-16 12:29:20 -07:00
snipe	a3e738b283	Fixed #8442 - wrong CSS url path on /setup	2020-09-16 11:20:59 -07:00

... 16 17 18 19 20 ...

3507 commits