3403 commits

Author	SHA1	Message	Date
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	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	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	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
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	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	68150d11b7	Make logo clickable ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 16:13:52 -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
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	6059e9e119	Added fullscreen option to tables ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-14 17:49:00 -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	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	93e4d23143	Changed font-awesome leading class ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-13 18:36:13 -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	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
snipe	f7449921e9	Merge pull request #11253 from snipe/features/nicer_locations_ui ... Nicer locations UI	2022-06-06 10:23:04 -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	985e683896	Small display improvements ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-05 16:59:53 -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	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	1c4864a3cc	Added explicit “Example:” text in placeholders ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-03 11:25:18 -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	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
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	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	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	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	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	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	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	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	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	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	c07a244bab	fixes 1/2 visual issues, adds history tab to accessories	2022-05-10 11:20:42 -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
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
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
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
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	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
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
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	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
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
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
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
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	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	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
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
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
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	9ae03f21dc	Adds condition to only charge custom field's livewire when the model is updated	2022-01-15 12:14:34 -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	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
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
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
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	3841c3560b	changed a page title	2021-12-20 16:52:00 -05:00
Alex Janes	08cb8c354b	more cleanup to fit formatting convention	2021-12-19 19:11:24 -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
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
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	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	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
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	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	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
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	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
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	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	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	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	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	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	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	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	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	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	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	fedf51dda4	Fixed typo ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-23 18:29:47 -07: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	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	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	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	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
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	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	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	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
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
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	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
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
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	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	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
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
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	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
Ivan Nieto	12ff465cdb	Added feature: Checkbox Custom Fields as list of values. (#9112) ... * Added functionality for checkboxes in custom fields. Similar to how radio buttons work. * Added the same functionality when the custom fieldset is encrypted. * Added missing bits, so the edit custom assets view shows what values have been already stored in database	2021-02-16 17:20:29 -08:00
snipe	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	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
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
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
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
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
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	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	fd7c0bc5fb	Use newer blade facade for requests	2020-11-10 08:36: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	895a544d4c	Fixed [ch15347] - added status in Depreciation Report	2020-11-09 23:56:16 -08:00
snipe	1cdf6f8263	Fixed #8673 - added category to accessories listing on Account > Assigned Assets	2020-11-09 23:05:19 -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	ede20523f2	Fixed #8680 - location image path	2020-11-09 21:08:19 -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	df5972c4fa	Fixed send creds checkbox in create user form	2020-11-03 13:07:15 -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	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	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
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	b9a9949570	Use the form partial for avatars	2020-10-23 12:09:20 -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	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	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
snipe	a6d0209e93	Fixed #8567 - don’t require model for custom report	2020-10-21 12:23:27 -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	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	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	dafac4ceb3	Disable ldap_enabled on demo, fixed some incorrect error messages	2020-09-25 19:04:38 -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
snipe	74b96a7413	UI tweaks and updated JS to disable the save button if the settings are not correct	2020-09-15 23:14:10 -07:00
snipe	4fd5358aa8	Changed login attempts icon so it’s not the same as SAML	2020-09-15 20:27:01 -07:00
snipe	e8befe9afd	Increased favicon filesize max	2020-09-15 20:07:29 -07:00
snipe	d5f8e93d7c	Moved delete logo option higher for nicer layout	2020-09-15 19:52:34 -07:00
snipe	303388e1f5	Added a space between favicon help text blocks	2020-09-15 19:50:15 -07:00
snipe	9601bf6edd	Make “remove image” text clearer	2020-09-15 11:57:40 -07:00
snipe	3b6fb68ff1	Added space between padlock icon and demo warning text	2020-09-15 11:40:36 -07:00
snipe	bfd024fdfd	Merge pull request #8434 from inietov/bug/ch15182/make-all-of-the-this-feature-has-been-disabled ... Thanks!	2020-09-15 11:21:35 -07:00
snipe	e464f0edf3	Small UI tweaks for kits	2020-09-15 10:15:14 -07:00
Ivan Nieto	291997c915	Change the class of a reusable element so the icon changes from a warning to a padlock	2020-09-15 01:32:46 -05:00
snipe	912401a0a0	Change warning icon to padlock icon	2020-09-12 12:07:56 -07:00
snipe	ec5daa387b	Better explanation for demo mode	2020-09-12 10:04:57 -07:00
snipe	e448b626e2	Removed pagaination from dashboard	2020-09-12 08:37:37 -07:00
snipe	ac2403e8fc	Fixed markdown issue in markdown notifications	2020-09-11 17:12:33 -07:00
snipe	cf545f0ed1	Fixed form layout on accessory checkin page	2020-09-11 16:20:56 -07:00
snipe	d3d64bd85c	Removed asset tag from accessory checkin markdown notification	2020-09-11 16:06:02 -07:00
snipe	0f22cf6807	Fixed #8428 - Added purchase cost column to user tabs	2020-09-11 11:48:51 -07:00
snipe	2f435a57c1	Fixed #8426 - show model number in custom fields model listing	2020-09-11 11:27:30 -07:00
snipe	82e0b1ffd8	Fixed [ch15130] - update the seeder to clear requested assets table	2020-09-08 18:29:02 -07:00
snipe	5b68a321a6	Added comapny formatter to asset maintenance report - fixes [ch15119]	2020-09-08 18:15:45 -07:00
snipe	251ef82741	Added company formatter to asset maintenance report	2020-09-08 18:14:21 -07:00
snipe	d9e7a457d4	Fixed regression on select menus [ch15093] ... Custom report doesn’t pass an $item, so we have to check for that in that required check	2020-09-04 15:43:49 -07:00
snipe	249b9b7509	Fixed [ch15086] - [object object] in companies date displays	2020-09-03 19:40:17 -07:00
snipe	0eeeb24cae	Added data-validation=“required" to appropriate field partials	2020-09-03 16:59:42 -07:00
snipe	0503a51cae	Corrected validation to match model	2020-09-03 16:58:45 -07:00
snipe	c29ec6a100	Removed duplicate state field	2020-09-03 16:00:26 -07:00
snipe	a57ab29af6	Accessibility features for custom fields icons	2020-09-03 15:55:52 -07:00
snipe	b8ddbadd2b	Use icons for 2FA, LDAP, etc info on user view	2020-09-03 15:55:41 -07:00
snipe	3e120812e3	Removed 2FA reset button if the user is not enrolled in 2FA	2020-09-03 15:55:20 -07:00
snipe	3ea3e8b856	Updated user asset listing to use bootstrap-tables and asset endpoint [ch1389]	2020-09-03 15:12:51 -07:00
snipe	fb59405a87	User view can t be loaded [ch15079]	2020-09-03 14:07:30 -07:00
Ivan Nieto	3fcd83c499	Fixes some errors in forms using the deprecated Input:: facade	2020-09-03 13:42:33 -05:00
snipe	ed79eacb9d	Updated help text	2020-08-31 19:55:30 -07:00
snipe	a64e1be278	Fixed Input:: () vs request()	2020-08-31 17:18:09 -07:00
snipe	13216b8860	Fixed pGenerator (again)	2020-08-31 17:17:51 -07:00
snipe	453fc718d9	Merge branch 'develop' into integrations/2020-08-31-dev-into-master ... # Conflicts: # .all-contributorsrc # .nvmrc # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/ConsumablesController.php # app/Http/Controllers/Api/ImportController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/UsersController.php # app/Models/Ldap.php # composer.json # composer.lock # config/version.php # public/css/build/all.css # public/css/dist/all.css # public/css/skins/skin-contrast.css # public/css/skins/skin-contrast.css.map # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/dist/all.js # public/mix-manifest.json # resources/assets/less/overrides.less # resources/views/custom_fields/fieldsets/view.blade.php # resources/views/hardware/view.blade.php # resources/views/layouts/default.blade.php # resources/views/modals/model.blade.php # resources/views/modals/user.blade.php # resources/views/users/index.blade.php # routes/api.php # tests/unit/UserTest.php	2020-08-31 12:44:03 -07:00
snipe	9c8ca6af21	Squashed commit of the following: ... commit e321aeabae Merge: 8ec99ff43 37568ae9e Author: snipe <snipe@snipe.net> Date: Mon Aug 31 12:14:44 2020 -0700 Merge branch 'master' into integrations/2020-08-31-v5-rc # Conflicts: # .all-contributorsrc # .nvmrc # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/ConsumablesController.php # app/Http/Controllers/Api/ImportController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/UsersController.php # app/Importer/import_mappings.md # app/Models/Ldap.php # app/Models/Loggable.php # composer.json # composer.lock # config/version.php # public/css/build/all.css # public/css/dist/all.css # public/css/skins/skin-contrast.css # public/css/skins/skin-contrast.css.map # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/dist/all.js # public/mix-manifest.json # resources/assets/js/components/importer/importer-file.vue # resources/assets/less/overrides.less # resources/macros/macros.php # resources/views/custom_fields/fieldsets/view.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/labels.blade.php # resources/views/hardware/view.blade.php # resources/views/layouts/default.blade.php # resources/views/modals/model.blade.php # resources/views/modals/user.blade.php # resources/views/users/index.blade.php # routes/api.php # routes/web/fields.php # tests/unit/UserTest.php commit 37568ae9ec Merge: 01a832169 32ad9050c Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:49:37 2020 -0700 Merge pull request #8365 from snipe/fixes/8338_google_maps_CSP Fixed #8338 - Added google maps to CSP commit 32ad9050cf Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:48:53 2020 -0700 Added google maps to CSP commit 01a832169c Merge: bcad49ce7 3c6883489 Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:38:31 2020 -0700 Merge pull request #8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist Fixed #8335 - added assignedTo scope on status labels API call for assetlist commit 3c6883489c Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:37:30 2020 -0700 Added assignedTo scope commit bcad49ce79 Author: snipe <snipe@snipe.net> Date: Fri Aug 14 16:10:22 2020 -0700 Try to better handle slack “too many requests” issue commit b5acca89d7 Author: snipe <snipe@snipe.net> Date: Fri Aug 14 16:02:15 2020 -0700 Check for admin for slack notifications commit e52919cf1b Merge: 714576be4 29f3a5c48 Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:35:15 2020 -0700 Merge pull request #8327 from snipe/features/checkin_license_from_all_users Checkin license from all users cli tool commit 29f3a5c48f Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:27:40 2020 -0700 Use more verbose annotation for Auth::user if/else commit 134e8e6fb9 Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:25:07 2020 -0700 Moved user email nulling until after the save commit 714576be45 Merge: b999c50a2 512899294 Author: Brady Wetherington <bwetherington@grokability.com> Date: Fri Aug 14 15:24:03 2020 -0700 Merge pull request #8328 from snipe/fix_deprecation_report Fix deprecation report for customers with many active assets commit 5128992940 Author: Brady Wetherington <uberbrady@gmail.com> Date: Fri Aug 14 15:03:03 2020 -0700 Fix deprecation report for customers with many active assets commit 0291323502 Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:57:58 2020 -0700 Use the user as the target commit e0f6f9b839 Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:43:37 2020 -0700 Artisan command to check in licenses from all users commit f1a6308002 Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:43:07 2020 -0700 Check for Auth::user before trying to log id (for cli) commit b999c50a2e Merge: 9ca20e496 e3906b245 Author: snipe <snipe@snipe.net> Date: Wed Aug 12 12:37:47 2020 -0700 Merge pull request #8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation Looks great, thank you! commit e3906b245c Author: Godfrey M <godmartinz@gmail.com> Date: Wed Aug 12 12:27:18 2020 -0700 added translation for admin/licenses/message.not_found commit 9ca20e4964 Merge: e0644dbbf 456a74d88 Author: Brady Wetherington <bwetherington@grokability.com> Date: Tue Aug 11 17:33:19 2020 -0700 Merge pull request #8313 from snipe/improve_ldap_search_error_reporting Improve ldap search error reporting commit 456a74d88c Author: Brady Wetherington <uberbrady@gmail.com> Date: Tue Aug 11 16:41:20 2020 -0700 De-merge out incorrectly merged files. Whoops! commit 799c059070 Author: Brady Wetherington <uberbrady@gmail.com> Date: Tue Aug 11 16:21:18 2020 -0700 Add internationalized version of LDAP error message commit c62d43a778 Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Aug 10 17:04:17 2020 -0700 Improve Exception management in Artisan LDAP Sync method. Still need to localize this better commit b725bd0fae Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Aug 10 17:23:04 2020 -0700 Add @PeterUpfold as a contributor commit e0644dbbf6 Merge: 5b6925b00 004ecad05 Author: Brady Wetherington <bwetherington@grokability.com> Date: Mon Aug 10 17:22:31 2020 -0700 Merge pull request #8105 from PeterUpfold/PeterUpfold-7661workaround Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result() commit 5b6925b00c Author: snipe <snipe@snipe.net> Date: Tue Aug 4 21:00:37 2020 -0700 Removed debugging :( commit df17a859bf Author: snipe <snipe@snipe.net> Date: Tue Aug 4 20:59:54 2020 -0700 Changed modal IDs so manager creation modal works on user creation main page commit 24c43056ba Author: snipe <snipe@snipe.net> Date: Tue Aug 4 20:58:28 2020 -0700 Moved pGenerator script to default layout footer This fixes an issue where the password generator wouldn’t load in a modal in Chrome commit 606b7e905d Author: snipe <snipe@snipe.net> Date: Fri Jul 31 17:02:33 2020 -0700 Small edits to PR template Slight text changes to ask specifics about versions commit d73ddad477 Author: snipe <snipe@snipe.net> Date: Fri Jul 31 16:59:26 2020 -0700 Created a PR template First draft of the PR guidelines template commit 9a39cf721e Merge: 7410b1683 8994f3e15 Author: snipe <snipe@snipe.net> Date: Fri Jul 31 12:18:49 2020 -0700 Merge pull request #8258 from ballertv/features/consumable-api This looks great, thank you! commit 7410b16835 Merge: e955c983a b09e7d19b Author: Brady Wetherington <bwetherington@grokability.com> Date: Fri Jul 24 16:22:44 2020 -0700 Merge pull request #8270 from snipe/improve_ad_useraccountcontrol_v4 Add new useraccountcontrol value for valid AD users commit 8994f3e15e Author: andres <andresgutierrez535@gmail.com> Date: Wed Jul 22 19:57:06 2020 -0400 cleanup commit d23f1a77ca Author: andres <andresgutierrez535@gmail.com> Date: Wed Jul 22 18:46:02 2020 -0400 implement checkout API commit e955c983a3 Merge: 2fa17ac18 eed41e454 Author: snipe <snipe@snipe.net> Date: Wed Jul 22 13:43:29 2020 -0700 Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer Added address, city, state and country to importer and city to bulk editor commit b09e7d19b3 Author: Brady Wetherington <uberbrady@gmail.com> Date: Wed Jul 22 13:32:16 2020 -0700 Add new useraccountcontrol value for valid AD users; document algorithm and values commit 2fa17ac185 Merge: b90515437 3b1e46f72 Author: snipe <snipe@snipe.net> Date: Wed Jul 22 12:06:31 2020 -0700 Merge pull request #8254 from Godmartinz/gmartinez_adds_email_formats Added firstinitial.lastname, lastname_firstinitial, firstnamelastname… commit 3b1e46f72b Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com> Date: Wed Jul 22 11:25:57 2020 -0700 Update general.php commit 0c1a1de2a2 Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com> Date: Wed Jul 22 11:24:36 2020 -0700 Update general.php fixed typo commit 20c9ae5818 Author: Godfrey M <godmartinz@gmail.com> Date: Wed Jul 22 10:21:19 2020 -0700 Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats commit eed41e4549 Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:57:32 2020 -0700 Moved address down further, fixed broken HTML commit b750f4754f Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:49:54 2020 -0700 Added city to bulk user importer commit c17a06792a Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:49:38 2020 -0700 Added address, city, state, country to user importer commit 4f76cc6cfb Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:46:13 2020 -0700 I don’t actually know what this file is for commit b905154373 Author: snipe <snipe@snipe.net> Date: Mon Jul 20 14:29:32 2020 -0700 Fixed #8247 - added notes field to user details display commit daf748e531 Author: snipe <snipe@snipe.net> Date: Fri Jul 17 12:32:01 2020 -0700 Bumped hash commit 799a93c46a Author: snipe <snipe@snipe.net> Date: Fri Jul 17 12:11:32 2020 -0700 Allow for email/username search on users commit 34aa12e229 Merge: 81a633288 897757bd0 Author: snipe <snipe@snipe.net> Date: Thu Jul 16 17:44:13 2020 -0700 Merge pull request #8239 from snipe/fixes/api_rtd_to_location_on_create Set location_id to rtd_location_id on asset creation commit 897757bd04 Author: snipe <snipe@snipe.net> Date: Thu Jul 16 17:43:44 2020 -0700 Removed added line for location commit c7125c3937 Author: snipe <snipe@snipe.net> Date: Thu Jul 16 16:34:39 2020 -0700 Set location_id to rtd_location_id on asset creation commit 81a6332889 Author: snipe <snipe@snipe.net> Date: Tue Jul 14 13:55:38 2020 -0700 Removed license ID from seats table cookie info This typically wouldn’t be necessary, since most people would want to view the same *types* of data across licenses commit 6e563f6e4b Merge: 5320f5c67 7f69ae953 Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:54 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit 5320f5c67c Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:45 2020 -0700 Disallow non-super users from editing their own permissions commit 7f69ae953b Merge: c79f8c1ba 17f6fbabf Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:00 2020 -0700 Merge pull request #8227 from snipe/fix_select2_ajax_pulldowns Changes how we do AJAX calls via Select2 for dynamic drop-down menus commit 17f6fbabfa Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Jul 13 21:12:03 2020 -0700 Switch to 'items' to maintain compatbility with other internal API's commit c79f8c1baf Merge: 12c92e30b 536401fe0 Author: snipe <snipe@snipe.net> Date: Mon Jul 13 17:42:16 2020 -0700 Merge pull request #8207 from EDVLeer/patch-1 Update snipeit.sh commit e7a820f7c9 Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Jul 13 17:14:31 2020 -0700 Changes how we do AJAX calls via Select2 for dynamic drop-down menus commit 12c92e30b7 Author: snipe <snipe@snipe.net> Date: Fri Jul 10 16:21:27 2020 -0700 Show whether or not the user was imported via LDAP in the view page commit fd10b755b0 Author: snipe <snipe@snipe.net> Date: Fri Jul 10 11:30:01 2020 -0700 Removed the sr-only tag in table headers It was breaking Bootstrap Tables column selector :( commit dbbb7680d9 Author: snipe <snipe@snipe.net> Date: Thu Jul 9 21:12:50 2020 -0700 A few more fixes for the cli Do not check out a piece of software if it’s already been checked out to the user commit cf0dd5bbad Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:43:13 2020 -0700 Small fixes for cli tool commit 25e53d8c7f Merge: ec6ed256f 89d433b41 Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:27:01 2020 -0700 Merge pull request #8216 from snipe/features/checkout_license_to_all_users Added CLI tool to checkout license to all users commit 89d433b41a Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:26:02 2020 -0700 Removed duplicate seat call commit e2570ada6f Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:04:05 2020 -0700 CLI tool to checkout a license to ALL users commit 45afe725a1 Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:03:47 2020 -0700 Only try to get the company if there is an auth’d user (Needed for command line tools, where no Auth::user() is present) commit 536401fe0f Author: EDVLeer <32170051+EDVLeer@users.noreply.github.com> Date: Tue Jul 7 08:21:36 2020 +0200 Update snipeit.sh Ubuntu 20.04 commit ec6ed256fb Author: snipe <snipe@snipe.net> Date: Mon Jul 6 18:45:43 2020 -0700 Bumped minor version commit 2aaa7bed2d Merge: 339bdddc3 cc9f1577a Author: snipe <snipe@snipe.net> Date: Thu Jun 25 18:37:41 2020 -0700 Merge pull request #8183 from snipe/features/merge_users Added merge utility commit cc9f1577a4 Author: snipe <snipe@snipe.net> Date: Thu Jun 25 17:43:53 2020 -0700 Removed unused use directives commit ab1fe8be0c Author: snipe <snipe@snipe.net> Date: Thu Jun 25 17:42:39 2020 -0700 Added merge utility commit 339bdddc38 Author: snipe <snipe@snipe.net> Date: Thu Jun 25 11:00:33 2020 -0700 Fix for Vue js not loading due to CSP :( commit 35b9cf4b70 Author: snipe <snipe@snipe.net> Date: Tue Jun 23 02:41:59 2020 -0700 Fixed missing db prefix on scopeDueOrOverdueForAudit commit 7ccb41371e Author: snipe <snipe@snipe.net> Date: Tue Jun 23 01:09:39 2020 -0700 Removed unoptimized images directive securityheaders.com is claiming it’s onrecognized, even though I got that directive from their site, so… whatever. ¯\_(ツ)_/¯ commit 2e60a457bf Author: snipe <snipe@snipe.net> Date: Tue Jun 23 01:07:00 2020 -0700 Dumb fix for feature-policy being dumb. commit 2390d2160b Merge: b42801f6a 00b051b8c Author: snipe <snipe@snipe.net> Date: Tue Jun 23 00:27:47 2020 -0700 Merge pull request #8164 from snipe/features/additional_security_headers Additional security headers commit 00b051b8c7 Author: snipe <snipe@snipe.net> Date: Tue Jun 23 00:26:09 2020 -0700 Added a few more comments commit 05b3a9ad7e Author: snipe <snipe@snipe.net> Date: Mon Jun 22 23:17:27 2020 -0700 Config variable for HSTS commit 4fb880384f Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:37:14 2020 -0700 Changed comment commit 43042ad841 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:35:59 2020 -0700 Consolidated ReferrerPolicy into new SecurityHeaders file commit a716382ac4 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:33:37 2020 -0700 Removed CSP middleware (it’s added in the general header) commit 36c8f7f4f1 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:31:01 2020 -0700 Additional security headers commit b42801f6ae Merge: de4934f21 946129f20 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:47:35 2020 -0700 Merge pull request #8163 from snipe/fixes/fix-for-css-on-column-selector Fixed weird padlock display in asset listing with encrypted custom fields commit 946129f206 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:45:20 2020 -0700 Made quote style consistent commit b941ef1e08 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:41:40 2020 -0700 Pulled CSS font awesome styles out of the blade and into overrides.css commit d1aa11ec89 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:29:19 2020 -0700 Fix for weird padlock display in asset listing with encrypted custom fields commit de4934f21d Merge: af06e4205 b10076b01 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 17:28:38 2020 -0700 Merge pull request #8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings commit b10076b015 Author: Godfrey M <godmartinz@gmail.com> Date: Mon Jun 22 17:04:39 2020 -0700 corrected an error where font-size for labels were static in settings. commit af06e42056 Author: snipe <snipe@snipe.net> Date: Wed Jun 17 11:17:25 2020 -0700 Bumped version commit 9a2440dc4b Merge: beae8efb2 2ac1c1636 Author: snipe <snipe@snipe.net> Date: Tue Jun 16 20:20:07 2020 -0700 Merge pull request #8141 from snipe/fixes/better_handling_when_license_is_invalid Better handle the logic to determine if we should display the license checkout blade [ch13792] commit 2ac1c1636c Author: snipe <snipe@snipe.net> Date: Tue Jun 16 16:12:57 2020 -0700 Better handle the logic to determine if we should display the license checkout blade commit 004ecad059 Author: Peter Upfold <pgithub@upfold.org.uk> Date: Wed Jun 3 08:59:50 2020 +0100 Force suppress deprecation warning on ldap_control_paged_result() commit beae8efb21 Merge: d14ab7e3e 9839e5e56 Author: snipe <snipe@snipe.net> Date: Wed May 27 23:01:33 2020 -0700 Merge pull request #8088 from Godmartinz/Label_Woes Barcode resizing and text adjustment commit 9839e5e566 Author: Godfrey M <godmartinz@gmail.com> Date: Wed May 27 12:27:40 2020 -0700 adjusted for all label text, removed local variable commit d14ab7e3e1 Author: snipe <snipe@snipe.net> Date: Wed May 27 00:22:44 2020 -0700 Porting change from #8053 to master Signed-off-by: snipe <snipe@snipe.net> commit e7f74d94c1 Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:22:45 2020 -0700 Label_Woes commit e97cf011b6 Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:15:39 2020 -0700 Label_Woes commit ed23505054 Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:10:45 2020 -0700 Label_Woes commit 001e721530 Merge: f88683766 8210da6e8 Author: snipe <snipe@snipe.net> Date: Wed May 20 10:21:52 2020 -0700 Merge pull request #8063 from dmeltzer/backport-8092 BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635] commit 8210da6e82 Author: Daniel Meltzer <dmeltzer.devel@gmail.com> Date: Wed May 20 10:29:27 2020 -0400 Fix Missing Category selection in Asset Model Modal dialog. A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information. commit f88683766b Author: snipe <snipe@snipe.net> Date: Thu May 14 00:55:47 2020 -0700 Roll back previous change Signed-off-by: snipe <snipe@snipe.net> commit e4385c0f8c Author: snipe <snipe@snipe.net> Date: Thu May 14 00:48:30 2020 -0700 Fixes #8051 regression Signed-off-by: snipe <snipe@snipe.net> commit 0550fe0ffa Author: snipe <snipe@snipe.net> Date: Tue May 12 10:31:54 2020 -0700 Fix for session fixation vulnerability Signed-off-by: snipe <snipe@snipe.net> commit 7fb3a9b82c Merge: 9a2ed804c ecb1e87fe Author: snipe <snipe@snipe.net> Date: Mon May 11 22:41:36 2020 -0700 Merge pull request #8043 from snipe/features/backup-optional-in-import-and-ldap Added option to disable backup in import commit ecb1e87fe6 Author: snipe <snipe@snipe.net> Date: Mon May 11 20:45:15 2020 -0700 Updated assets Signed-off-by: snipe <snipe@snipe.net> commit f43df5f041 Author: snipe <snipe@snipe.net> Date: Mon May 11 20:44:46 2020 -0700 Fixed form label Signed-off-by: snipe <snipe@snipe.net> commit 95cc48e422 Author: snipe <snipe@snipe.net> Date: Mon May 11 20:41:10 2020 -0700 Added option to disable backup in import Signed-off-by: snipe <snipe@snipe.net> commit 9a2ed804ca Author: snipe <snipe@snipe.net> Date: Mon May 11 20:28:42 2020 -0700 Fixed mismatched HTML header tags Signed-off-by: snipe <snipe@snipe.net> commit d20fad28e5 Author: snipe <snipe@snipe.net> Date: Mon May 11 20:28:24 2020 -0700 Use more modern request helper Signed-off-by: snipe <snipe@snipe.net> commit ae813ddf75 Author: snipe <snipe@snipe.net> Date: Mon May 11 18:11:16 2020 -0700 Add @alek13 as a contributor commit bb42109c0c Author: snipe <snipe@snipe.net> Date: Mon May 11 18:10:45 2020 -0700 Added a clarifying comment Signed-off-by: snipe <snipe@snipe.net> commit f46ecf8ec0 Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:20 2020 -0700 Updated composer lock Signed-off-by: snipe <snipe@snipe.net> commit b9e821c0e6 Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:14 2020 -0700 Small fix for Group Functional Tests Signed-off-by: snipe <snipe@snipe.net> commit 9ee28c7513 Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:02 2020 -0700 Switched to use info instead of danger on undeployable statuses Signed-off-by: snipe <snipe@snipe.net> commit 1a8ba06702 Merge: 0fd232e70 ee4d69b1c Author: snipe <snipe@snipe.net> Date: Mon May 11 17:53:32 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit 0fd232e70d Author: snipe <snipe@snipe.net> Date: Mon May 11 17:53:24 2020 -0700 Fixed group functional test (We had changed the minimum to 2 instead of 3) Signed-off-by: snipe <snipe@snipe.net> commit ee4d69b1c5 Merge: 31c535094 d1ad11194 Author: snipe <snipe@snipe.net> Date: Mon May 11 17:52:45 2020 -0700 Merge pull request #8041 from alek13/patch-1 use supported package for slack commit d1ad111949 Author: Alexander Chibrikin <alek13.me@gmail.com> Date: Mon May 11 20:31:13 2020 +0300 use supported package for slack see https://github.com/maknz/slack/issues/94 commit 31c5350941 Author: snipe <snipe@snipe.net> Date: Fri May 1 01:05:48 2020 -0700 Fixed incorrect route for groups edit Signed-off-by: snipe <snipe@snipe.net> commit 7eb70e17e0 Merge: 5bb4f271a 3dfcb4699 Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:50:37 2020 -0700 Merge pull request #7993 from snipe/fixes/7989_column_selector Fixed #7989 - Converted table heading icons in People to CSS glyphs commit 3dfcb46991 Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:41:08 2020 -0700 Minor formatting changes Signed-off-by: snipe <snipe@snipe.net> commit 96eb96f964 Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:27:00 2020 -0700 Removed stray val (typo) Signed-off-by: snipe <snipe@snipe.net> commit a2f08bd3ba Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:08:54 2020 -0700 Added comments Signed-off-by: snipe <snipe@snipe.net> commit e009fbe59f Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:04:53 2020 -0700 Converted table heading icons in People to CSS glyphs Signed-off-by: snipe <snipe@snipe.net> commit 5bb4f271aa Author: snipe <snipe@snipe.net> Date: Fri Apr 24 00:47:19 2020 -0700 Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets Signed-off-by: snipe <snipe@snipe.net>	2020-08-31 12:17:19 -07:00
snipe	e1cc003cec	Fixed backup urls for download	2020-08-28 18:22:37 -07:00
snipe	d25a05d748	Misc Flysystem/image upload request fixes	2020-08-26 11:53:36 -07:00
snipe	f385f3e928	Fixed user image upload ... TODO: We should probably rename the avatar field on the user’s table, to make it more consistent with the other model images	2020-08-26 02:30:23 -07:00
snipe	a90d2ba077	Fixed suppliers upload	2020-08-24 18:53:33 -07:00
snipe	232e3f30aa	Fixed accessories “current image” path in edit form	2020-08-24 14:30:55 -07:00
Michael Pietsch	4f5374b2e8	enable use custom file based saml certificate/private key	2020-08-14 12:25:00 +02:00
snipe	19d8d7b146	Updated components and consumables to use storage facade	2020-08-12 13:02:54 -07:00
snipe	5b6925b00c	Removed debugging :(	2020-08-04 21:00:37 -07:00
snipe	df17a859bf	Changed modal IDs so manager creation modal works on user creation main page	2020-08-04 20:59:54 -07:00
snipe	24c43056ba	Moved pGenerator script to default layout footer ... This fixes an issue where the password generator wouldn’t load in a modal in Chrome	2020-08-04 20:58:28 -07:00
snipe	4e0a9c7a94	Fart fix ... I just…. don’t ask.	2020-08-03 12:35:34 -07:00
snipe	6a089f86f8	Fixed pathing for accessories	2020-08-03 11:17:56 -07:00
snipe	502b3c50a9	Fixed upload preview (fixed regression from #6736) ... This change appears to have been stomped on in one of the merges. :(	2020-07-31 14:36:50 -07:00
snipe	3e62a6ea2d	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2020-07-31 11:01:35 -07:00
snipe	eed41e4549	Moved address down further, fixed broken HTML	2020-07-21 16:57:32 -07:00
snipe	b750f4754f	Added city to bulk user importer	2020-07-21 16:49:54 -07:00
snipe	b905154373	Fixed #8247 - added notes field to user details display	2020-07-20 14:29:32 -07:00
snipe	81a6332889	Removed license ID from seats table cookie info ... This typically wouldn’t be necessary, since most people would want to view the same *types* of data across licenses	2020-07-14 13:55:38 -07:00
Ivan Nieto	8fd4529fad	Change the form input name for serials in the view	2020-07-13 13:49:21 -05:00
snipe	12c92e30b7	Show whether or not the user was imported via LDAP in the view page	2020-07-10 16:21:27 -07:00
snipe	fd10b755b0	Removed the sr-only tag in table headers ... It was breaking Bootstrap Tables column selector :(	2020-07-10 11:30:01 -07:00
Sean Borg	567a9639f4	Enhanced #5762 Able to bulk edit expected checkin date ... In light of the need to edit 500+ devices #5762 (comment) I added the expected checkin date to the bulk edit page for assets	2020-07-10 19:21:34 +01:00
Sean Borg	7a433f8598	Updated purchase date format in hardware/bulkedit ... The Purchase date box in hardware/bulkedit was a different style to the normal hardware/{id}/edit It also prevents a strange bug I see in firefox when clicking the old datepicker it presented 2 datepicker boxes	2020-07-10 19:21:22 +01:00
snipe	b941ef1e08	Pulled CSS font awesome styles out of the blade and into overrides.css	2020-06-22 20:41:40 -07:00
Godfrey M	b10076b015	corrected an error where font-size for labels were static in settings.	2020-06-22 17:04:39 -07:00
snipe	a7eb89f6b6	Misc fixes for flysystem paths	2020-06-16 16:06:25 -07:00
snipe	7a785b4952	Updated a few flysystem settings ... Signed-off-by: snipe <snipe@snipe.net>	2020-05-28 01:54:29 -07:00
Godfrey M	9839e5e566	adjusted for all label text, removed local variable	2020-05-27 12:27:40 -07:00
snipe	5b4e4c8dcd	Merge pull request #8061 from Godmartinz/develop ... fixed a table header error	2020-05-26 19:52:14 -07:00
Godfrey M	e7f74d94c1	Label_Woes	2020-05-26 17:22:45 -07:00
Godfrey M	e97cf011b6	Label_Woes	2020-05-26 17:15:39 -07:00
Godfrey M	ed23505054	Label_Woes	2020-05-26 17:10:45 -07:00
Daniel Meltzer	7ea862787c	Refactor controller to use one method that shows all modals based on name.	2020-05-23 15:24:00 -04:00
Daniel Meltzer	7a76cb08a0	We accept xlsx in uploads	2020-05-23 11:36:47 -04:00
Daniel Meltzer	8210da6e82	Fix Missing Category selection in Asset Model Modal dialog. ... A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information.	2020-05-20 10:29:27 -04:00
Daniel Meltzer	6a80f95769	Fix Missing Category selection in Asset Model Modal dialog. ... A select html tag needs a full closing tag. <select /> is not valid. This was causing the select2 js to barf and eat additional information.	2020-05-20 10:23:04 -04:00
Godfrey M	edd4797178	fixed a table header error	2020-05-19 16:59:09 -07:00
Daniel Meltzer	a6f90cb3fc	Assorted licenses UI fixes while testing. ... * Rename licenses route checkin parameter to clarify it's purpose and fix incorrect route in users view page. * Checkin note can be nullable for checking in a license. * License Seat view was only showing 20 license seats due to faulty transformer logic.	2020-05-12 14:38:21 -04:00
snipe	9a2ed804ca	Fixed mismatched HTML header tags ... Signed-off-by: snipe <snipe@snipe.net>	2020-05-11 20:28:42 -07:00
snipe	d20fad28e5	Use more modern request helper ... Signed-off-by: snipe <snipe@snipe.net>	2020-05-11 20:28:24 -07:00
snipe	9ee28c7513	Switched to use info instead of danger on undeployable statuses ... Signed-off-by: snipe <snipe@snipe.net>	2020-05-11 18:07:02 -07:00
Johnson Yi	572185ac96	Revised how saml sp info is displayed	2020-05-09 09:44:51 +10:00
Johnson Yi	b2930d6069	Added #542: add saml authentication	2020-05-06 00:06:19 +10:00
snipe	8ecb7969df	Fixed incorrect route for saving groups ... Signed-off-by: snipe <snipe@snipe.net>	2020-05-01 01:26:15 -07:00
snipe	31c5350941	Fixed incorrect route for groups edit ... Signed-off-by: snipe <snipe@snipe.net>	2020-05-01 01:05:48 -07:00
snipe	8507bcd16b	Merge pull request #8008 from dmeltzer/component-checkinout-fixes ... Component checkout/checkin fixes.	2020-04-30 17:49:22 -07:00
snipe	e47c44d055	Merge pull request #8007 from dmeltzer/permissions-form-cleanup ... Permissions edit cleanups.	2020-04-30 17:48:24 -07:00
snipe	8bb3c01f78	Addressed merge issue for reset password for #7997 ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-30 17:45:05 -07:00
Daniel Meltzer	bfba30058c	Fix incorrect routing.	2020-04-30 10:35:26 -04:00
Daniel Meltzer	debdccf5f1	Remove old help text translation that doesn't exist any more	2020-04-30 10:35:11 -04:00
Daniel Meltzer	358609720a	Component checkout/checkin fixes. ... - Provide proper translated messages for checkin vs checkout - Pass appropriate methods to the Checkout event, fixes an error on checkin. - Default to a value of 1 on checkin in UI to save a click sometimes.	2020-04-29 12:50:09 -04:00
Daniel Meltzer	42e1e9a0bd	Permissions edit cleanups. ... - Make each section of permissions it's own tbody for better styling - Remove extra separators when theres nothing to separate - Vertically center radio buttons in header rows. Still on the ideal list: - Unify code between users and groups into one partial with conditionals. - Sticky header row or put the header row in each section.	2020-04-29 12:33:50 -04:00
Daniel Meltzer	bb50828ca0	Remove General serial field now that the serial is part of the multi asset creation.	2020-04-28 11:39:53 -04:00
snipe	c2f1fd4942	Make user form a little nicer looking ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-28 00:01:47 -07:00
snipe	412caebf69	Fixed logo uploads ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-27 23:22:52 -07:00
snipe	b433b49469	Ficing webpack, CSS and JS (*whew* that sucked) ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-27 22:41:33 -07:00
snipe	f172747495	Handle parse error in custom fields edit per #7997 ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-27 19:36:07 -07:00
snipe	6427f46a6b	Removed mix (switched to url()) for now until assets are fixed ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-27 19:35:21 -07:00
snipe	6847a331a7	Backport the column icon fix from master ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-24 05:55:38 -07:00
snipe	3dfcb46991	Minor formatting changes ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-24 04:41:08 -07:00
snipe	96eb96f964	Removed stray val (typo) ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-24 04:27:00 -07:00
snipe	a2f08bd3ba	Added comments ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-24 04:08:54 -07:00
snipe	e009fbe59f	Converted table heading icons in People to CSS glyphs ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-24 04:04:53 -07:00
snipe	5bb4f271aa	Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-24 00:47:19 -07:00
snipe	bea3a7b982	Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-24 00:39:32 -07:00
snipe	44962d1eb9	Switched to use Primary button ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-23 22:44:48 -07:00
snipe	e69461d797	Cleaned up LDAP sync blade ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-23 22:44:28 -07:00
snipe	b01e8720dc	Fixed ldap settings JS error ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-23 14:41:20 -07:00
snipe	c50b81ff19	Added resources ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-22 07:15:24 -07:00
snipe	b5cc845216	Removed vendor.js from setup blade ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-22 07:15:12 -07:00
snipe	3435485a46	Updated path to skin css ... Signed-off-by: snipe <snipe@snipe.net>	2020-04-22 06:41:19 -07:00
snipe	82b6d2b31b	Fixed a few more tests	2020-04-21 21:13:00 -07:00
snipe	05e9861b71	Checkin/checkout fixes	2020-04-21 11:28:31 -07:00
snipe	cff2a65f62	Fixed broken if/else in view from bad merge	2020-04-21 11:13:29 -07:00
snipe	7a6ca5cb40	Tempt fix for css weirdness ... TODO: figure out why overrides isn’t being compiled into css/dist/all.css	2020-04-21 11:03:32 -07:00
snipe	1d8c3a73ea	Use non-min version of skin until we can get the other webpack stuff sorted	2020-04-21 10:43:04 -07:00
snipe	e786ef8290	Pull branding back to develop normal	2020-04-21 10:42:37 -07:00
snipe	c38bbfc8bd	Removed title from more info link	2020-04-21 06:29:34 -07:00
snipe	be446eedb0	Updated html styles on settings index	2020-04-21 06:29:08 -07:00
snipe	dc6e329d96	Fixed name in comments	2020-04-21 06:18:24 -07:00
snipe	72b3228d82	Fixed HTML tags	2020-04-21 06:15:31 -07:00
snipe	cb71bcc4af	Switch to old() helper	2020-04-21 03:58:31 -07:00
snipe	58f6b2da5a	Fixing assets	2020-04-21 03:42:35 -07:00
snipe	b670371e0b	Ugggh… fixing a donked merge	2020-04-21 03:30:21 -07:00
snipe	87464e6ec0	Merge branch 'develop' into integrations/2020-04-15-v5-merge ... # Conflicts: # README.md # app/Http/Controllers/AccessoriesController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/LicensesController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/ForgotPasswordController.php # app/Http/Controllers/CategoriesController.php # app/Http/Controllers/CompaniesController.php # app/Http/Controllers/ComponentsController.php # app/Http/Controllers/ConsumablesController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/DepartmentsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/LocationsController.php # app/Http/Controllers/ManufacturersController.php # app/Http/Controllers/SettingsController.php # app/Http/Controllers/SuppliersController.php # app/Http/Controllers/UsersController.php # app/Http/Requests/AssetRequest.php # app/Http/Requests/ImageUploadRequest.php # app/Models/LicenseSeat.php # app/Models/Location.php # app/Models/Setting.php # composer.json # composer.lock # config/database.php # config/version.php # npm-shrinkwrap.json # package.json # public/css/AdminLTE.css # public/css/AdminLTE.css.map # public/css/overrides.css # public/css/overrides.css.map # public/css/skins/skin-blue-light.css # public/css/skins/skin-blue.css # public/css/skins/skin-green-dark.min.css # public/js/app.js # public/js/bootstrap-table.js # public/js/bootstrap/js/bootstrap.js # public/js/bootstrap/js/bootstrap.min.js # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/demo.js # public/js/ekko-lightbox.js # public/js/ekko-lightbox.min.js # public/js/extensions/export/bootstrap-table-export.js # public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js # public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js # public/js/extensions/toolbar/bootstrap-table-toolbar.min.js # public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js # public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js # public/js/plugins/timepicker/bootstrap-timepicker.js # public/js/plugins/timepicker/bootstrap-timepicker.min.js # public/js/vue.js # public/mix-manifest.json # resources/assets/js/bootstrap-js.js # resources/assets/js/bootstrap.min.js # resources/assets/js/ekko-lightbox.js # resources/assets/js/ekko-lightbox.min.js # resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js # resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js # resources/assets/js/plugins/chartjs/Chart.js # resources/assets/js/plugins/timepicker/bootstrap-timepicker.js # resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js # resources/assets/less/AdminLTE.less # resources/assets/less/overrides.less # resources/assets/less/skins/_all-skins.less # resources/assets/less/skins/skin-black.less # resources/assets/less/skins/skin-blue.less # resources/assets/less/skins/skin-green.less # resources/assets/less/skins/skin-purple.less # resources/assets/less/skins/skin-red.less # resources/assets/less/skins/skin-yellow.less # resources/assets/less/variables.less # resources/js/components/importer/importer-file.vue # resources/lang/en/auth/message.php # resources/lang/en/passwords.php # resources/lang/es-CO/general.php # resources/lang/es-ES/general.php # resources/lang/es-VE/general.php # resources/less/skins/skin-black-dark.less # resources/less/skins/skin-blue-dark.less # resources/less/skins/skin-contrast.less # resources/less/skins/skin-green-dark.less # resources/less/skins/skin-orange-dark.less # resources/less/skins/skin-orange.less # resources/less/skins/skin-purple-dark.less # resources/less/skins/skin-red-dark.less # resources/less/skins/skin-yellow-dark.less # resources/views/accessories/checkin.blade.php # resources/views/accessories/checkout.blade.php # resources/views/accessories/edit.blade.php # resources/views/account/profile.blade.php # resources/views/account/view-assets.blade.php # resources/views/asset_maintenances/edit.blade.php # resources/views/auth/passwords/email.blade.php # resources/views/auth/passwords/reset.blade.php # resources/views/categories/edit.blade.php # resources/views/companies/edit.blade.php # resources/views/components/checkin.blade.php # resources/views/components/checkout.blade.php # resources/views/components/edit.blade.php # resources/views/consumables/checkout.blade.php # resources/views/consumables/edit.blade.php # resources/views/custom_fields/fields/edit.blade.php # resources/views/custom_fields/fieldsets/edit.blade.php # resources/views/dashboard.blade.php # resources/views/departments/edit.blade.php # resources/views/groups/edit.blade.php # resources/views/hardware/audit.blade.php # resources/views/hardware/bulk-checkout.blade.php # resources/views/hardware/bulk.blade.php # resources/views/hardware/checkin.blade.php # resources/views/hardware/checkout.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/index.blade.php # resources/views/hardware/quickscan.blade.php # resources/views/hardware/view.blade.php # resources/views/importer/import.blade.php # resources/views/layouts/basic.blade.php # resources/views/layouts/default.blade.php # resources/views/layouts/edit-form.blade.php # resources/views/licenses/checkin.blade.php # resources/views/licenses/checkout.blade.php # resources/views/licenses/edit.blade.php # resources/views/locations/edit.blade.php # resources/views/manufacturers/edit.blade.php # resources/views/modals/upload-file.blade.php # resources/views/models/bulk-edit.blade.php # resources/views/models/custom_fields_form.blade.php # resources/views/models/edit.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/partials/forms/edit/address.blade.php # resources/views/partials/forms/edit/asset-select.blade.php # resources/views/partials/forms/edit/category-select.blade.php # resources/views/partials/forms/edit/category.blade.php # resources/views/partials/forms/edit/company-select.blade.php # resources/views/partials/forms/edit/company.blade.php # resources/views/partials/forms/edit/department-select.blade.php # resources/views/partials/forms/edit/depreciation.blade.php # resources/views/partials/forms/edit/email.blade.php # resources/views/partials/forms/edit/image-upload.blade.php # resources/views/partials/forms/edit/item_number.blade.php # resources/views/partials/forms/edit/location-profile-select.blade.php # resources/views/partials/forms/edit/location-select.blade.php # resources/views/partials/forms/edit/location.blade.php # resources/views/partials/forms/edit/maintenance_type.blade.php # resources/views/partials/forms/edit/manufacturer-select.blade.php # resources/views/partials/forms/edit/manufacturer.blade.php # resources/views/partials/forms/edit/minimum_quantity.blade.php # resources/views/partials/forms/edit/model-select.blade.php # resources/views/partials/forms/edit/model_number.blade.php # resources/views/partials/forms/edit/name.blade.php # resources/views/partials/forms/edit/notes.blade.php # resources/views/partials/forms/edit/order_number.blade.php # resources/views/partials/forms/edit/phone.blade.php # resources/views/partials/forms/edit/purchase_cost.blade.php # resources/views/partials/forms/edit/purchase_date.blade.php # resources/views/partials/forms/edit/quantity.blade.php # resources/views/partials/forms/edit/serial.blade.php # resources/views/partials/forms/edit/status.blade.php # resources/views/partials/forms/edit/submit.blade.php # resources/views/partials/forms/edit/supplier-select.blade.php # resources/views/partials/forms/edit/supplier.blade.php # resources/views/partials/forms/edit/user-select.blade.php # resources/views/reports/custom.blade.php # resources/views/settings/alerts.blade.php # resources/views/settings/asset_tags.blade.php # resources/views/settings/barcodes.blade.php # resources/views/settings/branding.blade.php # resources/views/settings/general.blade.php # resources/views/settings/labels.blade.php # resources/views/settings/ldap.blade.php # resources/views/settings/localization.blade.php # resources/views/settings/security.blade.php # resources/views/setup/user.blade.php # resources/views/suppliers/edit.blade.php # resources/views/users/bulk-edit.blade.php # resources/views/users/edit.blade.php # resources/views/users/ldap.blade.php # resources/views/users/print.blade.php # resources/views/users/view.blade.php # routes/api.php # routes/web/hardware.php # webpack.mix.js	2020-04-20 23:20:34 -07:00
snipe	7ebd21bc04	Added sr-only to the unstyles image upload button	2020-04-09 19:29:16 -07:00
snipe	83ee64f155	Added missing CSS class to text-only logo	2020-04-08 17:25:14 -07:00
snipe	a0f7fdc57a	Merge branch 'fixes/accessibility_fixes' ... # Conflicts: # public/css/build/all.css # public/css/dist/all.css # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/dist/all.js # public/mix-manifest.json # resources/assets/js/components/importer/importer-file.vue	2020-04-08 11:19:42 -07:00
snipe	1a5785a8d3	Fixed dashboard header size	2020-04-06 21:30:28 -07:00
snipe	320d660e83	Updated chartjs	2020-04-06 21:17:26 -07:00
snipe	fb903b2fda	Added comments, better indenting	2020-04-06 21:05:42 -07:00
snipe	7bf398aca4	More settings filter fixes	2020-04-06 20:47:05 -07:00
snipe	f6bb655383	Prevent form submission	2020-04-06 20:17:44 -07:00
snipe	19f71face9	Added filtering to settings page	2020-04-06 20:11:13 -07:00
snipe	d82b94e281	Pull blue stylesheet if no skin was selected	2020-04-06 19:04:49 -07:00
snipe	a8032ac388	Switched to btn-primary for submit	2020-04-02 18:38:54 -07:00
snipe	21d8225696	Use button primary for higher contrast	2020-04-02 18:33:26 -07:00
snipe	766c2b22cb	Removed stray tag	2020-04-02 18:33:10 -07:00
snipe	bdddab5b8b	Added role=“option” to option items, additional icon font fixes	2020-04-02 18:17:21 -07:00
snipe	031adc3be4	Small display fixes to importer table	2020-04-01 19:51:36 -07:00
snipe	c906026acd	Merge branch 'master' into fixes/accessibility_fixes	2020-04-01 14:04:02 -07:00
snipe	56c2740b68	Radio button tweaks	2020-04-01 06:56:27 -07:00
snipe	4688d62b9f	Small UI fixes	2020-04-01 06:50:37 -07:00
snipe	99686bd73a	Added labels for bulk actions	2020-04-01 06:48:02 -07:00
snipe	120e224961	Add the ability to remove all group memberships in bulk	2020-04-01 06:35:13 -07:00
snipe	e27d69a31d	Remove viewport restrictions	2020-04-01 06:18:37 -07:00
Ivan Nieto	c492ba7245	Adding changes to 'upload-table' for being painted in CSS (#7934)	2020-04-01 05:24:05 -07:00
snipe	53658e365f	Removed duplicate HTML tag	2020-04-01 04:36:28 -07:00
snipe	4cfa0e36b1	Added labels to password reset	2020-04-01 04:30:54 -07:00
snipe	9d9b5d3885	Added form labels to auth screens	2020-04-01 04:29:54 -07:00
snipe	36f9905be0	Removed test code	2020-04-01 04:29:35 -07:00
snipe	2d2cd68061	Switched to h2 from h4	2020-04-01 03:51:08 -07:00
snipe	fd642e95eb	Hide success icons from screen readers	2020-04-01 03:25:07 -07:00
snipe	9ab3370be5	Hide icons in error messages	2020-04-01 03:21:15 -07:00
snipe	4dcc1ffdbc	More form labels	2020-04-01 02:22:24 -07:00
snipe	7718abaa72	Added aria-hidden	2020-04-01 01:26:44 -07:00
snipe	c3d2e8ff26	Added aria-hidden to inline form error text	2020-04-01 00:18:20 -07:00
snipe	be93b23488	Added aria-label to form fields	2020-04-01 00:15:33 -07:00
snipe	b079d0d6d5	Use btn-primary for submit button	2020-03-31 23:38:10 -07:00
snipe	c6c75cc11f	Fixed missing </h3 tags	2020-03-31 23:36:56 -07:00
snipe	b188285bc9	Fixed empty table headings	2020-03-31 23:02:24 -07:00
snipe	6d659a84b8	Removed extra div tag	2020-03-31 22:53:58 -07:00
snipe	3e3828229d	Removed _tab from tab names	2020-03-31 22:52:21 -07:00
snipe	bf6a0f8d2f	Added aria-hidden	2020-03-31 22:50:38 -07:00
snipe	3873c4b253	Added aria form labels to upload modal	2020-03-31 22:50:29 -07:00
snipe	6cc23f69f9	Added aria form labels	2020-03-31 22:50:14 -07:00
snipe	a467a6999e	Use upload modal	2020-03-31 22:50:07 -07:00
snipe	e0eb10ca1e	Added aria-hidden tags	2020-03-31 22:49:49 -07:00
snipe	99c4c73c09	Fixed aria labels on dropdowns	2020-03-31 21:53:26 -07:00
snipe	bde45cbb34	Fixed h3 to h2 for semantic header levels	2020-03-31 21:30:24 -07:00
snipe	bfa9c0c528	Updated dark skins with updated styles	2020-03-31 20:58:54 -07:00
snipe	fe2261c88d	A few more aria-hidden fixes	2020-03-31 19:34:01 -07:00
snipe	6aeb3c0a47	Use divs instead of layout table on view	2020-03-31 19:27:21 -07:00
snipe	dfaa1c9578	Use the same “no results” treatment for each tab	2020-03-31 18:45:43 -07:00
snipe	0ef1dfe061	Switched from layout tables to decorated divs for asset detail page	2020-03-31 18:39:58 -07:00
snipe	7854003ec2	Added sr-only text to “made with love” footer	2020-03-31 17:29:20 -07:00
snipe	c71dd9b68a	Added sr-only text	2020-03-31 17:29:06 -07:00
snipe	b8b9ac8a1b	Fixed mismatched <b>/<strong> tags	2020-03-28 18:00:46 -07:00
snipe	80ac2607cd	Added alt tags to assigned assets view	2020-03-28 18:00:19 -07:00
snipe	3552fb1fd8	Added alt tags to profile image	2020-03-28 18:00:05 -07:00
snipe	54a96b8453	Fixed <b> to <strong>	2020-03-28 17:30:17 -07:00
snipe	e9ddd1af81	Added th content on activity report	2020-03-28 04:00:26 -07:00
snipe	f0b9cd7820	Changed header for h2	2020-03-28 03:43:24 -07:00
snipe	59accca89d	Added form labelss	2020-03-28 03:43:08 -07:00
snipe	e72ebfb94b	Added placeholder text for modal header	2020-03-28 03:42:45 -07:00
snipe	0b7316d548	Changed side heading to h2	2020-03-28 03:42:27 -07:00
snipe	d0cf76989a	Fixed table headers for custom fields	2020-03-28 02:52:14 -07:00
snipe	5e4918579a	Added table headers	2020-03-28 02:41:27 -07:00
snipe	5a6c13e364	Added aria-hidden and sr-only tags to minus/collapse symbol	2020-03-28 01:37:49 -07:00
snipe	5c68353e62	Use non-min bs tables for now	2020-03-28 01:36:35 -07:00
snipe	53728e5c71	Removed whitespace	2020-03-28 01:36:22 -07:00
snipe	b965d170ab	Added accessibility features to bootstrap tables	2020-03-28 00:51:26 -07:00
snipe	a8f6bbd86a	Added alt text to image formatter in bootstrap tables	2020-03-27 22:01:24 -07:00
snipe	2a813244a2	Wrapped text in h5s, added aria hidden to icons	2020-03-27 21:45:27 -07:00
snipe	b50894fca1	Use a variable in the settings to determine what css classes to use	2020-03-27 21:44:50 -07:00
snipe	41fa2d1aa1	Added aria handlers and sr-only text	2020-03-27 21:44:32 -07:00
snipe	5858c90e71	Minor formatting change (spacing)	2020-03-27 15:50:01 -07:00
snipe	f0ef06ebe1	Added more alt tags	2020-03-27 15:35:29 -07:00
snipe	700f7de748	Added alt text to logo	2020-03-27 14:10:56 -07:00
snipe	af2ea7ac03	Added aria-hidden="true" to create dropdown in topnav ... Since it’s technically duplicated content	2020-03-27 14:08:01 -07:00
snipe	690d8255c9	Removed the title attribute from the select2 output ... It contains duplicate info since its auto-generated by select2	2020-03-27 14:07:30 -07:00
snipe	aded2193a2	Added aria-hidden="true" to top navigation elements	2020-03-27 13:29:00 -07:00
snipe	6d99b2a68c	Added “skip to content” link	2020-03-27 13:28:48 -07:00
snipe	55a619778f	Added language header	2020-03-25 16:32:33 -07:00
snipe	039f5da0e1	Add image upload to user edit [ch10508] (#7877) ... * Use correct Request include * Updated to use additional form request * Added SVG sanitizer * Added response method to form request * Allow ImageUploadRequest to accept fieldname params, added SVG sanitization, fixed delete * Fixed upload path for avatars * Added fieldname variable to blade partial for image upload * Added enctype="multipart/form-data" to form to allow uploads * Added image field * Updated Request::old() to use $request->old() * Fixed derp in edit blade referring to $item when it should be $user * Added svg+xml to image rule	2020-03-05 18:00:24 -08:00
snipe	d1a8d76d85	Set maxlength in password reset form to 250	2020-03-04 22:06:43 -08:00
snipe	03c5a42f5a	Fixes for flysystem paths :(	2020-02-11 20:22:55 -08:00
snipe	46a138c64b	Fixed id to statuslabel in sidenav	2020-02-10 12:36:48 -08:00
Fabian Grutschus	5becb93e6c	Added: allow appending of domain name to username when user tries to login (#7790)	2020-02-04 12:47:49 -08:00
Ivan Nieto	ab36784edd	Added a parameter that http://snipe-it.app/fields expected, without it that functionality was broken (#7687) ... Nice!	2019-12-30 20:18:47 -08:00
snipe	b5db0b22f8	Switched to Request facade ... I don’t know why my greps keep missing this shit.	2019-12-10 19:47:54 -08:00
snipe	296de34e8a	WIP: Upgrade develop to Laravel 6.6.1 (#7637) ... I'm going ahead and merging this, since the upgrade doesn't break Flysystem any worse than the current develop is broken, so far as I can tell. * Upgraded framework to Laravel 6 ### TO DO: - Fix password restriction rules- the old library isn’t compatible with Laravel 6 :( - Figure out why in-app API calls are returning “Unauthorized” * More updates from Input:: to Request:: helper * Switch to Request:: from Input * Added passport config * Fixed goofy password minimum in seeder * Added laravel/helpers * Changed ($item) to ($item->id) in forms I have no idea why this is necessary * Changed ($item) to ($item->id) in forms * Updated API middleware to auth:api * Updated with added laravel auth.php values * FIxed *&!^$%^&$^%!!!! ajax issue * Switch to Request::get from Input::get * Switched to Request facade * Added password security minimums back in The package we were using has not been updated to Laravel v6, so I created custom validators instead * Added language strings for error messages for password rules * Fixed `($item)` issue in formActions for partials	2019-12-10 19:32:50 -08:00
snipe	88fb1370f0	Added slightly friendlier error handling for assets without models ... This scenario should never happen, barring someone manually editing their data, but better to handle that scenario in a more user-friendly way.	2019-12-06 18:17:03 -08:00
snipe	de0b5a6149	Fixes #6440 - quote marks in the right place	2019-12-06 11:04:16 -08:00
Dustin B	8fd4e35244	Closes #6440 Print All Assigned - New Tab (#7135) ... Should add the functionality to, by default open in a new tab and not reference back to the source page. Reduces overhead and should resolve #6440. Untested, need confirmation.	2019-12-06 11:00:01 -08:00
Valentyn Tulub	6ad1f51673	Added #6489: show asset assignments under user assignments (#7293) ... * Add a setting to show assets assigned to other assets #6489 * Update user's views to show assets assigned to other assets #6489 * Add ukrainian and russian translation for the feature #6489 in settings	2019-12-06 10:57:48 -08:00
snipe	88cf456386	Adding Dept to license seats (#7609) ... * Adding Dept to license seats * Added query scope to order by department * Make license seat department sortable * Disable license seat internal search - this never actually worked	2019-11-21 22:03:56 -08:00
snipe	d8049209ca	Fixed bug where deleted consumable would throw an error on print page	2019-11-21 21:43:54 -08:00
snipe	5290c47e2a	Merge branch 'develop' into v5-master-develop-integration ... # Conflicts: # .env.example # .travis.yml # Dockerfile # README.md # app/Console/Commands/LdapSync.php # app/Console/Kernel.php # app/Http/Controllers/AccessoriesController.php # app/Http/Controllers/Api/AccessoriesController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Assets/AssetFilesController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/CategoriesController.php # app/Http/Controllers/CompaniesController.php # app/Http/Controllers/ComponentsController.php # app/Http/Controllers/ConsumablesController.php # app/Http/Controllers/DepartmentsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/LocationsController.php # app/Http/Controllers/ManufacturersController.php # app/Http/Controllers/ReportsController.php # app/Http/Controllers/SettingsController.php # app/Http/Controllers/SuppliersController.php # app/Http/Controllers/UsersController.php # app/Http/Middleware/EncryptCookies.php # app/Http/Requests/AssetRequest.php # app/Http/Transformers/AssetMaintenancesTransformer.php # app/Importer/AssetImporter.php # app/Models/AssetMaintenance.php # app/Models/Location.php # app/Models/User.php # composer.json # composer.lock # config/backup.php # config/database.php # config/version.php # public/mix-manifest.json # resources/lang/en-ID/general.php # resources/lang/vi/admin/settings/general.php # resources/views/accessories/edit.blade.php # resources/views/hardware/view.blade.php # resources/views/layouts/default.blade.php # tests/api/ApiCategoriesCest.php	2019-11-18 19:49:39 -08:00
snipe	22d2ad9248	Fixes nested location selectlist (#7483) ... * Rename child locations method * Use Ajax dropdown for locations selectlist for edit/create * Removed locations database call on edit/create blades for faster loading * Updated locations controller to use the new iterator * Increase pagination on locations controller to 500 We’re already loading all of that data up beforehand anyway, so no point in keeping the query smaller. * Fixed the else to make codacy happy * Improve the design and performance of the nested location selectlist (#7484) * Improve the design and performance of the nested location selectlist * Fixed parse errors * Removed debugging code/comments	2019-10-02 03:56:56 -07:00
Martin Berg	3dcef9aac9	Add support for custom remote user header (#7370)	2019-09-03 11:07:26 -07:00
Logan Swartzendruber	4c8b26f732	Implement #3088: Add "Generate Label" option to "Actions" dropdown menu in individual Asset Details view. (#7388) ... * Implement #3088: Add "Generate Label" option to "Actions" dropdown menu in individual Asset Details view. * Add conditional for including the asset number in the URL of the barcode image. * Change case of variables to pass Codacy PR review standards.	2019-09-03 11:02:55 -07:00
snipe	60bb385cf7	Make status label required	2019-08-14 23:46:09 -07:00
snipe	47724d7268	Make error text color match	2019-08-14 23:46:00 -07:00
snipe	c9f9a60354	Fixed asset tag error message alignment	2019-08-14 23:28:01 -07:00
snipe	441ae69f5c	Integrations/develop into master (#7352) ... * Fixes #6204 - added email alerts and web/API access to assets due for audits (#6992) * Added upcoming audit report TODO: Fid diff/threshold math * Added route to list overdue / upcoming assets via API * Controller/API methods for due/overdue audits We could probably skip this and just handle it via view in the routes… * Added query scopes for due and overdue audits * Added audit due console command to kernel * Added ability to pass audit specs to main API asset search method * Added audit presenter * Added bootstrap-tables presenter formatter to display an audit button * Added gated sidenav items to left nav * Added audit due/overdue blades * Cleanup on audit due/overdue console command * Added language strings for audit views * Fixed :threshold placeholder * Removed unused setting variable * Fixed next audit date math * Added scope for both overdue and upcoming * Derp. Wrong version * Bumped version (I will release this version officially tomorrow) * Leave the activated state for users alone in normal LDAP synchronisation. (#6988) * Fixed #7003 - crash when warranty months or purchase date is null * Fixed #6956 - viewKeys policy inconsistent (#7009) * Fixed #6956 - Added additional gates show showing/hiding license keys * Modified gate to allow user to see licenses if they can create or edit the license as well * Added API middleware to API routes to enable throttling TODO: Figure out how to make this costumizable without touching the code * Import locations from CSV via command line (#7021) * Added import locations command * Small fixes to location importer * Added country, LDAP OU * Cleaned up comments, added more clarification to what the script does * Added ability to update groups via API Fixes [ch9139] * Bumped version * Fixed #6883 - remove escaping of fields on LDAP import * Fixed #6880 - correctly encrypt encrypted fields via the API * Fixes #5054: LDAP users deactivated for none-ad (#7032) When using none-AD ldap, users are automatically deactivated every LDAP sync. This commit changes the behaviour so that if the active flag isn't set, the users are enabled. Fixed #5054, at least for 4.X * Updated packages - Updating erusev/parsedown (v1.7.2 => 1.7.3): Downloading (100%) - Updating squizlabs/php_codesniffer (3.4.1 => 3.4.2): Downloading (100%) - Updating symfony/polyfill-mbstring (v1.10.0 => v1.11.0): Downloading (100%) - Updating symfony/var-dumper (v3.4.23 => v3.4.27): Downloading (100%) - Updating league/flysystem (1.0.50 => 1.0.51): Downloading (100%) - Updating symfony/translation (v3.4.23 => v3.4.27): Downloading (100%) - Updating nesbot/carbon (1.36.2 => 1.37.1): Downloading (100%) - Updating symfony/debug (v3.4.23 => v3.4.27): Downloading (100%) - Updating symfony/console (v3.4.23 => v3.4.27): Downloading (100%) - Updating symfony/finder (v3.4.23 => v3.4.27): Downloading (100%) - Updating symfony/polyfill-ctype (v1.10.0 => v1.11.0): Downloading (100%) - Updating symfony/polyfill-php70 (v1.10.0 => v1.11.0): Downloading (100%) - Updating symfony/http-foundation (v3.4.23 => v3.4.27): Downloading (100%) - Updating symfony/event-dispatcher (v3.4.23 => v3.4.27): Downloading (100%) - Updating symfony/http-kernel (v3.4.23 => v3.4.27): Downloading (100%) - Updating symfony/process (v3.4.23 => v3.4.27): Downloading (100%) - Updating symfony/routing (v3.4.23 => v3.4.27): Downloading (100%) - Updating symfony/polyfill-util (v1.10.0 => v1.11.0): Downloading (100%) - Updating symfony/polyfill-php56 (v1.10.0 => v1.11.0): Downloading (100%) - Updating symfony/psr-http-message-bridge (v1.1.1 => v1.1.2): Downloading (failed) Downloading (100%) - Updating rollbar/rollbar (v1.7.5 => v1.8.1): Downloading (100%) - Updating symfony/yaml (v3.4.23 => v3.4.27): Downloading (100%) - Updating symfony/browser-kit (v3.4.23 => v3.4.27): Downloading (100%) * Fixed #7044 - API update deleted custom fields if they are not re-presented * Fixed XSS vulnerability when creating a new categories, etc via modal on create Same fix as before, because of the weird select2 post-parsing ajax behavior * Updated email strings * Fixed #7046 - added user website url back into UI * Updated language strings * Bumped version * Updated packages * New backups config for spatie * Removed debugbar service provider (autodiscovery) * Use laravel v5.5 withCount manual aliases * Added spatie language files * Removed old laravel backups config This config file was renamed in a newer version of spatie laravel-backup * Set the serialization * Added the command loader to console kernel * Renamed fire() to handle() * Updated withCount to use manual naming * Updated backup path in backup admin * Updated travis with new php versions * Bumped laravel version in readme * Fixed custom field edit screen * Fixed baseUrl is undefined error I literally cannot figure out how this ever worked before. * Fix for included files in backup * Bumped version * Switch has() to filled() * Change ->has() to ->filled() * Removed cosole log * Bumped packages * Use getReader instead of fetchAssoc for CSV parser https://csv.thephpleague.com/9.0/upgrading/ * Handle JSON validation errors like 5.4 * Handle JSON validation errors like 5.4 * Handle JSON validation errors like 5.4 * Trying to fix ajax asset validation This I think gets us closer, but still not handling the validation on the asset properly. When I do a print_r of the validation in the other items, its looking for an error bag that looks something like this: ``` Illuminate\Support\MessageBag Object ( [messages:protected] => Array ( [name] => Array ( [0] => The name field is required. ) [seats] => Array ( [0] => The seats field is required. ) [category_id] => Array ( [0] => The category id field is required. ) ) [format:protected] => :message ) ``` Currently the Assets ajax returns: ``` [2019-05-24 06:52:06] develop.ERROR: array ( 'messages' => array ( 'model_id' => array ( 0 => 'The model id field is required.', ), 'status_id' => array ( 0 => 'The status id field is required.', ), 'asset_tag' => array ( 0 => 'The asset tag field is required.', ), ), ) ``` So not sure why it’s not working. * Fixed missing asset validation * Check that a model exists before trying to fiddle with fieldsets * Tidied up license check * Removed extra escaping on checkin * Updated importer to work with newer CSV Reader::getRecords() method * Fixed field mapping * Small fix for reordering fields Fixes Illuminate\Database\QueryException: SQLSTATE[23000]: Integrity constraint violation: 1048 Column 'order' cannot be null (SQL: insert into `custom_field_custom_fieldset` (`custom_field_id`, `custom_fieldset_id`, `order`, `required`) values (12, 7, , 0)) [ch1151] This needs revisiting for a more solid fix, especially for data that was already entered bad. * Fixed bug where sorting by company name in Users API did not work Fixes [ch9200] * Removed custom fields from AssignedSearch to prevent confusing data in selectlist Fixes [ch9193] * Removed alert-danger from tests * Fixed missed consumables_count withCount() statement * Fixed Undefined variable user in $backto if checked out to a non-user Fixes [ch9194] * Check for valid model before attempting to access fieldsets Fixes [ch1249] * Only build the log upload destination path if there is a matching record Fixes [ch1232] * Fixed free_seats_count variable name (I forgot that Laravel switched camel case to snake case for their old 5.4 withCount variables) * Only gtry to delete the file if a record is found in the log * Only try to get fieldset if model is valid * Fixed more camel-casing -> snake-casing * Only display the file if the log record can be found * Fixed casing in sync command * Updated README * Derp - typo * Added link to Atlassian plugin * More Atlassian clarifications * Show accessory image on view page * Increased image size to 800px, added lightboxes * Fixed #7083 - Removed user_exists constraint on department save If the user has been deleted, this prevented the department from being successfully saved on edit * Updated branch in version file * Dockerfile update to bring us up to php v7.1 for Laravel 5.5 (#7084) * bump up to php7.1 & change deprecated MAINTAINER to a LABEL so it is visible with `docker inspect` * AND modapache >< * 2 updates required to get software-properties+ppa * Bumped version * Bumped release again :( * Missed one * Fixed #7098 - updated backup config for deleteFile() method * Fixed #7092 - handle weird port forwarding/port numbers for baseUrl * Bumped version * Fixed #7099 - set email to null by default for backup notifications * Removed old comments * Fixed #7100 - Check if $user isset on checkin * Increased throttle to 120 requests per minute * Added Filipino, corrected order for Spanish variations * Update language strings * Bumped hash * Changed has to filled to fix bulk asset editing * Bumped point version * Small fixes for phpleague CSB reader v9 * Improved error checking in locations importer * Fixed #7145 - rename groups table to permissions_group for mysql 8 reserved word compatibility * Reduce minimum group name length to 2 (from 3) eg: IT * Back in time fix FOR #7145 for new installs on MySQL 8+ * Fixed permission insert //TODO Handle this via model * Possible fix for reporting/admin migration back in time * Fixed #7164 - change table name to permission_groups * Fixed LDAP password blanking on save * fixing previous commit's actual wiping of password (#7183) replaced Input::fille('ldap_pword') with _filled_. Should be good to go. https://github.com/snipe/snipe-it/issues/7179 https://github.com/snipe/snipe-it/issues/7169 * Bumped version * Downgrading rollbar for Laravel 5.5 * Spelling Correction (#7206) Fixed Spelling for the word reqrite, to be rewrite. * Fix #6910: Add logic to manipulate the eloquent query. (#7006) * Added company_id to consumables_users table * Added logic to manage when a pivot table doesn't have the column company_id trough a join with users * Remove a migration that tries to fix this problem, but is not longer necessary * Addresses #7238 - add PWA code to layout Needs additional UX testing * Better log message for bad LDAP connection * Fixed #7186 - has vs filled in User’s API blanking out groups if no group_ids are passed * Comment clarification on #7186 * Check for valid seat on hardware view * Added space between footer and custom message * Cap warranty months to three characters Filles rollbar 209 * Cap warranty months to 3 on the frontend blade * Fixed countable() strings on user destroy * Check that the user has assets and that the aset model is valid * Bumped hash * Caps asset warranty to 20 years * Command to fix custom field unicode conversion differences between PHP versions (#7263) * Fixes #7252 form request changes (#7272) * Fixes for #7252 - custom fields not validating / no validaton messages in API w/form requests * Removed debug info * More fixes for #7252 This is mostly working as intended, if not yet the way Laravel wants us to do it. Right now, the API returns correctly, and the form UI will return highlighted errors, with the input filled in ~sometimes~. I’m not sure why it’s only sometimes yet, but this is potentially progress. * Removed experimental method * Check for digits_between:0,240 for warranty * Removed debug code * Apply fix from PR #7273 to master * Bumped hash * Fixed #7250 - permission issue for API fieldsets and fields endpoints This applies the change from #7294 to master * Add @mskrip as a contributor * Fixed #7270 - Checking-in Assets via API Removes the Item's Asset Name * CORS for api (#7292) * Added CORS support to API * Changed order so CORS will still work if throttle hit * Added APP_CORS_ALLOWED_ORIGINS env option * Fixed typo * Clarified header comments * More clarification * DIsable CORS allowed origins by default to replicate existing behavior * Change variable name to be clearer * Bumped version * Added condition to deal with fieldname 'rtd_location' which can be tried to be queried in some places and doesn't exist in database (#7317) * Added comments to the ByFilter query scope for clarity * Added accessories checkout/checkin API endpoint * Fixed CVE-2019-10742 https://nvd.nist.gov/vuln/detail/CVE-2019-10742 * Update README.md (#7334) Add reference to CSV importer. * Group related variables in .env * History importer fixes * Fixes to history importer	2019-08-14 21:48:14 -07:00
snipe	8b4a9aa382	Fixes to history importer	2019-08-13 18:15:42 -07:00
snipe	0e93495ca2	Check that the user has assets and that the aset model is valid	2019-07-17 17:51:35 -07:00
snipe	77a6f6f400	Cap warranty months to 3 on the frontend blade	2019-07-17 12:15:15 -07:00
snipe	fecf8015a1	Added space between footer and custom message	2019-07-17 12:09:32 -07:00
snipe	79ab0d8dc2	Check for valid seat on hardware view	2019-07-17 12:09:18 -07:00
snipe	6736b1c4e7	Addresses #7238 - add PWA code to layout ... Needs additional UX testing	2019-07-15 13:49:56 -07:00
snipe	087cdd859e	Fixed #7092 - handle weird port forwarding/port numbers for baseUrl	2019-05-29 14:57:58 -07:00
snipe	2dd31544fe	Increased image size to 800px, added lightboxes	2019-05-24 19:11:08 -07:00
snipe	237acdcff0	Show accessory image on view page	2019-05-24 18:22:57 -07:00
sreyemnayr	f85ac97d8c	Feedback for Kits; Fix checkins for accessories (#7060) ... * Kits feedback * Fix accessory checkin	2019-05-23 19:39:30 -07:00
snipe	f6ef139111	Fixed baseUrl is undefined error ... I literally cannot figure out how this ever worked before.	2019-05-23 16:56:22 -07:00
snipe	b2eacb147b	Fixed #7046 - added user website url back into UI	2019-05-21 18:55:12 -07:00
Ivan Nieto	e40a5a70a5	RTF support added (#7024) ... * Added the Gatte Facade to AssetsController * Added the filetype RTF in the modal to upload files * Added validation of RTF files	2019-05-15 15:47:40 -07:00
snipe	d016076806	Fixed #6956 - viewKeys policy inconsistent (#7009) ... * Fixed #6956 - Added additional gates show showing/hiding license keys * Modified gate to allow user to see licenses if they can create or edit the license as well	2019-05-08 08:14:49 -04:00
snipe	407445456a	Merge branch 'features/6204_email_audit-alerts' into develop ... # Conflicts: # app/Console/Commands/LdapSync.php # app/Console/Kernel.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/LicensesController.php # composer.json # composer.lock # config/version.php # resources/views/auth/two_factor_enroll.blade.php	2019-05-06 08:45:13 -04:00
snipe	e5c2d77c7d	Fixes #6204 - added email alerts and web/API access to assets due for audits (#6992) ... * Added upcoming audit report TODO: Fid diff/threshold math * Added route to list overdue / upcoming assets via API * Controller/API methods for due/overdue audits We could probably skip this and just handle it via view in the routes… * Added query scopes for due and overdue audits * Added audit due console command to kernel * Added ability to pass audit specs to main API asset search method * Added audit presenter * Added bootstrap-tables presenter formatter to display an audit button * Added gated sidenav items to left nav * Added audit due/overdue blades * Cleanup on audit due/overdue console command * Added language strings for audit views * Fixed :threshold placeholder * Removed unused setting variable * Fixed next audit date math * Added scope for both overdue and upcoming * Derp. Wrong version * Bumped version (I will release this version officially tomorrow)	2019-05-05 22:32:52 -04:00
snipe	e4a298ca2a	Added scope for both overdue and upcoming	2019-05-05 22:13:30 -04:00
snipe	00a8a2aff3	Fixed next audit date math	2019-05-05 20:00:05 -04:00
snipe	7d416d1175	Fixed :threshold placeholder	2019-05-05 19:57:23 -04:00
snipe	e9b9301efb	Added language strings for audit views	2019-05-05 19:35:20 -04:00
snipe	4369d6adc6	Added audit due/overdue blades	2019-05-05 19:21:48 -04:00
snipe	69614a7db4	Added gated sidenav items to left nav	2019-05-05 19:21:26 -04:00
snipe	8154d1116c	Added bootstrap-tables presenter formatter to display an audit button	2019-05-05 19:21:06 -04:00
snipe	e46cccdf90	Added upcoming audit report ... TODO: Fid diff/threshold math	2019-05-04 17:52:17 -04:00
ajsy	0cdc7af611	Update print.blade.php	2019-05-03 15:22:01 +03:00
snipe	ce16eae508	Merge branch 'master' of https://github.com/snipe/snipe-it	2019-05-02 15:20:52 -07:00
snipe	dc73dbfbfd	Fixed #6911 - note must be a string on license checkin	2019-05-02 15:20:47 -07:00
ajsy	878cfee5a2	Revert "Delete print.blade.php" ... This reverts commit a0721412fa.	2019-04-20 09:28:48 +03:00
ajsy	a0721412fa	Delete print.blade.php	2019-04-19 15:50:05 +03:00
ajsy	52add03e56	Update print.blade.php ... replace string in serial number with x except last five character	2019-04-19 15:43:40 +03:00
ajsy	c974968821	Update view.blade.php	2019-04-19 14:03:09 +03:00
ajsy	f2242fa32e	Update view.blade.php	2019-04-19 13:20:41 +03:00
snipe	420e8bc85a	Allow phone number to be changed in Profile	2019-04-18 14:13:50 -04:00
snipe	ded1a59914	Removed help text for email images (since we embed them by default now) ... Added help text for username format	2019-04-02 18:22:31 -07:00
snipe	37b8029d04	Fixed parse error on label settings ... Also fixed [ch1362] - moving left/right	2019-04-02 18:04:31 -07:00
snipe	d01f9a701c	Fix double-encoding issue? ... I assume there’s something new in Laravel 5.7/5.8 that’s causing the double escaping. I’m not seeing it everywhere, which is more confusing, TBH. :-/	2019-03-20 04:12:03 -07:00
snipe	bca82684a1	Merge branch 'hotfixes/2fa_qr' into develop ... # Conflicts: # .all-contributorsrc # Dockerfile # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/ImportController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CategoriesController.php # app/Http/Controllers/CompaniesController.php # app/Http/Controllers/DepartmentsController.php # app/Http/Controllers/ImportsController.php # app/Http/Controllers/LocationsController.php # app/Http/Controllers/ManufacturersController.php # app/Http/Controllers/SuppliersController.php # app/Http/Requests/ItemImportRequest.php # app/Http/Transformers/ActionlogsTransformer.php # composer.json # composer.lock # config/app.php # config/version.php # docker/startup.sh # public/css/build/all.css # public/css/dist/all.css # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/dist/all.js # public/mix-manifest.json	2019-03-20 02:17:02 -07:00
snipe	da015ec4a8	Fixed #6834 and #6402 - use inline QR code generation for 2FA (#6840) ... * Fixed #6834 and #6402 - use inline QR code generation for * Update auth controllers to use translations * Updated composer lock * Added comments * Moar comments * Typo	2019-03-20 01:24:31 -07:00
snipe	a874dbb0d0	Working attempt, but will try with old library for mininal footprint	2019-03-19 23:18:16 -07:00
snipe	0e1289f12f	Fixes #6821 - fixed 2 fa active for users list (#6822) ... * Fixed #6821 - confusing UI for 2FA when 2FA is universally enforced I also updated the language in the user’s listing table to clarify what “activated” means * Added login enabled info to user view * Clarified comments * Added info about 2FA on user profile Because why not * Added nowrap to table, and added 2FA reset for superadmins	2019-03-18 11:59:02 -07:00
snipe	7b33f95e83	Fixes/import permissions mask (#6826) ... * Check for empty headers in import * Added import permission * Fixed model path in docblock * Added import gate to default blade * Check if the user is an admin OR idf they have import permissions * Walked back that admin permission Since admins are bound by full company support, it makes less sense to let admins have this permission by default, versus having them specifically designated to the import permission	2019-03-18 11:58:08 -07:00
Tim Farmer	5893e25b43	Label bugs in alerts settings (#6808) ... * Label bugs in alerts settings Found another label bug where the alert_email label should be alerts_enabled. * Update alerts.blade.php	2019-03-14 10:53:05 -07:00
snipe	0b927623e8	Added “record created” string for clarification in asset/license history	2019-03-13 22:06:57 -07:00
Ivan Nieto	c7f48951a9	Valo/checkin date in history of asset (#6733) ... * To see checkin/checkout Date in History of Asset * Added some logic to get today's date if the checkin_at input is blank * Updating the action_date taking the value from the action_log table * Hide created_at field and rename 'Action Date' as only 'Date'	2019-03-13 21:36:32 -07:00
snipe	55f727ef28	Fixed HTML labels on alerts setting page ... Originally https://github.com/snipe/snipe-it/pull/6808/ by @timothyfarmer - I also updated the error class logic in the same block	2019-03-13 19:53:23 -07:00
snipe	6c71e72dcd	Fixed labels labels (wha?) ... Wrong HTML labels for some fields in the Settings > Labels page. Originally https://github.com/snipe/snipe-it/pull/6809 by @timothyfarmer but it was made against the wrong branch	2019-03-13 19:50:35 -07:00
snipe	1b0d855c00	Added translation, removed commented out code	2019-03-13 12:15:48 -07:00
ajsy	03c5b8e4ab	Create print.blade.php	2019-03-09 11:36:42 +03:00
ajsy	a958d56590	Update view.blade.php	2019-03-09 11:29:06 +03:00
snipe	7e8d337ed5	Moved kit icon	2019-03-08 16:49:05 -08:00
snipe	400907cc40	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2019-03-08 16:24:12 -08:00
snipe	61afdeac2e	Merge branch 'develop' of https://github.com/VELIKII-DIVAN/snipe-it into VELIKII-DIVAN-develop	2019-03-08 16:18:48 -08:00
Martin Meredith	55cbbf2b00	Fixes #6794: Fix URLs to access some 'missing' images (#6795) ... * Fix image path for Model view * Fix URLs for images in account view * Fix Supplier view Image URL	2019-03-08 12:47:37 -08:00
Martin Meredith	daf6d98a3b	Remove test data for Pie (#6793)	2019-03-08 12:46:47 -08:00
Tim Farmer	7deab0f53b	Label bugs in general settings (#6801) ... * checkbox label bug The checkbox label in general settings for require_accept_signature was set to full_multiple_companies_support instead so when you click the label for require accept signature it would check the wrong box. * Update general.blade.php * Update general.blade.php Another label that is wrong in general settings	2019-03-08 12:24:24 -08:00
Steffen	e1907e30b1	Allow multiple upload fields and add logo option to labels (#6736) ... * Change upload js to work with multiple upload elements on a single page * Change uploadFile in upload modal and form partial * Change uploadFile to js-uploadFile to avoid potential issues in the future * Remove duplicate style attribute causing webpack to fail * Missed a css class in rename to js- prefix * - Move logo uploads to partial for eaiser usage - Add label logo - Add css classes to label elements - Change label prefix text (M: S: ...) to css::before content for easy removal in config * Add more css classes to labels * Allow unescaped " (quot) in css ouput * Add max size param to partial, set defaults for allowedType and size	2019-03-01 15:25:42 -08:00
Dmitrii Minaev	16bb784e78	Codestyle & bug fixes	2019-02-28 01:37:58 +03:00
snipe	c47fa5ad1c	Fixed missing @endcan	2019-02-26 19:14:28 -08:00
Dmitrii Minaev	5f3a0bdea5	app\Services\PredefinedKitService.php rename to app\Services\PredefinedKitCheckoutService.php ... add accessories and consumables tables add selectlist api to: app\Http\Controllers\Api\AccessoriesController.php app\Http\Controllers\Api\ConsumablesController.php app\Http\Controllers\Api\LicensesController.php templates for selectlist apply kit to user works	2019-02-19 22:19:00 +03:00
snipe	0000f487ac	Merge remote-tracking branch 'origin/fixes/password_confirmation_6703' into develop ... # Conflicts: # config/version.php	2019-02-13 23:02:21 -08:00
snipe	35ebe33e4e	Fixed #6703 - fixes password confirmation (#6711) ... * Fixed #6703 - fixes password confirmation * Removed debugging * Fixed tests * I guess we use 10 as the settings for password min in tests * One more try to fix tests - confirmation won’t validate until password validates	2019-02-13 23:01:19 -08:00
snipe	230c9da1df	Fixed #6703 - fixes password confirmation	2019-02-13 21:30:15 -08:00
snipe	35898e4ca0	Added asset tag to maintenances report	2019-02-13 07:09:16 -08:00
snipe	533649f24e	Merge branch 'develop' into dev-master-integration ... # Conflicts: # .gitignore # .travis.yml # app/Console/Commands/LdapSync.php # app/Console/Commands/SendExpectedCheckinAlerts.php # app/Console/Commands/SendExpirationAlerts.php # app/Console/Commands/SendInventoryAlerts.php # app/Console/Kernel.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/ManufacturersController.php # app/Http/Controllers/Api/StatuslabelsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetMaintenancesController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/ForgotPasswordController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/Auth/ResetPasswordController.php # app/Http/Controllers/ReportsController.php # app/Http/Controllers/SettingsController.php # app/Http/Controllers/UsersController.php # app/Http/Transformers/AssetMaintenancesTransformer.php # app/Importer/Importer.php # app/Importer/ItemImporter.php # app/Importer/UserImporter.php # app/Importer/import_mappings.md # app/Models/Ldap.php # app/Models/License.php # app/Models/Location.php # app/Models/Recipients/AlertRecipient.php # app/Models/User.php # app/Providers/AppServiceProvider.php # composer.json # composer.lock # config/trustedproxy.php # config/version.php # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/dist/all.js # public/mix-manifest.json # resources/assets/js/components/importer/importer-file.vue # resources/lang/ar/admin/settings/general.php # resources/lang/bg/admin/settings/general.php # resources/lang/en-ID/admin/settings/general.php # resources/lang/en-ID/passwords.php # resources/lang/en/passwords.php # resources/lang/es-CO/passwords.php # resources/lang/es-ES/passwords.php # resources/lang/es-MX/passwords.php # resources/lang/es-VE/passwords.php # resources/lang/fi/admin/settings/general.php # resources/lang/id/admin/settings/general.php # resources/lang/id/passwords.php # resources/lang/ja/passwords.php # resources/lang/nl/passwords.php # resources/lang/pl/admin/settings/general.php # resources/lang/pl/passwords.php # resources/lang/pt-BR/admin/settings/general.php # resources/lang/pt-BR/passwords.php # resources/lang/ru/admin/settings/general.php # resources/lang/ru/admin/statuslabels/table.php # resources/lang/ru/passwords.php # resources/lang/sr-CS/general.php # resources/lang/sr-CS/mail.php # resources/lang/sv-SE/admin/settings/general.php # resources/lang/tr/admin/settings/general.php # resources/lang/tr/passwords.php # resources/lang/vi/admin/models/message.php # resources/lang/vi/admin/users/general.php # resources/lang/zh-CN/admin/settings/general.php # resources/views/importer/import.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/partials/forms/edit/image-upload.blade.php # resources/views/users/edit.blade.php # resources/views/users/view.blade.php # tests/unit/ImporterTest.php	2019-02-13 06:42:52 -08:00
snipe	2768ea692e	Removed extraneous js call	2019-02-13 04:24:37 -08:00
snipe	35e60fd151	Updated languages	2019-02-13 03:56:18 -08:00
herroworrd	3f7d2aebc7	Fixed #6634: Asset Import History fixes and optimizations (#6657) ... * Starting work on asset history importer. * Starting work on asset history importer. * Added checkin target. * Last change... importing history should also probably be an admin only task. * Added caching for user and asset queries. * Updated cache keepalive time to DateTimeInterface * Updated cache keepalive time to DateTimeInterface	2019-02-08 16:05:56 -08:00
Dmitrii Minaev	e01e0c5596	Add licenses, accessories and consumables table presenters app\Presenters\PredefinedKitPresenter.php resources\views\partials\bootstrap-table.blade.php ... Add refresh licenses, accessories and consumables tables refresh when add a new element resources\assets\js\snipeit_modals.js Some design fixes resources\views\kits\edit.blade.php Add default value to form (template) resources\views\modals\kit-model.blade.php New routes for kit accessories and kit consumables routes\api.php New routes for kit models, kit accessories and kit consumables routes\web\kits.php New templates	2019-01-27 23:19:24 +03:00
snipe	9d21fc85bc	Fixed #6644 - asset name not linked in Reports > Asset Maintenance Report	2019-01-25 20:59:54 -08:00
snipe	194d0733d4	Fixed #6644 - asset name not linked in Reports > Asset Maintenance Report ... This report will likely be deprecated.	2019-01-25 20:57:14 -08:00
Ivan Nieto	7d982c9ea6	Import page is blank [ch90] (#6636)	2019-01-24 15:34:50 -08:00
Ivan Nieto	310ed0f1d3	Fix an issue when trying to checkin a license seat. [ch46] (#6599) ... * Fix an issue when trying to checkin a license seat. * Minor changes in the checkin view, so it can returns to the expected place where the checkin is launched.	2019-01-17 20:36:40 -08:00
snipe	1eace04ad9	Handle asset maintenances that do not have a valid asset associated	2019-01-16 02:26:42 -08:00
snipe	c055e3af21	Only try to return the asset tag link if a valid asset id has been passed	2019-01-16 02:19:35 -08:00
omyno	f0500e9797	Show user's signature in print view (#6471)	2019-01-15 14:03:40 -08:00
Wes Hulette	3e19509a49	Fixed: #6395 - Adjusted graph size (#6518) ... * Fixed missing oauth tables during setup. * Merge remote-tracking branch 'snipe-it-upstream/develop' into develop * Merge remote-tracking branch 'snipe-it-upstream/develop' into develop Merge remote-tracking branch 'origin/develop' into develop * Fixed Pie Graph sizing on dashboard Updated chart.js to 2.7.3 Added height to canvas	2019-01-15 14:02:49 -08:00
snipe	394d265b96	Added XML to uploadable file type - re: #6099	2018-12-12 16:45:09 -08:00
Wes Hulette	b38d07064b	Fixed: #5896 Custom fields of type "CUSTOM REGEX" are always saved as "ANY" (#6381) ... * Fixed missing oauth tables during setup. * Custom fields of type "CUSTOM REGEX" are always saved as "ANY" Fixes #5896 * Updated per PR Fixed spelling * Fixed logic error Moved conditional code from view to controller Added getFromatType function for dropdown	2018-12-06 20:05:04 -08:00
Wes Hulette	34246ee4ef	[WIP] v5 Develop: New LDAP implementation (#6352) ... * Fixed missing oauth tables during setup. * WIP New LDAP implementation * WIP New LDAP implementation * WIP New LDAP implementation Merge remote-tracking branch 'origin/WIP_LDAP' into WIP_LDAP * WIP New LDAP implementation Added Adldap2 to handle ldap intergration. * Updated per PR quality review * Added specific LDAP settings method * Corrected version number * Added return documentation * Added imports * Changed class to be injected into controller * Updated with PR suggestions	2018-12-06 14:05:43 -08:00
snipe	09c4dd4891	Added ability to upload favicon and email logo ... todo: refactor the image upload/resize for less copypasta	2018-12-05 19:56:12 -08:00
Minaev Dmitriy	0bbe499414	Kits checkout. But only with models.	2018-11-13 20:33:32 +03:00
Evgeny	dd7db95135	A couple hardcoded strings replaced in according with #6406 (#6412) ... Hardcoded strings was replaced with corresponding placeholders. Log statuses mentioned in #6406 wasn't translated cause it needs more separate complicated development	2018-11-08 15:20:44 -08:00
snipe	ea91d59ffc	Use username instead of email address in password reset (#6382) ... * Switch to use username instead of email * Fixed indenting * Updated password language * Updated blades to reflect username instead of email * Changed password/reset controllers to use username instead of email * Redirect to login page instead of repeating the password reset form	2018-10-31 18:03:24 -07:00
snipe	ce8d47b2b4	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2018-10-31 15:19:18 -07:00
snipe	65aef11ae3	Fixed #5879 - added user department filter for custom report	2018-10-31 15:19:13 -07:00
Tim Bishop	7835cc34c8	Insert audited items to the top of the list. (#6376) ... When doing a large number of items they soon disappear off the bottom of the screen. It's handy to be able to check the result as it's happening so adding them to the top of the list keeps the most recent items visible. Move the "Processing..." spinner to the header so it stays at the top.	2018-10-31 11:13:08 -07:00
snipe	2cecd5e056	One more fix for #6175 (non-accessories)	2018-10-31 10:23:47 -07:00
snipe	5da9120870	Fixed #6175 - crashing when accessory has been deleted ... My guess would be this crash (reported in #6175) was happening because of deleted accessories/accessory rows.	2018-10-31 10:23:32 -07:00
Minaev Dmitriy	9d5cd27575	New save mechanic	2018-10-31 16:06:38 +03:00
snipe	5faf8bfcd0	Fixed error on unaccepted asset report	2018-10-29 14:39:42 -07:00
snipe	f0e6a5c905	Fixed error on asset creation	2018-10-29 14:35:34 -07:00
snipe	e443a576f7	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2018-10-19 16:46:53 -07:00
snipe	20b26effdb	Fixed #6349 - add view permission for print all assigned	2018-10-19 16:46:46 -07:00
snipe	1a10aa0dda	Fixed #6349 - add view permission for print all assigned	2018-10-19 16:43:28 -07:00
Minaev Dmitriy	f1f7694835	Merge remote-tracking branch 'remotes/upstream/develop' into develop	2018-10-19 19:00:53 +03:00
Minaev Dmitriy	0e66c3cb56	Predefined kits test	2018-10-19 17:30:25 +03:00
Wes Hulette	465b69516d	Fixed: #6259 - Remove remote JS/CSS file loading (#6330) ... * Fixed missing oauth tables during setup. * Remove remote JS/CSS file loading Updated gravatar to return to default image * Updated default avatar path to user url Removed local html5shim & response js files. Removed copying html5shim & respond js file to public directory	2018-10-17 12:52:01 -07:00
snipe	2ded2ff53a	Make dashboard snapshots clickable	2018-10-15 18:19:30 -07:00
snipe	74c20e62d5	Fixed - suppress the asset create button if the user is not allowed to create assets	2018-10-15 17:57:47 -07:00
snipe	0dbce93d1b	Better logic for disallowing company selection when user is not a superadmin and FCS is enabled	2018-10-15 17:57:28 -07:00
snipe	9797412d23	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2018-10-15 17:02:39 -07:00
snipe	6b6cf06530	Display asset name if one exists and the user cannot edit	2018-10-15 17:02:31 -07:00
snipe	539c3023b9	Added - check whether the user can edit an asset before allowing them to change the name on checkout	2018-10-15 16:52:45 -07:00
Joe Ferguson	704209de9c	Fixed #6301: Do not allow duplicate asset tags (#6324) ... * Fixed #6301: Do not allow duplicate asset tags * Display error message for single asset_tag failure	2018-10-11 17:15:09 -07:00
snipe	835b461d7d	Fixed #6323 - typo in link for low inventory	2018-10-11 15:31:10 -07:00
snipe	b8f8d49927	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2018-10-11 15:29:48 -07:00
snipe	63a2727077	Fixed #6323 - typo in link for low inventory	2018-10-11 15:29:38 -07:00
Ivan Nieto	5516978f2e	#5696 proposed fix (#6314) ... * Another 'or' caught in a blade template * Added the requireAcceptance() method in LicenseSeat.php. Changed the permission in checkout-license mail to view. * Getting right the permission in the view checkout-license	2018-10-11 14:08:09 -07:00
Wes Hulette	19ee62f704	Fixed: Missing JS file import (#6320) ... * Fixed missing oauth tables during setup. * Fixed missing JS import	2018-10-11 13:51:37 -07:00
snipe	c7596e7741	Fixed image not uploading on asset create	2018-10-09 17:31:52 -07:00
Wes Hulette	d715ecf41d	Fixed: Tooltips (#6309) ... * Fixed missing oauth tables during setup. * Fixed missing tooltips Updated spelling in bootstrap-table.blade.php to use bootstrap data element. Using custom jquery-ui without tooltips to fix conflict issue. * Removed custom jQuery ui file added fix in bootstrap.js file	2018-10-09 15:20:27 -07:00
Wes Hulette	6818901f7d	Fixed: Admin LTE left menu bar not working (#6308) ... * Fixed missing oauth tables during setup. * Updated per AdminLTE upgrade guide.	2018-10-09 15:20:12 -07:00
snipe	a516e4278e	Remove company select option if the user is not an admin and FCS is enabled	2018-10-05 07:30:42 -07:00
snipe	c21524f240	Fixed NaN when no asset tag is provided	2018-10-05 05:42:28 -07:00
snipe	ecb8204c3c	Associate serials with multiple asset creation	2018-10-05 05:30:13 -07:00
snipe	476b58632b	Handle array of asset tags ... TODO: figure out how to display validation errors more sanely	2018-10-05 04:34:47 -07:00
snipe	d4a97d0431	Increase max fields in multi-asset creation	2018-10-05 04:18:06 -07:00
snipe	ade9a0c995	Removed server-side validation right now ... Getting an unexpected keyword ‘export’ error. I’ll come back to this.	2018-10-05 03:47:58 -07:00
snipe	7e33051c7a	Remove console logging	2018-10-05 03:44:30 -07:00
snipe	4a448ba5f9	Increment tag based on first	2018-10-05 03:43:40 -07:00
snipe	8e90ed00d8	Added alt tags to logo	2018-10-05 03:43:16 -07:00
snipe	81d8c1cc52	Fixed remove-asset-tag javascript on asset edit, added server side validation support	2018-10-05 02:51:14 -07:00
snipe	4920dced6e	Enabled toggleDisabled on form validator	2018-10-05 01:12:14 -07:00
snipe	4a4fc38c43	Style updates	2018-10-05 00:57:18 -07:00
snipe	907d1d0f61	Validate if name is required	2018-10-05 00:46:27 -07:00
snipe	6f71abd0e0	Fixed improper html nesting	2018-10-05 00:45:58 -07:00
snipe	c1b0b8dee2	Move validator to main layout	2018-10-05 00:45:45 -07:00
snipe	a6449fa16e	Added jquery-form-validator	2018-10-04 23:50:57 -07:00
snipe	4cc1351bdd	More JS tweaks (WIP)	2018-10-04 23:37:52 -07:00
snipe	701beeac2a	Merge branch 'develop' into features/create_multiple_asset_tags_on_asset_create	2018-10-04 22:08:18 -07:00
snipe	6489081cd6	Pass variable to edit-form to determine whether we should have a top submit button ... This is just so very short forms don’t look too silly	2018-10-04 21:19:25 -07:00
snipe	408f9978e9	More help text updates	2018-10-04 21:14:45 -07:00
snipe	db765e4a0b	Reformatted help popover	2018-10-04 20:51:50 -07:00
snipe	54d916fd05	Pulled “more info” popover header into translated string	2018-10-04 20:41:09 -07:00
snipe	8d680d071b	Create help translation file	2018-10-04 20:37:49 -07:00
snipe	252341fd5c	Pulled help icon text into its own blade	2018-10-04 20:35:07 -07:00
snipe	3843764d15	Added save button at top of form as well	2018-10-04 20:24:53 -07:00
snipe	accafbf1eb	Added basic JS to edit blade	2018-10-04 19:28:56 -07:00
snipe	0a72751b37	Fixed issue where admin users could disable activation when editing their own profile	2018-10-04 02:23:12 -07:00
snipe	7a44da85a0	Fixed issue where admin users could disable activation when editing their own profile	2018-10-04 02:18:20 -07:00
snipe	90b8acdd3b	Merge branch 'V5_cleanup_js' of https://github.com/jwhulette/snipe-it into jwhulette-V5_cleanup_js ... # Conflicts: # public/mix-manifest.json	2018-10-03 00:56:09 -07:00
snipe	c8bff3ef38	Features/add manager and dept to importer (#6277) ... * Ignore the simlink for public storage * Added manager and department to user import * More UI importer tweaks * Fisxed typos	2018-10-02 15:43:54 -07:00
Wes Hulette	1742867df1	Removed inline signature.css ... Added to webpack	2018-10-01 08:20:31 -04:00
Wes Hulette	ce0a40a20c	Merge branch 'develop' into JS_Cleanup	2018-10-01 08:07:07 -04:00
snipe	79367642b1	[WIP] Added #5957 - Flysystem support (#6262) ... * Added AWS url to example env * Upgrader - added check for new storage path and attempt to move * Ignore symlink * Updated paths for models * Moved copy methods * Added AWS_URL support For some reasin, Flysystem was generating the wrong AWS url (with a region included) * Switch to Flysystem for image uploads * Nicer display of image preview * Updated image preview on edit blades to use Flysystem * Twiddled some more paths * Working filesystems config * Updated Asset Models and Departments to use Flysystem * Janky workaround for differing S3/local urls/paths * Try to smartly use S3 as public disk if S3 is configured * Use public disk Storage options for public files * Additional transformer edits for Flysystem * Removed debugging * Added missing use Storage directive * Updated seeders to use Flysystem * Default logo * Set a default width We can potentially override this in settings later * Use Flysystem for logo upload * Update downloadFile to use Flysystem * Updated AssetFilesController to use Flysystem * Updated acceptance signatures to use Flysystem * Updated signature view to use Flysystem This isn’t working 100% yet * Use Flysystem facade for displaying asset image * Set assets path Should clean all these up when we’re done here * Added Rackspace support for Flysystem * Added Flysystem migrator console command * Added use Storage directive for categories * Added user avatars to Flysystem * Added profile avatar to Flysystem * Added the option to delete local files with the migrator * Added a check to prevent people from trying to move from local to local * Fixed the selectlists for Flysystem * Fixed the getImageUrl method to reflect Flysystem * Fixed AWS copy process * Fixed models path * More selectlist updates for Flysystem * Updated example .envs with updated env variable names * *sigh* * Updated non-asset getImageUrl() methods to use Flysystem * Removed S3 hardcoding * Use Flysystem in email headers * Fixed typo * Removed camera support from asset file upload We’ll find a way to add this in later (and add that support to all of the other image uploads as well) * Fixed path for categories * WIP - Switched to standard handleImages for asset upload. This is currently broken as I refact the handleImages method. Because the assets store/create methods use their own Form Request, the handleImages method doesn’t exist in that Form Request so it wil error now. * Fixed css URL error * Updated Debugbar to latest version (#6265) v3.2 adds support for Laravel 5.7 * Fixed: Missing CSS file in basic.blade.php (#6264) * Fixed missing CSS file in basic.blade.php * Added * Changed stylesheet import for authorize.blade.php * Updated composer lock * Added AWS_BUCKET_ROOT as env variable * Use nicer image preview for logo upload * Removed AssetRequest form request * Removed asset form request, moved custom field validation into model * Added additional help text for logo upload * Increased the size of the image resize - should make this a setting tho * Few more formatting tweaks to logo section of branding blade preview * Use Flysystem for asset/license file uploads * Use Flysystem for removing images from models that have been deleted * Enable backups to use Flysystem This only handles part of the problem. This just makes it so we can ship files to S3 if we want, but does not account for how we backup files that are hosted on S3 * Use Flysystem to download license files * Updated audits to use Flysystem	2018-09-29 21:33:52 -07:00
Wes Hulette	fc8096f8dc	Fixed: Missing CSS file in basic.blade.php (#6264) ... * Fixed missing CSS file in basic.blade.php * Added * Changed stylesheet import for authorize.blade.php	2018-09-29 14:15:25 -07:00
snipe	153a711de4	Fixed css URL error	2018-09-28 23:18:16 -07:00
Wes Hulette	c090a2f0b6	Fixed script imports in setup.blade.php	2018-09-28 17:28:49 -04:00
Wes Hulette	11f128a84f	Moved chart.js library into vendor.js	2018-09-28 17:28:49 -04:00
Wes Hulette	e80dfc886e	Added admin-lte-options file, moved pGenerator to main js file	2018-09-28 17:27:06 -04:00
Wes Hulette	b84eb836f4	Cleaned up JS ... Removed unnecessary JS files Moved JS to app & vendor, so neither file is so large, plus they can be downloaded concurrently.	2018-09-28 17:27:06 -04:00
Wes Hulette	ecf77e60df	Added: #6246 - CSS Cleanup (#6247) ... * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Streamlined CSS by using NPM Removed unnecessary CSS files Merged CSS files into one file * Removed override.less * Moved bootstrap-color-picker css to file Removed inline calls * Changed css import on setup.blade.php * Updated signature-pad.css import * NPM Prod compile * Fixed font family loading issue.	2018-09-28 14:09:48 -07:00
snipe	a5abb3e6a6	Fixes #6252 - activated flag not checked when editing active user	2018-09-28 11:19:43 -07:00
snipe	ff824ec4db	Fixes #6252 - activated flag not checked when editing active user	2018-09-28 11:18:33 -07:00
Ivan Nieto	309f102745	Weird syntax in layout.blade.php. Change the use of 'or' operator to the null coalesce operator (#6240)	2018-09-26 22:33:34 -07:00
snipe	115f718cd9	Fix view if model doesnt have a manufacturer	2018-09-24 19:10:24 -07:00
Brady Wetherington	c97db3259f	Merge pull request #5913 from tilldeeke/refactore-checkout-checkin-notification-sending ... Refactor: Decouple checkin/checkout notifications from logging	2018-09-21 18:18:27 -07:00
snipe	e45b4efa1a	Better info buttons on audit ... TODO: translated strings instead	2018-09-07 18:08:18 -07:00
snipe	827295a989	Fixed tooltips	2018-09-07 05:39:56 -07:00
snipe	ff879e2018	Added the ability to update asset location when auditing - per #5854	2018-09-07 05:39:41 -07:00
snipe	e89b33f865	Enable popovers	2018-09-07 05:09:24 -07:00
snipe	77cdb2f409	Added console command to send inventory reports to users	2018-09-07 02:24:41 -07:00
snipe	84cc90e427	Added alt text to email headers	2018-09-05 18:57:36 -07:00
Wes Hulette	a865f79d5e	Fixed dashboard tables not showing data (#6143) ... Needed data-pagination="true" set	2018-08-29 12:29:47 -07:00
Wes Hulette	bfb5920677	Added #5956 - Moved bootstrap-tables to npm (#6139) ... Created single bootstrap-tables js and css file.	2018-08-28 13:10:27 -07:00
patrict	cf2d2ecdfc	Depreciation Report: (#6135) ... * Added monthly depreciation column * Right aligned amount column headings * Added monthly depreciation heading text for en, en-GB & af	2018-08-28 12:40:06 -07:00
Dmitriy Minaev	bc8fa31eb2	Add depreciation with half-year convention. Fixed #1237 (#6128) ... * Add half-year convention in depreciation for Models/Depreciable.php * Add a setting for the depreciation method * Integrate half-year convention inside working output * fix: add more checks at Depreciable.php * depreciation value rounding * Codestyle fix	2018-08-28 12:32:46 -07:00
liquidhorse	678ba228cb	Fixed #6079: QR Code unnecessarily squished. (#6080) ... * Fixed 2D barcode from being squished unnecessarily when 1D barcode is omitted. Added one character of whitespace for code readability.	2018-08-28 12:29:50 -07:00
snipe	0b8d70c7ec	Fixed #6124	2018-08-23 21:06:04 -07:00
snipe	522dc1db2a	Fixed #6124	2018-08-23 21:05:10 -07:00
snipe	f6971b8ab2	Fixed #6082 - don’t show expected checkin in email if none given	2018-08-16 14:30:06 -07:00
snipe	5294489b0e	Fixed HTML typo	2018-08-14 18:14:29 -07:00
Till Deeke	8648d53d25	Adds checkout acceptances ... A checkout acceptance gets generated for every item that needs to be checked out. This resource tracks the user user who can accept the item and their signature	2018-08-06 14:47:26 +02:00
Till Deeke	830a6cf67e	Adds accepting/declining to new controller	2018-08-06 14:46:10 +02:00
snipe	1a660911e7	Check for minimum PHP version in setup	2018-08-02 21:36:18 -07:00
snipe	134bddf4c7	Fixed #6029 - model number not appearing in checkin/checkout emails	2018-08-02 11:43:11 -07:00
snipe	ffed306ecd	Removed old emaol templates (#6026) ... Still testing this to make sure it doesn’t break anything else :)	2018-08-01 20:56:32 -07:00
snipe	6f8680efa6	Added external link formatter to BS tables	2018-08-01 18:01:31 -07:00
snipe	b2c99c88bb	Fixed #6028 - added supplier url to list view	2018-08-01 17:37:58 -07:00
snipe	a4019c9f63	NIcer UI for activated user + email credentials	2018-08-01 14:18:37 -07:00
snipe	694166862e	Added attempted logins admin screen (#6018) ... * Added attempted logins admin screen * Smaller table spacing	2018-08-01 03:51:59 -07:00
snipe	a209a92de8	Fixed #6011 - use correct file created at date	2018-08-01 02:43:08 -07:00
snipe	b1b5eeecba	Fixed #6013 - add accessory checkout notes to detail page	2018-07-31 16:00:38 -07:00
snipe	006a3adea0	Added ability to trigger forgotten password emails for users	2018-07-30 20:31:02 -07:00
snipe	b267b34762	Make sure there is a settings value	2018-07-25 19:02:35 -07:00
snipe	708b1a962c	Split out custom_css from custom_header ... This makes it so that the custom_css will still be respected even if there is no custom header	2018-07-25 19:01:47 -07:00
snipe	a5daee811b	Split out custom_css from custom_header color	2018-07-25 19:00:03 -07:00
snipe	2e92ef7d77	Removed HTML colspan for bootstrap table in files display	2018-07-25 07:40:04 -07:00
Daniel Meltzer	64d649be7f	Monster: Cleanup/Refactor http controllers. (#5916) ... * Extract a handlesimages trait to centralize logic for parsing/storing images on upload in create/edit methods. * Use same image upload/layout in accessories as consum+components. * Monster: Cleanup/Refactor http controllers. This cleans up docblocks, pulls most non-crudy actions into their own controllers, and does general cleanup/logic refactoring. There /should/ be no functional changes, but we all know how should works.. Extract checkin/checkout functions to a separate controller for accessories. Move controllers to subdirectory. Cleanup AssetModelsController Extract component checkin/checkout Assorted cleanups/doc/formatting in controllers. Refactor LicenseController. Refactor UsersController Update viewassetscontroller. * Codacy cleanups * More codacy cleanups. Extract a LicenseCheckout Form request as well. * A bit more refactor/cleaning of the license checkout method. * Review Related Cleanups * Fix most of the item_not_found translations. In many cases, the string being generated did not even use the id parameter. Where it does, pass it as id instead of as a different value. * Remove some old $data arrays from when we manually sent emails from the controllers. This has been superseeded by the notification system (yay!) * Bugfix: Only log the checkin of an accessory if the checkin completes sucessfully.	2018-07-24 19:35:26 -07:00
snipe	e320d2ba05	Fixed #5944 - added logo option for print-assets page (#5950)	2018-07-24 13:37:02 -07:00
snipe	376eb52f00	Fixed #5938 - added “self location edit” as permission	2018-07-24 12:42:16 -07:00
snipe	8ecceeacda	Fixed weird display for self options	2018-07-24 12:41:58 -07:00
Azerothian	66c3f5432d	implemented specific seat checkout (#5887)	2018-07-23 20:28:45 -07:00
snipe	bd581d01a3	Use full row width for image field	2018-07-19 10:40:07 -07:00
snipe	de2ebba577	Category add/edit UI tweaks	2018-07-19 10:40:07 -07:00
Sam	2a4fef6a61	adds select-id as an option for the asset-select partial. allows you to manually override the ID of an element. currently, the bulk-checkout partial has two asset-selects, with conflicting IDs. attempts to resolve #5882 (#5883)	2018-07-18 19:55:13 -07:00
snipe	9daeeeb851	Features/nicer notifications (#5886) ... * Improved expiring licenses notification * Improved expiring assets notification * Nicee low inventory notification * Refactored stupid language strings * Oops * Use settings variable	2018-07-18 19:15:45 -07:00
snipe	0f85d6810b	Added login log	2018-07-16 23:49:08 -07:00
snipe	bf761946da	Fix activated check for login	2018-07-16 23:48:46 -07:00
snipe	d9fa2f0e91	Fixed #5842 - added components to location detail view	2018-07-16 21:50:14 -07:00
snipe	a4799a495a	Fixes #5859 - add file name/size to file upload UI (#5861) ... * Fixes #5859 - add file name/size to file upload UI * Reverting assetcontroller Not sure exactly what happened here… * Production assets	2018-07-16 20:09:53 -07:00
Daniel Meltzer	638a7b2d91	Assetcontroller cleanup (#5858) ... * Extract method/cleanup * Remove apiStore method that is unusued since api controllers. * Use proper model exception * Remove old user importer. This is now supported by the general importer framework. * Refactor AssetsController methods. This is a giant diff without many functional changes, mostly cosmetic. I've pulled a number of methods out of assetscontroller, preferring instead to create some more targetted controllers for related actions. I think this cleans up the file some, and suggests some places for future targetted improvement. Fix weird missing things. * Fix Unit test failing after date changes. * Pass valid string to be translated. * Some method cleanup for codacy. * Extract trait for common checkout uses and codacy fixes.	2018-07-16 17:44:03 -07:00
Daniel Meltzer	b6b93550fe	Remove old helpers (#5843) ... * Cleanup model bulk-edit Use the general partials where appropriate, as well as display a list of what models we are editing in the bulk edit. * Use new api based fetch/display for modal select2. This is just copy/pasting the code currently because I'm not entirely sure how the two pieces of code interact. * Remove old helper functions that are no longer necessary with our populating of select2 dropdowns via ajax.	2018-07-16 14:22:25 -07:00
Till Deeke	240e642fe9	Removes the unused bulk operations for components (#5840)	2018-07-16 14:11:38 -07:00
Till Deeke	07a92d20d7	Fixing #5773: Refactoring the "clearing" of select2 lists (#5839) ... * adds select2 placeholders to select lists To allow us to clear the selection on „select2“ selects, we need a placeholder attribute See: https://select2.org/placeholders * Removes empty option from multiple select select2 requires an empty option value on singular selects, but not on multiple selects. When selecting multiple options, this empty option would be shown as selectable otherwise, not clearing the selection. * Adds the option to clear select2 instances Sets the correct options to allow clearing of out select2 instances. The empty placeholder is required, since clearing only works when a placeholder ist set (event an empty one). See: https://select2.org/placeholders * Removes the „Clear selection“ option from select lists Since we can clear the select2 lists with their native clearing method, we can remove this hack * Updates generated assets (css/js)	2018-07-16 14:10:54 -07:00
Till Deeke	27699aa99c	Adds permission checks for custom fields and custom fieldsets (#5645) (#5795) ... * adds permission checks to custom fields * adds permission checks to custom fieldsets * adds separate permissions for custom fieldsets * check for permissions in views * Removes custom fieldsets from permissions config * Proxy the authorization for custom fieldsets down to custom fields. This allows us to use the existing permissions in use and have more semantically correct authorization checks for custom fieldsets. * simplifies the authorization check for the custom fields overview * removes special handling of custom fieldsets in base policy I just realised that this code duplicates the logic from the custom fieldset policy. Since we are checking for the authorization of custom fields anyway, we can just use the columnName for the fields. * cleanup of unused imports	2018-07-12 18:28:20 -07:00
Jason	98b20fc1cd	Added option to include model information on asset labels. (#5301) ... * Added option to include model information on asset labels. Cleaned up label page to fix skewed label alignment on last row per page. * Changes made per Snipe's direction changed type from tinyint to boolean in DB changed labels back to initials	2018-07-12 18:23:12 -07:00
snipe	0e88a6b268	Fixed bug in branding image upload size text	2018-07-09 19:04:18 -07:00
Till Deeke	c1e870528e	Fixes the label association (#5510) (#5790)	2018-07-09 14:51:17 -07:00
snipe	35fc001c58	Fixed #5742 - create_function() is deprecated	2018-07-05 20:49:01 -07:00
snipe	339263a295	Fixed #5751 - added option for unique constraint on serial	2018-07-05 19:30:36 -07:00
snipe	f3526eccb9	Merge branch 'features/textarea-custom-field' into develop ... # Conflicts: # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/dist/all.js # public/mix-manifest.json	2018-07-05 12:37:07 -07:00
snipe	8732f299e6	Added logo class for logo override in custom CSS	2018-07-02 18:47:30 -07:00
Arunas Skirius	b30aac536a	fixed the alignment of a couple navbar icons (#5764)	2018-07-02 18:10:25 -07:00
snipe	d7dc4ae0c0	Added manager to custom report	2018-06-27 00:45:09 -07:00
snipe	80dda198c5	Parse line breaks in the detail view	2018-06-21 09:44:10 -07:00
snipe	9442736518	Adds textarea as a custom field type	2018-06-21 09:35:04 -07:00
snipe	1ee394aa69	Added Select2 to class for dropdowns	2018-06-21 07:40:30 -07:00
Djamon Staal	32e3f748d8	Make version footer configurable. (#5730)	2018-06-21 07:12:16 -07:00
Richard Ray Thomas	e7bc18dad4	Fixed inconsistent or incorrect comment labels (#5691) ... Accessories table was labeled 'Checked out License table' likely just a duplicate of the above comment for the actual licenses table. Very minor.	2018-06-11 20:11:58 -07:00
snipe	62e4eabab0	Fixed #5693 - don’t truncate license key	2018-06-11 18:47:02 -07:00
snipe	086683319a	Fixed #5172 - autosum on assets detail view for components tab	2018-06-02 06:21:51 -07:00
snipe	1a64879b65	Only allow remote user settings to be saved if the app is not in demo mode	2018-05-31 10:55:48 -07:00
snipe	01857fb056	Added created_at to file upload UI, added header/footer to files modal, fixed string for actions	2018-05-29 16:38:23 -07:00
snipe	3afe4938f9	Fixed #5616 - removed duplicate call to ekkoLightbox on asset view ... It’s already in the default blade	2018-05-29 16:36:42 -07:00
snipe	9e0544e735	Fixed #5617 - incorrect url to fieldset editing	2018-05-29 10:41:46 -07:00
snipe	3993c6ad6b	Use custom header color in emails	2018-05-29 10:23:39 -07:00
Brian Monroe	649563457d	Added notes field to acessories and consumable checkout pages. Resolves request #5607. (#5608)	2018-05-28 14:30:18 -07:00
snipe	15916e6668	Allow checkout to non-user objects even if the object requires checkout	2018-05-21 17:35:04 -07:00
Doeke Zanstra	f84ab2beda	Fixed bug #5540 (#5550) ... Error message with button "Test LDAP" is empty #5540	2018-05-18 16:04:34 -07:00
lea-mink	233fb23cb8	Create asset maintenance - Added orange bar for required asset to edit view (#5520) ... * Added orange bar for required asset to edit view * disable redirection to asset maintenances view * Update - disable redirection to asset maintenances view	2018-05-16 19:23:23 -07:00
Tim Bishop	1f299ed73e	Fix padding on next page with Chrome. (#5509) ... It looks like Chrome (and probably other browsers) is optimising the next-padding div out since it has no content. This means the margin doesn't apply. Adding the nbsp, and making sure it takes up no space itself, is enough to make the margin do the right thing. I also tried using padding instead of margin, but this results in an extra page at the end of the output (there'd need to be a way to stop page-break and next-padding appearing at the end of the document). I also tried setting a min-height on next-padding, but this had the same issue.	2018-05-09 17:00:36 -07:00
snipe	f405511b6b	Fixed #5501 - regression disallowing license files to be downloaded	2018-05-08 14:24:51 -07:00
snipe	cca97341e9	More flexible date range in datepicker for expected checkin filter on custom reports	2018-05-08 07:37:18 -07:00
snipe	13195d06fd	Fixed #5491 - added default location filter for custom report	2018-05-08 07:34:14 -07:00
snipe	65cf7527b0	Added model name to expected checkin reminders	2018-05-08 05:59:34 -07:00
snipe	28e7ca5a84	Formatting tweaks to email notifications	2018-05-08 05:39:11 -07:00
snipe	8f64da5bc7	Added admin alert on expiring notifications	2018-05-08 05:27:03 -07:00
snipe	e56a46882d	Include EULA/acceptance in license interfaces	2018-05-08 03:47:28 -07:00
snipe	47a0400a72	Fixed comment typo	2018-05-08 03:14:25 -07:00
snipe	83b546c1c5	Disable privacy policy link in footer if in demo mode	2018-05-08 01:07:15 -07:00
snipe	04709dc1df	Fixed #5477 - added GDPR privacy policy link in email and webpage	2018-05-08 00:50:13 -07:00
snipe	f48171dcab	Add category to licenses	2018-05-08 00:14:38 -07:00
snipe	7b8362b64c	Added license categories	2018-05-04 21:01:38 -07:00
snipe	3a1b432234	Fixed #5472 - show_in_email for custom fields missing in edit field UI	2018-05-03 08:06:28 -07:00
snipe	0be69f57ac	Improved files display	2018-05-02 14:13:06 -07:00
snipe	3662a58ad8	Removed unusued parameters in BS table formmatters	2018-05-01 21:35:07 -07:00
snipe	c8cf46f62b	Fixed #5431 - category widget error on dashboard	2018-05-01 21:33:03 -07:00
snipe	71708e349c	PHP7.2 count fixes (#5427) ... * PHP 7.2 count() fixes * Re-enable php travis 7.2	2018-04-29 06:10:49 -07:00
snipe	d6d498bc8f	Fixes incorrect gate for “new” button for status labels on asset create/edit form	2018-04-26 16:35:08 -07:00
snipe	e5121b33e6	Shorter syntax for demo disabled	2018-04-25 19:23:03 -07:00
snipe	5fb4eacf5b	Disable history importer on the demo	2018-04-25 19:18:05 -07:00
Hannah Tinkler	c4c520c1a3	Fixes #4445: prevents assigned assets from being checked out in bulk checkout (#5421) ... * Fixes #4445: prevents assigned assets from being checked out in bulk checkout * Updates data attribute to more versatile 'data-asset-status-type' * Fixes broken unit test	2018-04-25 02:39:23 -07:00
snipe	a2fef11016	Use Bootstrap Tables on custom fields screens for column selector	2018-04-24 16:25:10 -07:00
snipe	5acd225f0f	Fixed #5423 - removed required text on preflight	2018-04-24 12:48:58 -07:00
snipe	1ef4cc9fc2	Fixed #4301 - added image upload to audit	2018-04-24 02:54:54 -07:00
lea-mink	c8cbc55b59	Bulk Checkout to Assets and Location (#5385)	2018-04-23 21:24:49 -07:00
Hannah Tinkler	8d501e1c24	Feature/custom fields default values (#5389) ... * Fixes CustomFieldsetsController::fields() which I think is not used anywhere else and don't think ever worked as you can't call get() on a Collection. Have tested extensively and doesn't seem to affect anywhere else? * Adds default value functionality * Adds built assets * Fixes assignment to asset_model_id which should have been evaluation and alters route so it sits more in line with existing work * Updates built assets * Remove silly docker.env file; fix Dockerfile to preserve Oauth keys (#5377) * Added department to custom asset export Updates build assets * Adds translation support for 'add default values' checkbox label	2018-04-23 21:16:55 -07:00
lea-mink	16a7409ce1	Matched Asset currency and Asset Maintenance currency in Asset Maintenance view (#5386) ... * Matched Asset currency and Asset Maintenance currency in Asset Maintenance editing view * Cleaning code & add condition on currency of an asset location	2018-04-20 14:03:31 -07:00
snipe	5948a0b235	Added department to custom asset export	2018-04-16 20:10:38 -07:00
Hannah Tinkler	48254a93f0	Fixes #5338 - mark required setup fields during setup (#5359)	2018-04-13 14:52:32 -07:00
snipe	365c8c18d7	Fixed #5319 - signature pad too small on mobile	2018-04-06 19:19:31 -07:00
snipe	bbc0695a8f	Added count of checkins, checkouts, requests (#5314) ... * Added count of checkins, checkouts, requests * Removed old commented items * Use actionlog instead of redefining the relationship	2018-04-06 16:23:39 -07:00
snipe	1d0f8f01f2	Fixed #5266 - small scroll window for EULA accept screen	2018-04-06 15:50:45 -07:00
snipe	2253439940	Added default location/address to custom report	2018-04-05 17:33:25 -07:00
snipe	8a6713d5c0	WIP - Improved requested assets (#5289) ... * WIP - beginning of improved requested assets - Use Ajax tables for faster loading - Use new notifications for requesting an asset TODO: - Use ajax tables for requestable asset models - Use new notifications for canceling an asset request - Expire requests once the asset has been checked out to the requesting user * Only show asset name in email if it has one * Refactor requested method to only include non-canceled requests * Refactored requestable assets to log request and cancelation * Added softdeletes on checkout requests * Differentiate between canceling and deleting requests * Added asset request cancelation notification * Added timestamps and corrected unique key on requests table * Improved requests view * Re-use blade for cancel/request email * Refactored BS table formatter for requested assets * Location name min reduced to 2 * Added PAT test as maintenance option This needs to be refactored into database-driven options with a UI * Better slack message * Added getImageUrl method for assets * Include qty in request notifications TODO: - Try to pull requested info from original request for cancelation, otherwise it will default to 1 * Removed old asset request/cancel emails * Added user profile asset request routes * Added profile controller requested assets method * Added blade link to requested assets for profile view * Sort user history desc * Added requested assets blade * Added canceled at to checkoutRequest method * Include qty in request * Fixed comment, removed allowed_columns * Removed Queable methods, since we don’t use a queue * Fixed return type in method doc * Fixed version number * Changed id to user_id for clarity	2018-04-04 17:33:02 -07:00
snipe	116cad88a0	Fixed #5279 - [regression] edit button not appearing in asset view	2018-03-29 11:28:37 -07:00
snipe	115d6e29df	Added location address to custom asset report export	2018-03-26 15:59:09 -07:00
snipe	0134ec7b04	Added asset presenter, fixed asset maintenances button in asset view	2018-03-26 14:49:49 -07:00
snipe	46f5f21368	Notification improvements (#5254) ... * Added “show fields in email” to custom fields * Added “show images in email” to settings * Added nicer HTML emails * Break notifications out into their own, instead of trying to mash them all together * Remove old notification for accessory checkout * Janky fix for #5076 - “The asset you have attempted to accept was not checked out to you” * Add method for image url for accessories * Added accessory checkout email blade * Make accessory email notification on checkout screen consistent with assets * Added native consumables notifications * Fixes for asset notification * Updated notification blades with correct-er fields * Updated notifications * License checkin notification - does not work yet Need to figure out whether the license seat is assigned to a person or an asset before we can pass the target * Added alternate “cc” email for admins * Only try to trigger notifications if the target is a user * Fix tests * Fixed consumable URL * Removed unused notification * Pass target type in params * Show slack status * Pass additional parameters There is a logic bug in this :( Will send to slack twice, since the admin CC and the user are both using the same notification. Fuckity fuck fuck fuck. * Pass a variable to the notification to supress the duplicate slack message * Slack is broken :( Trying to fix Will try a git bisect * Put preview back into checkout * Pulled old archaic mail * Removed debugging * Fixed wrong email title * Fixed slack endpoint not firing * Poobot, we hardly knew ye. * Removed old, manual mail from API * Typo :-/ * Code cleanup * Use defined formatted date in JSON * Use static properties for checkin/checkout notifiers for cleaner code * Removed debugging * Use date formatter * Fixed target_type * Fixed language in consumable email	2018-03-25 13:46:57 -07:00
snipe	04af1f3c97	Moved remote user stuff below password security stuff	2018-03-22 14:00:35 -07:00
David Kaatz	53735f2026	Authentication via REMOTE_USER (clean repull) (#5204) ... - Implementation in Login - Configuration - Database migration	2018-03-14 12:48:07 -07:00
snipe	c4db8d37c2	Fixed #5168 - users without superadmin could not see custom fields UI even if granted	2018-03-07 13:37:37 -08:00
snipe	1e22b8e567	Fixed #5138 - added default_label flag to status labels	2018-03-05 22:04:16 -08:00
snipe	36cd63836e	Fixed #5151 - added asset tag to maintenances	2018-03-05 16:26:40 -08:00
snipe	f7784b6543	Fixed #2402 - add ability to restore manufacturers	2018-03-03 18:46:19 -08:00
snipe	06805d70fe	Fixed incorrect settings HTML	2018-03-03 17:07:28 -08:00
fordster78	68a9855506	New First Admin Notification (#5147) ... * New First Admin Notification * Include Last name in Welcome and First admin Notifications	2018-03-03 14:37:42 -08:00
fordster78	688a3251a9	New Welcome Notification (#5146) ... * New Test Notification Created Test Notification. Updated Vendor Mail message.blade files. Updated api settings controller to use Notification Façade. * Add show URL in Emails condition * New Welcome Notification	2018-03-03 12:44:41 -08:00
snipe	41a9e5f710	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2018-03-02 18:01:41 -08:00
snipe	31790e0bb7	Tweaks to theme settings	2018-03-02 18:01:36 -08:00
fordster78	4e0c8e218d	New Test Notification (#5137) ... Created Test Notification. Updated Vendor Mail message.blade files. Updated api settings controller to use Notification Façade.	2018-03-02 18:01:20 -08:00
Geoff Young	4fe4c0c72a	Add viewKeys permission check on Asset page (#5141)	2018-03-02 18:00:22 -08:00
snipe	f171357e36	Removed unused skin files, added skin setting option	2018-03-02 17:50:40 -08:00
snipe	b4f704d7f1	Fixed 2FA reset button	2018-02-26 15:43:49 -08:00
snipe	0e48837eec	Fixed assets checked out to assets listing table	2018-02-23 05:53:00 -08:00
snipe	103974cae4	Fixed statuslabel detail view table	2018-02-23 05:09:14 -08:00
snipe	bfb11d249e	Tweaked slack test UI	2018-02-22 21:47:48 -08:00
snipe	e3144c3093	Added Slack test button	2018-02-22 16:35:34 -08:00
snipe	e01f1ae8ed	Partial fix for #2892 - Added export for license seat assignments	2018-02-21 17:28:55 -08:00
snipe	f8151284ee	Fixed - removed extra components table	2018-02-21 16:20:46 -08:00
snipe	5d8c91b687	Fixed regression - Added sum footer back into accessories	2018-02-21 15:54:16 -08:00
snipe	ca50ea190f	Applied master changes to develop ... Wrong branch :(	2018-02-21 15:51:04 -08:00
snipe	6ffad6043f	Fixed issue where bootstrap tables didn’t use a default page size	2018-02-21 05:44:41 -08:00
snipe	f5e51897e3	Added - sort by color on status labels	2018-02-21 05:29:50 -08:00
snipe	0cf9cdd3b1	Make department columns sortable	2018-02-21 05:04:20 -08:00
snipe	d28c2af7de	Fixed bootstrap table issue if per page was set to 10	2018-02-21 04:41:44 -08:00
snipe	f7eb013935	Reverse order on activity report	2018-02-20 15:42:44 -08:00
snipe	1c28f893e7	Fixed #5027 - remove link to non-existant reports page	2018-02-20 14:44:29 -08:00
snipe	d2403cdadb	Added image preview for uploads	2018-02-17 00:51:22 -08:00
snipe	502e4d672a	Use image upload partial in asset edit/create	2018-02-16 22:08:49 -08:00
snipe	b3d673b0aa	Fixed #5037 - use line breaks in notes in table view	2018-02-16 21:38:56 -08:00
snipe	d8fc50c351	Fixed #5033 - use PHP’s max filesize for image uploads	2018-02-16 21:17:41 -08:00
snipe	ba5057181e	Check for model in asset view	2018-02-16 18:04:11 -08:00
snipe	3744a68daf	Features/better table options (#5018) ... * Added CSS for table toolbar * Use maintenances API for table listings * NIcer layout for allowed_columns in maintenances API * Fixed #5014 - bootstrap cookie issues * Fixed #5015 - bug when saving settings * Refactored datatable code to use data attributes * Updated dashboard with new table code * Added - Order by group user count * Updated groups to use new table attributes * New license listing table code * More bootstrap table implementations * More BS table refactoring * Improved bootstrap assigned assets * New bootstrap for reports * Misc BS fixes * FIxed small issue with asset history display * Removed multisort option * JS refactor	2018-02-16 13:22:55 -08:00
dl1l	c209b7bb5d	Update edit.blade.php (#5019)	2018-02-15 14:59:54 -08:00
snipe	0d11e32523	Fixed issue where group with no permissions would crash view page	2018-02-13 17:14:30 -08:00
Sean McIlvenna	cc5d36f8be	Addng "Category" column to "view assets" and re-organizing columns (#4970)	2018-02-05 17:36:35 -06:00
snipe	813106efd3	Default to only changing default location in bulk edit	2018-02-02 09:42:34 -06:00
snipe	08d129c2ea	Fixed #4951 - updating asset location in bulk edit	2018-02-02 09:36:40 -06:00
snipe	d86fb098a8	Fixed sort ordering on dashboard	2018-02-02 09:31:43 -06:00
snipe	b3a6ec2804	Fixed #4938 - default sort order	2018-02-01 17:17:56 -06:00
snipe	2f9fff7130	Do not try to show depreciation report if no depreciations are set up	2018-01-25 13:16:49 -06:00
snipe	76f52dd89b	Fixed #4872 - Check for assigned in depreciation table	2018-01-25 11:02:46 -08:00
snipe	eddcc0fbbd	Fixed cookie issue on hardware	2018-01-24 14:23:19 -08:00
snipe	739d3c72b7	Fixed #4902 - include last name in checkin email	2018-01-24 10:59:34 -08:00
snipe	60c38a0c47	Added setting to choose what appears in model select list - Fixes #4879	2018-01-24 10:43:46 -08:00
Tim Bishop	bc14f225af	Only use location currency if it's actually set. (#4904) ... This changes the depreciation report to only use the currency on a location if it's actually set to something. Previously, if an asset had a location it would use the currency even if it was blank rather than falling back to the default.	2018-01-24 08:55:51 -08:00
snipe	765295136a	Added - ability to add custom footer text, hide user’s manual/support links	2018-01-24 07:02:30 -08:00
snipe	7579333ad3	Disallow LDAP settings if in demo mode	2018-01-24 05:50:31 -08:00
snipe	543ea28b72	Added qty to asset components - fixed #4876	2018-01-24 05:25:01 -08:00
snipe	fefd6d60f6	Fixed #4899 - sorting in user history	2018-01-24 04:48:00 -08:00
snipe	a7b8b4bf55	Added: ability to change actual location from bulk edit assets	2018-01-24 04:38:25 -08:00
CronKz	dcc379c3fa	Adding missing translations. (#4896)	2018-01-23 18:13:55 -08:00
vcordes79	f4e9d245d0	Status labels (#4895) ... * fix statuslabels * fix statuslabels	2018-01-23 18:08:54 -08:00
snipe	c75a2051ff	Hide mfg button if no permissions to create	2018-01-22 14:02:23 -08:00
CronKz	691ec164b1	Added Translations (#4880)	2018-01-22 13:14:52 -08:00
snipe	99e55f84f0	Fixed misc UI permissions elements	2018-01-20 04:39:31 -08:00
Brady Wetherington	dfb2b9b569	Major overhaul for modals, and a fix for #4820 (#4866) ... Changes how the various modals work, and allows for specifying category_type when inline-creating categories.	2018-01-20 00:42:29 -08:00
snipe	5d4bbc393e	Fixed #4837 - link phone numbers	2018-01-20 00:20:45 -08:00
snipe	6eb8acf319	Swich to panel box for dashboard message	2018-01-19 20:49:02 -08:00
snipe	95a9742571	Fixed #4768 - adds dashboard message option to settings	2018-01-19 20:43:55 -08:00
snipe	782813ab49	Check for valid category before checking acceptance	2018-01-19 18:17:23 -08:00
snipe	2a959edeba	Added - Setting to allow archived assets in List All	2018-01-17 19:18:48 -08:00
fordster78	138313dcb9	Setup changes (#4813) ... * Add Asset Tag settings to Setup * Add Locale Settings to Setup * Add multiple company support to setup * Changed the locale label name from 'site_name' to locale Added default value for language to 'en' and multiple companies support to 0 (false) Switched out the old Input facade to the preferred $request->input method for the setup page.	2018-01-17 10:58:03 -08:00
snipe	24b356dba4	Fixed typos in default blade that cause components to not show up for non-superadmins	2018-01-17 06:27:23 -08:00
snipe	409f5cc4fd	Added - display asset model category on hardware view page	2018-01-16 16:26:24 -08:00
snipe	3b5e4c44eb	Fixed depreciation report not showing assigned to	2018-01-16 07:46:34 -08:00
snipe	69a7ea63e2	Pass nopages to dashboard stuff	2018-01-16 07:37:20 -08:00
snipe	aac379daeb	If nopages is passed, hide page numbers ... This seems weird since we’re checking for a negative, but there are only a few spots where we wouldn’t want page numbers, namely the dashboard sruff	2018-01-16 07:37:06 -08:00
snipe	66a590b774	Account for user’s that have been deleted in the requested list	2018-01-16 07:36:03 -08:00
snipe	dc4472e9e9	Misc export table fixes	2018-01-15 21:03:46 -08:00
snipe	6bfd428c2e	Use real status label names, even if deployed	2018-01-15 21:03:26 -08:00
snipe	f4623bd277	Add user group membership to user view page	2018-01-15 20:31:10 -08:00
snipe	68f1fa0340	Added - ability to sort by asset count in models	2018-01-11 15:21:51 -08:00
snipe	a4b32e2328	Improved - use presenters on model detail	2018-01-11 15:17:10 -08:00
snipe	d109ca30e2	Improved - allow searching on most detail views with additional tables	2018-01-11 15:16:53 -08:00
snipe	a4ac53e2e9	Improved - Using presenters for column headers in location detail	2018-01-11 15:16:09 -08:00
snipe	0789eb8b07	Improved - using presenters for column headers in manufacturer detail	2018-01-11 15:12:48 -08:00
snipe	7f674fdd35	Require implicit search	2018-01-11 13:18:06 -08:00
snipe	500aa37e3c	Fixed switchable attributes on table headers	2018-01-11 13:17:55 -08:00
snipe	55b9f1207d	Updated bootstrap tables	2018-01-10 22:53:54 -08:00
snipe	c31362655c	Refactored BS tables include for clearer separation of simple v not simple	2018-01-10 20:34:36 -08:00
snipe	c6a956382f	Fixed #4784 - cookie not always being set correctly for ajax tables	2018-01-10 20:04:41 -08:00
snipe	bab0bda174	Added custom formatter for license seats (WIP)	2018-01-10 18:58:55 -08:00
snipe	bb52a8417c	Switch view code to AJAX table	2018-01-10 18:58:41 -08:00
snipe	254234b0dc	Fixed #4787 - don’t try to display category if it is invalid ... This shouldn’t be needed, but in case data got weird (manual editing, etc)	2018-01-10 06:33:59 -08:00
snipe	e6259eb6e1	Fixed #4774 - show assets assigned to assets in asset view ... Todo: Fix text search on the asset to asset tab. It’s currently broken so I’ve disabled it.	2018-01-10 05:44:11 -08:00
snipe	eeb3d1eb42	Use language strings for tab text	2018-01-10 05:42:34 -08:00
snipe	79295f6434	Use dataTableLayout for table	2018-01-10 05:33:45 -08:00
snipe	285e4e2e52	Allow bulk language update in user edit	2018-01-10 05:33:26 -08:00
snipe	5587b64d64	Fixed #4770 - broken licenses, etc on company view, added users and components	2018-01-10 03:52:21 -08:00
snipe	f0f2a5aa67	Workaround for #4784 - make changes tab always visible ... Not sure why the cookie isn’t cookie-ing	2018-01-10 01:56:24 -08:00
Brady Wetherington	061317866b	Changes to Models in the asset-edit screen maintain chosen values (#4781) ... Fixed for #2195	2018-01-09 23:45:20 -08:00
snipe	0abab2107c	Fixed #4779 - show selected filename on filepicker	2018-01-09 20:12:07 -08:00
snipe	afc7116260	Fixed #4778 - added notes to asset model view	2018-01-09 20:00:06 -08:00
Geoff Young	0b3d2b46e0	Add attributes to delete asset file button (#4336) ... This adds attributes to the delete file buttons on the View Asset page. The attributes will fill the confirmation modal that prompts users before deleting. They also activate a tooltip on the button.	2018-01-03 17:25:50 -08:00
snipe	8864f81402	Fixed manufacturer error on printable user page ... Manufacturer is not required for accessories, so need to account for that	2017-12-26 16:49:01 -08:00
snipe	71ba1af647	Fixed button class on asset view	2017-12-26 16:48:28 -08:00
snipe	37d4cf3afb	Fixed #4647 - requestable model button not clickable	2017-12-19 20:48:26 -08:00
snipe	b716db225f	Added “new” buttons for manufacturer and category in asset model creation	2017-12-19 20:30:46 -08:00
snipe	fbe093705d	Fixed #4640 - add username to user detail	2017-12-19 13:42:34 -08:00
snipe	608bb1b5b1	Fixed #3416 - bulk delete asset models	2017-12-12 09:10:05 -08:00
snipe	1d82f80e73	Improved - used “checked out to” string in asset model listing to reflect new polymorphic options	2017-12-12 07:20:06 -08:00
snipe	e21fa37254	Added - bulk actions to model asset listings	2017-12-12 07:15:51 -08:00
snipe	4ce91a4f5d	Fixed namespace gate for components - related to #4282	2017-12-12 06:26:37 -08:00
snipe	aff93d8f2b	Fixed #4589 - Licence deployed to asset issue	2017-12-12 05:43:06 -08:00
snipe	e4ab4024c5	Added - changelog searchable in history tab	2017-12-12 05:10:13 -08:00
snipe	612f23f6e0	Added #2893 - track changes on asset edits	2017-12-12 04:59:28 -08:00
snipe	1d543f83d4	Added line spacing between unstyled lists	2017-12-12 04:31:53 -08:00
snipe	c816870083	De-norm last audit date so we can display it in the asset listing	2017-12-12 03:03:43 -08:00
snipe	d91e8bfee5	Fixed select2 on setup	2017-12-12 02:31:36 -08:00
snipe	2b3e5c8800	Moved “deleted” alert banner higher on page	2017-12-12 02:31:26 -08:00
snipe	557714e7b7	Fixed #2810 - checkin fix for licenses	2017-12-08 13:19:10 -08:00
snipe	a062769672	Check for array key before checking selected state ... This is necessary for pre-created groups that don’t have all keys present	2017-12-07 13:21:30 -08:00
snipe	023910472c	Fixes #2415 - only allow gif, png jpg, svg image uploads	2017-12-06 14:33:52 -08:00
snipe	dfb0c09c51	Fixed #4581 - renamed print method	2017-12-06 11:17:42 -08:00
snipe	3d0525bc51	Removed debugging info	2017-12-05 18:11:59 -08:00
snipe	808cd0f728	Nicer groups permission edit UI	2017-12-05 18:11:06 -08:00
snipe	f5b3df697c	Better select/unselect all javascript for permissions	2017-12-05 18:10:35 -08:00
snipe	ec131a7416	Updated account licenses	2017-12-05 16:27:02 -08:00
snipe	3da49ceb60	Standardize hidden key format	2017-12-05 16:26:39 -08:00
snipe	60f6895919	Remove version from asset table to persist column selections	2017-12-05 14:50:38 -08:00
snipe	deba4d2b81	Added consumables tio printable output	2017-12-05 12:37:42 -08:00
snipe	a8cc29f062	Added #2562 - print view of all assigned inventory	2017-12-05 12:34:16 -08:00
snipe	7efa7ec03f	Starter print template for all assets assigned to a user	2017-12-05 01:55:24 -08:00
snipe	174e3e720a	Fixed #4521 - profile location not selected ... This is kind of a janky way to handle this - I created a new dropdown select, instead of adding even more convoluted code to the partial. The reasoon for this is because there may be situations where $user is passed in *addition* to $item, and we don’t want to erroneously use that location if we’re not supposed to be.	2017-12-04 20:30:57 -08:00
snipe	912ee20f3c	Better supplier/location flow for suppliers/locations without data	2017-12-01 21:58:00 -08:00
snipe	f2d25ff777	Added device image to supplier	2017-12-01 21:06:36 -08:00
snipe	dec9d959db	Added additional user/asset fields to location view	2017-12-01 21:06:16 -08:00
snipe	c6b02cdc02	Location layout tweaks	2017-12-01 20:35:15 -08:00
snipe	f0c825a9b3	Improved suppliers view (use ajax tables)	2017-12-01 20:29:51 -08:00
snipe	79c035da11	Added map alt tag	2017-12-01 20:29:04 -08:00
snipe	cbc09f3a12	Fixes #4508 - adds image to location view (and google map, if address and API key exist)	2017-12-01 19:12:35 -08:00
snipe	22c4d79cfb	Fixed #4345 - Disallow future date for checkin date, disallow past date for expected checkin	2017-12-01 17:52:56 -08:00
snipe	71b9a15c9c	Moved User menu down	2017-12-01 17:50:01 -08:00
snipe	db328e1ce5	Fixed granular hash resetting cookie	2017-12-01 17:49:44 -08:00
snipe	a5bcf53146	Pass $required variable to display requiredness	2017-12-01 16:51:22 -08:00
snipe	9f97b4aefd	Added created_at status, and manufacturer filter to custom report	2017-12-01 16:50:56 -08:00
snipe	62468199af	Wider column for checkboxes	2017-12-01 16:50:16 -08:00
snipe	c220315cb0	Check if item is set before trying to look up selected	2017-12-01 16:49:51 -08:00
snipe	14874d8e8a	Fixes #4495 - missing field in Download CSV, added filter options on custom report	2017-12-01 14:47:52 -08:00