3557 commits

Author	SHA1	Message	Date
snipe	15dc4e4779	Added fieldset sync ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-25 21:29:57 -07:00
slong753	6bec9cf880	fix a couple things	2023-04-25 23:26:16 -05:00
snipe	5eeca937cb	Added logic for syncing fieldset info ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-25 21:08:26 -07:00
snipe	662b7787a1	Updated redirect return ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-25 21:07:50 -07:00
snipe	28d9cec1e3	Added auto_add_to_fieldsets to API response ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-25 20:59:48 -07:00
Godfrey M	cb68f41d9c	added ldap_location to settings	2023-04-25 11:44:04 -07:00
snipe	66ce02fc48	Added permission on restore ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-25 08:09:16 -07:00
snipe	6e7f0728fd	Added more granular permissions on bulk actions for assets ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-25 08:06:45 -07:00
akemidx	9cd2783185	Regex added for link instead	2023-04-24 20:07:21 -04:00
Marcus Moore	2aba8252f3	Ensure users editing themselves do not deactivate their account	2023-04-20 21:59:55 -07:00
akemidx	16a5a883e5	new request, preparing support_url for validation	2023-04-20 16:34:25 -04:00
Ivan Nieto Vivanco	747d6cfdb4	Change the flow of the condition using an early return	2023-04-20 10:37:26 -06:00
Ivan Nieto Vivanco	ae53609b1b	Declare variables only if license is found	2023-04-20 10:16:11 -06:00
Godfrey M	bdd1045272	adds a checkout range for custom asset reports	2023-04-19 09:11:44 -07:00
Brady Wetherington	9793130f6c	Merge branch 'develop' into laravel_v9	2023-04-18 11:01:00 -07:00
snipe	3a808aa806	Updated method for available seat count ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-18 02:44:33 -07:00
snipe	dc6eb6f104	Throw a warning if there were no users affected ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-18 02:07:17 -07:00
snipe	a8a3ca3624	Use count on availSeats ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-18 02:06:42 -07:00
snipe	f21d9c27e6	Use new translations for logs ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-18 01:07:26 -07:00
snipe	bfcbd9628a	Refactored license controller with new counts ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-18 01:02:58 -07:00
snipe	087f0e596a	Fixed has to where ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-17 22:44:05 -07:00
snipe	99cecee4b5	Merge branch 'develop' into features/adds_license_checkin_checkout_to_all_in_gui	2023-04-17 14:54:30 -07:00
slong753	52dc99588e	pushing for now, needs validation work	2023-04-17 13:57:48 -05:00
Kevin Köllmann	04f3c4bf69	Fixed #12854: Allow checkout of available components down to zero stock	2023-04-17 11:45:11 +02:00
snipe	a83991041a	Better placement for errors ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-16 16:08:06 -07:00
snipe	16ab2bec06	Added sorting and searching on autoassign_licenses via user API ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-16 15:27:39 -07:00
snipe	4b66ca6ac5	Added method to bulk checkin (much simpler than checking out) ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-16 15:27:15 -07:00
snipe	844ad83431	Added method to bulk checkout license seats ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-16 15:26:59 -07:00
snipe	9833d861d4	Added autoassign_licenses tp bulk users conditional ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-16 15:26:33 -07:00
snipe	03cc55cb6a	Set autoassign_licenses to false if unchecked ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-16 15:25:52 -07:00
snipe	6a94a2f515	Return true/false for autoassign_licenses in the API ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-16 15:25:26 -07:00
snipe	79ff6a8fc2	Disallow deleting in the API view if there are things checked out ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-16 12:30:23 -07:00
snipe	8183b8deba	Added stub method ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-16 12:30:02 -07:00
snipe	64256351d8	Used a singleton to filter API limit value ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-16 08:46:39 -07:00
snipe	78ec21acc4	Added location case ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-16 07:47:49 -07:00
snipe	5a1d03c1dc	Added alias maps ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-16 07:47:42 -07:00
snipe	955539807c	Merge pull request #12830 from snipe/features/adds_supplier_id_to_components ... Added supplier to components and consumables	2023-04-15 18:42:23 -07:00
snipe	fc7f1f907d	Fixed variable name ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-15 17:37:25 -07:00
snipe	4cbb9c2409	Use abs() instead of max ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-15 17:28:25 -07:00
Godfrey M	ab67d903b5	adds multi select to custom report for companies	2023-04-13 12:02:11 -07:00
snipe	2fe7fcecdb	Added case switch for sorting on suppliers ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-13 11:13:45 -07:00
snipe	d2b3e251ad	Added counters to API controllers ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-13 11:12:16 -07:00
snipe	07c0a1927b	Added supplier id to controllers ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-13 11:12:01 -07:00
snipe	ab7c75232b	Added supplier to transformers ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-13 11:10:51 -07:00
snipe	6e183f2ced	Added counters for consumables and components ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-13 11:10:32 -07:00
slong753	8b9aea8874	very much WIP, but dupe queries reduced ... but i think this can be cleaned up a bit more	2023-04-12 14:46:48 -05:00
snipe	112a04b108	Better handle weird data passed to the API via limit and offset ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-12 11:28:46 -07:00
snipe	70ce0d9ee6	Maintain activated state on editing a user ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-09 14:06:29 -07:00
snipe	baf267e2e9	Small cleanups ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-07 09:45:16 -07:00
snipe	cb76815e8b	Removed if check on assets, since that’s already handled via validation ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-07 09:42:31 -07:00
snipe	4c88c751ef	Code cleanup, better validation ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-06 22:03:40 -07:00
snipe	0abb993600	General cleanup and standardization for component API ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-06 22:02:57 -07:00
snipe	4840046f44	Check for available quantity on consumables before checkout ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-06 20:38:02 -07:00
snipe	ffdc0d76f7	Fixed accessories verifying that enough remain to be checked out ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-06 18:40:29 -07:00
snipe	383d48fd9c	Merge pull request #12787 from Godmartinz/accessory_unavailable_message ... Added unavailable message to prevent over-checkout of Accessories	2023-04-06 15:05:18 -07:00
snipe	bd4757ad7a	Merge pull request #12779 from snipe/features/replace_icheck_with_only_css ... Move from iCheck to pure CSS for radio and checkboxes	2023-04-06 14:58:33 -07:00
Godfrey M	3d7c55deb3	removed an unncessary query	2023-04-06 13:06:05 -07:00
Godfrey M	55943d8897	uses numRemaining now	2023-04-06 10:05:17 -07:00
snipe	161999fbca	Fixed #12772 - use the APP_URL config more consistently ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-05 16:05:40 -07:00
snipe	752365aa85	Updated support URL ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-05 14:54:40 -07:00
Godfrey M	b038fe8f2e	adds unavailable message to overcheckout	2023-04-05 10:00:39 -07:00
snipe	8b315a6502	Updated contrller to use trans_choice ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-03 18:55:09 -07:00
snipe	cfef9d8cca	Merge pull request #12763 from inietov/fixes/call_to_member_function_licenses_on_null ... Fixed Call to a Member Function Licenses() on null [sc-20606]	2023-03-30 14:20:13 -07:00
slong753	0f72554a9f	translations for messages	2023-03-30 13:57:18 -05:00
slong753	382d849ee1	added catch for no assets selected	2023-03-30 13:52:29 -05:00
Ivan Nieto Vivanco	d10b7fd6af	Use firstorfail on eloquent query to return error if asset is not found	2023-03-29 19:11:28 -06:00
slong753	e4c76f454c	this is good, just needs translations done in view	2023-03-29 18:24:56 -05:00
slong753	162b70d5a9	wireframed, needs a view and should work	2023-03-29 17:34:36 -05:00
slong753	65bbecd145	this all works - could use some eyes	2023-03-29 14:46:31 -05:00
Dominik Both	3271c9dc9f	Fix #8208, #8896, #8985, #9789	2023-03-29 09:56:34 +02:00
slong753	032ae4348e	custom fields display, need to get saving ... +some clean up	2023-03-28 21:45:31 -05:00
slong753	804a788a27	initial fetch working	2023-03-28 20:31:24 -05:00
snipe	c9d1274edc	Merge pull request #12753 from snipe/fixes/lang_for_group_not_found ... Fixes/lang for group not found	2023-03-28 16:45:22 -07:00
snipe	32922e6461	Use corrected language string ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-28 16:39:52 -07:00
Ivan Nieto Vivanco	77d513f80b	Assign target variable as the other checkout types	2023-03-28 17:25:57 -06:00
Ivan Nieto Vivanco	d70b7dbf41	Checks if exist on API checkout	2023-03-28 16:12:48 -06:00
snipe	feef06e7bf	Changed log level to debug vs info/error ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-28 06:54:41 -07:00
snipe	4d1e28ad03	Merge pull request #12727 from snipe/fixes/add_json_to_mimes ... Fixed #12641 - added JSON to mimes	2023-03-24 07:22:30 -07:00
snipe	6bc0df73e8	Merge pull request #12661 from Godmartinz/gh12655_missing_translations ... Adds translations for category types to index and edit of categories	2023-03-24 07:09:40 -07:00
snipe	16dcc2d3ed	Fixed #12641 - add JSON to mimes ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-24 06:57:43 -07:00
snipe	e869b1fd53	Fixed #12724 - fieldset not saving on model ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-24 06:11:24 -07:00
snipe	545d023a18	Handled a few more hard-coded strings ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-21 23:56:07 -07:00
snipe	473211397f	Merge pull request #12708 from uberbrady/livewire_importer_no_subcomponent ... Livewire importer without subcomponent	2023-03-21 23:07:04 -07:00
snipe	e08327be95	Ability to remove user location from users ... Rework of #9677 - sorry @godmartinez - I suck :( Signed-off-by: snipe <snipe@snipe.net>	2023-03-21 23:03:57 -07:00
snipe	418ce75a9f	Merge pull request #11431 from ntbutler-nbcs/develop ... [Fix / Minor Change] Asset checkinbytag now consistent with existingAPI	2023-03-21 22:40:21 -07:00
Brady Wetherington	6fe520a55d	Hooked various the contents of the components together	2023-03-21 22:26:32 -07:00
snipe	e40762cf7f	Small anal-retentive spacing/indenting tweaks ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-21 21:00:43 -07:00
snipe	637438ccf6	Added select2 to slack settings ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-21 20:00:11 -07:00
snipe	647f47cdfe	Check for demo mode in the clear method for the controller ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-21 19:27:05 -07:00
snipe	b28a25f544	Normalize the flash session to the way we do it elsewhere ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-21 18:59:18 -07:00
snipe	35bef6625a	Merge pull request #12703 from Godmartinz/webhook_clean_up ... adds clear and save button, save button updates accordingly	2023-03-21 17:02:33 -07:00
snipe	c229d69cec	Added next audit date override in bulk asset edit ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-21 16:01:41 -07:00
Godfrey M	3c28242a2e	save button updates accordingly	2023-03-21 15:53:09 -07:00
snipe	ecb11c3a12	Fixed #12682 - add default location to maintenance report ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-21 13:52:21 -07:00
snipe	4f8542b71b	Merge pull request #12680 from akemidx/clone_accessories ... Clone accessories	2023-03-21 13:37:04 -07:00
akemidx	3134279a95	small edits	2023-03-21 15:48:53 -04:00
Brady Wetherington	704a2ad858	WIP: trying to merge two LW components into one, not working yet	2023-03-18 20:31:56 -07:00
snipe	f2a3c2a349	Merge pull request #12693 from snipe/fixes/use_statements ... Updates the Gate “use” statement to be more specific	2023-03-18 12:00:23 -07:00
snipe	f9e190eb32	Updates the Gate “use” statement to be more specific ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-18 11:58:09 -07:00
snipe	8dd3ae8a37	Corrected gates, added fillable ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-18 11:53:20 -07:00
snipe	82dc57aa18	Renamed some variables, invoked the event listener ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-17 16:24:58 -07:00
snipe	9ac4efb912	Better commenting ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-17 16:24:38 -07:00
snipe	30cf7eb750	Disallow action in demo mode ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-17 02:42:50 -07:00
snipe	0dd11575c5	Added merge controller ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-16 18:19:16 -07:00
snipe	b374834999	Added extra order by switch for first_name and last_name ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-16 16:07:51 -07:00
snipe	5e4455f042	Deleted duplicate statement ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-16 16:07:36 -07:00
Godfrey M	371e142bae	removes unnecessary function	2023-03-15 15:57:45 -07:00
akemidx	a8e2f72e25	accessory cloning, WITHOUT copying over the image.	2023-03-15 16:55:24 -04:00
snipe	e9601bcf13	Handle already-deleted license files more gracefully ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-15 13:05:51 -07:00
akemidx	a3353b8496	committing	2023-03-15 13:48:22 -04:00
snipe	a0617edaf0	Fixed missing variable in Slack hook test ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-14 19:02:38 -07:00
snipe	4c66267f3b	Merge pull request #12668 from inietov/fixes/undefined_array_key_0 ... Fixed ErrorException: Undefined array key 0 [sc-20424]	2023-03-14 17:10:04 -07:00
slong753	60b70a4074	catch and redirect back with error	2023-03-14 16:07:09 -05:00
snipe	dfd9fcc5e0	Merge pull request #12599 from inietov/fixes/unknown_column_0_in_field_list ... Fixed Column not found: 1054 Unknown column '0' in 'field list' [sc-20004]	2023-03-14 09:51:42 -07:00
Ivan Nieto Vivanco	67471a3a77	Evaluate if the collection is empty before access the array index	2023-03-13 21:44:06 -06:00
Godfrey M	1bd37b49e9	adds translations for webhook names	2023-03-13 16:13:02 -07:00
Ivan Nieto Vivanco	d224f3177e	Delete a rule that was breaking validation	2023-03-13 16:43:10 -06:00
Godfrey M	6474249ea8	uppercased names	2023-03-13 15:29:53 -07:00
Godfrey M	7612c5d852	lowercases variables	2023-03-13 15:26:51 -07:00
Ivan Nieto Vivanco	e7b3daa80c	Adjust validator to only receive valid groups id's	2023-03-13 16:10:08 -06:00
Ivan Nieto Vivanco	e4204a6dd1	Adds validator to PATCH request in the API UsersController	2023-03-13 15:49:05 -06:00
Godfrey M	576b8f8c48	adds translations to edit and index of categories	2023-03-13 13:33:03 -07:00
Godfrey M	542332ea0c	removes discord from rules	2023-03-13 10:54:18 -07:00
Godfrey M	27a2ed5c79	Merge branch 'develop' into generalize_webhooks	2023-03-13 10:41:08 -07:00
snipe	88eb73d160	Use Carbon’s diffForHumans() method instead of our own home-grown stuff ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-08 16:47:54 -08:00
Brady Wetherington	087fe19ae7	Merge branch 'livewire_importer_2_squashed_and_rebased' of github.com:uberbrady/snipe-it into livewire_importer_2_squashed_and_rebased	2023-03-08 13:57:21 -08:00
Brady Wetherington	22d7d2a04e	Aliases could get selected when they weren't for an import_type	2023-03-08 13:56:29 -08:00
snipe	b8887bd3e3	Translated strings ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-08 13:47:56 -08:00
snipe	65c2d75c04	Added aliases ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-08 13:47:38 -08:00
snipe	dccd6fd4b1	Duplicate withCount ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-08 13:06:14 -08:00
snipe	7f8bdbd252	Added showableAssets() relationship to Category model ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-08 13:01:38 -08:00
Godfrey M	15c19a7ab7	silenced Discord option and validation, more translations	2023-03-08 10:35:45 -08:00
snipe	094859cfe8	Merge branch 'livewire_importer_2_squashed_and_rebased' of https://github.com/uberbrady/snipe-it into uberbrady-livewire_importer_2_squashed_and_rebased	2023-03-07 21:38:04 -08:00
Brady Wetherington	037489a6c0	If fields were already mapped, they would cause a 500 on re-mapping on import	2023-03-07 21:33:20 -08:00
Brady Wetherington	942bedaf06	Re-add VIP and BYOD to importer, but in Livewire	2023-03-07 18:53:32 -08:00
Brady Wetherington	09c1298e03	Merge branch 'develop' into livewire_importer_2_squashed_and_rebased ... I'll be taking in the changes to the importer front-end elsewhere	2023-03-07 18:51:05 -08:00
Brady Wetherington	fe699737eb	Add improved field-guessing logic; make sure 'do not map' fields work	2023-03-07 18:26:59 -08:00
Godfrey M	69944853f9	more translations	2023-03-07 15:57:58 -08:00
snipe	45b5a8b6ab	Catch exception if the file can’t be handled via Intervention ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-07 15:56:36 -08:00
Godfrey M	35dd0d8def	adds generalized webhooks, updates settings page, translations, validation	2023-03-07 15:48:21 -08:00
akemidx	ec5836dab4	cloning accessories first bit	2023-03-07 16:41:48 -05:00
snipe	1ebbc767f1	Merge pull request #12624 from snipe/features/added_vip_and_byod_to_importer ... Added `vip` and `byod` to importer	2023-03-06 17:11:28 -08:00
snipe	e1069ac234	Return a file not found error if it doesn’t appear on disk ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-06 15:09:37 -08:00
snipe	8b6e8898c1	Fixed hardcoded string ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-06 15:09:12 -08:00
snipe	2cb06165c4	Added missing vip field to transformer and request ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-06 15:00:04 -08:00
snipe	cc7325074e	Check that the file exists before trying to stat it for filesize ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-06 10:47:28 -08:00
snipe	f54d83ed59	Merge pull request #12612 from manuteleco/add_path_in_preflight_url_message ... Fixed #11800: Include path in the expected URL during Pre-Flight	2023-03-06 09:36:15 -08:00
Manuel Rodríguez Guimeráns	548ae7ad22	Add Reverse Proxy support to Pre-Flight URL check ... Before this change, the Pre-Flight URL check would inevitably fail whenever Snipe-IT was running behind a reverse proxy or load balancer. The URL check tries to ensure that the configured application URL matches the URL that is actually used to reach the application. However, when running behind an HTTP intermediary (like a reverse proxy or a load balancer) the HTTP connection that Snipe-IT receives is not the _real_ connection from the user anymore, but a connection from the HTTP intermediary. The scheme, host and port that Snipe-IT would obtain from that incoming intermediary connection wouldn't match what is configured as application URL and, therefore, the URL check would fail. This commit solves the situation by making Snipe-IT's Pre-Flight URL check aware of the `X-Forwarded-Proto` and `X-Forwarded-Host` HTTP headers. These headers represent the _de-facto_ standard used by reverse proxies and other HTTP intermediary components to convey information about the incoming HTTP connection to the upstream application. Being the upstream application, Snipe-IT can then make use of this information to correctly evaluate the validity of the configured application URL.	2023-03-05 18:15:16 +01:00
Manuel Rodríguez Guimeráns	1d4f4b92de	Include path in the expected URL during Pre-Flight ... So that the message displayed to the user when the URL Pre-Flight check fails is: > Snipe-IT thinks your URL is SCHEME://DOMAIN, but your real URL is SCHEME://DOMAIN/setup instead of: > Snipe-IT thinks your URL is SCHEME://DOMAIN/setup, but your real URL is SCHEME://DOMAIN/setup Having a missing "/setup" in the expected URL might confuse the user into thinking that it is an additional configuration problem they need to fix. With this change, the comparison between the expected and actual URL will not contain any accidental difference anymore. Only those that the user really needs to be aware of and fix in their setup.	2023-03-05 17:52:45 +01:00
Ivan Nieto Vivanco	95f568b934	Remove unnecessary try/catch	2023-03-02 19:50:47 -06:00
Ivan Nieto Vivanco	8a5d426ccd	Use correct LicenseSeat property	2023-03-02 19:33:32 -06:00
Ivan Nieto Vivanco	e0b2dc043a	Adds try/catch to users API	2023-03-02 11:13:56 -06:00
Godfrey M	aae178a606	gets select working, placeholders update dynamically	2023-03-01 17:10:10 -08:00
snipe	b8231f420b	Remove name from blanking paroperties ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-01 14:12:33 -08:00
snipe	84a14918bb	Updated comments ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-01 14:03:33 -08:00
snipe	473553c464	Moved gate ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-01 14:01:40 -08:00
snipe	dac877f184	Added location clone ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-01 13:51:35 -08:00
Godfrey M	354f04534e	add multi array, migration, still having issues	2023-03-01 12:30:32 -08:00
Brady Wetherington	ca849db316	The 'download activity report' displayed the wrong value for 'admin'	2023-03-01 12:23:13 -08:00
snipe	562546a853	Updated comment ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-28 23:37:30 -08:00
snipe	4860440306	Check that it’s an array (versus checking that it’s not a bool) ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-28 23:32:10 -08:00
snipe	b72a9cc6fd	Check if the $owner is boolean ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-28 23:31:26 -08:00
Brady Wetherington	54cb38603b	Cleaned up the last of the FIXME's (or downgraded them to TODO's)	2023-02-28 22:34:44 -08:00
Brady Wetherington	5cf66851f7	Finalizing the Livewire Importer! Just going to do some testing now	2023-02-28 21:58:02 -08:00
snipe	463ef02fae	Merge pull request #12578 from inietov/fixes/undefined_variable_total ... Fixed Undefined variable `$total`	2023-02-28 20:50:00 -08:00
Brady Wetherington	2f94bf96ff	Everything's all wired up; just need to clean up all the FIXME's and stuff	2023-02-28 18:36:52 -08:00
snipe	1f7ae08d76	Merge branch 'develop' into features/make_eol_sortable	2023-02-28 18:05:09 -08:00
Ivan Nieto Vivanco	1be0a8d911	Declare variable as an empty array	2023-02-28 10:22:49 -06:00
Ivan Nieto Vivanco	9d94bd6567	Validate if the license seat is not checked out, it can't be checked in	2023-02-27 18:57:38 -06:00
Brady Wetherington	53db266b69	WIP: cleaning up extraneous gunk and trying to standardize on one single Livewire Select2 implementation	2023-02-27 14:29:02 -08:00
Brady Wetherington	fb201e61f3	More wiring up Livewire to the back-end.	2023-02-27 14:29:02 -08:00
Brady Wetherington	e1c8f155bb	Wiring up more bits to Livewire	2023-02-27 14:29:02 -08:00
Brady Wetherington	8009ee79db	I think I have, now, full parity on the base Importer level ... Meaning that you can upload new files, delete old files, have error messages, have status updates - and all of them seem to work.	2023-02-27 14:29:02 -08:00
Brady Wetherington	0a085af0a0	Getting the basic wiring of the importer over into Livewire ... WIP: Wiring up more and more of the actions on the importer Files now upload okay, a little glitchy on the display-side though add to readmes so i dont forget	2023-02-27 14:28:59 -08:00
snipe	96c851468c	Added max results limit to report index ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-27 12:04:46 -08:00
Godfrey M	e8fc895e51	"adds variables, but still not working"	2023-02-27 09:19:59 -08:00
snipe	3e47d9e689	Pass the existing asset name to the bulk checkout form ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-24 09:54:46 -08:00
snipe	5e6ebb9a65	Merge pull request #12410 from uberbrady/paginate_accessories_report ... Paginate accessories report	2023-02-23 12:26:17 -08:00
snipe	8e72da42e8	Merge pull request #12406 from akemidx/vip_tag ... Added a checkbox to notate VIP status	2023-02-23 12:23:29 -08:00
snipe	eb6357636a	Merge pull request #12467 from marcusmoore/fix/scope-people-with-full-multiple-companies ... Fix full company scoping in user selects	2023-02-23 10:36:33 -08:00
akemidx	690970b4aa	fixing ff error	2023-02-22 18:18:20 -05:00
Marcus Moore	f63710fb5c	Remove unused import	2023-02-22 12:34:56 -08:00
Marcus Moore	7667b0a216	Remove extra line	2023-02-22 12:34:35 -08:00
Marcus Moore	931ca98c02	Remove middleware bypass	2023-02-22 12:33:55 -08:00
snipe	4bf1566d2a	Merge pull request #12124 from Godmartinz/feature/sc-16946/add-checkbox-to-allow-skipping-a-user-during ... Adds Boolean to Users Table for Auto Assigning Licenses	2023-02-21 20:10:46 -08:00
snipe	0c3115553e	Merge branch 'develop' into vip_tag	2023-02-21 20:03:49 -08:00
Brady Wetherington	645bba96cd	WIP: First stabs at getting Laravel Vite to work; no luck so far :( ... Probably going to back out all the 'vite' stuff anyways :/	2023-02-21 19:35:37 -08:00
Godfrey M	58801dbb0b	allows users to clear their slack settings	2023-02-16 08:43:12 -08:00
Godfrey M	7b510d5f2b	greys out submit button conditionally	2023-02-15 15:46:05 -08:00
snipe	27e5832a28	Use existing slack translations ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-15 14:06:52 -08:00
snipe	ff895739f4	Merge pull request #12446 from Godmartinz/livewire_slack_inputs ... Adds Livewire slack inputs	2023-02-15 13:27:07 -08:00
snipe	057f0be20a	Merge pull request #12473 from inietov/fixes/rollbar_attempt_to_read_property_on_null ... Fixed ErrorException: Attempt to read property "id" on null [sc-19855]	2023-02-15 12:32:53 -08:00
snipe	3800cdd0da	Merge pull request #12466 from snipe/fixes/style_fixes ... Style fixes	2023-02-15 11:07:59 -08:00
Ivan Nieto Vivanco	6936efd387	Remove e() function from customfield format input	2023-02-12 16:27:37 -06:00
snipe	b0b1c96ab5	Merge pull request #12514 from marcusmoore/fixes/preserve-asset-name-during-api-checkout ... Fix asset names being removed during API checkout requests	2023-02-14 12:22:03 -08:00
Marcus Moore	8e00191b69	Add comment	2023-02-14 12:19:16 -08:00
Marcus Moore	a94f19a68e	Use name if provided by asset checkout request	2023-02-14 12:08:20 -08:00
Marcus Moore	2349f54013	Use translation strings for importer exceptions	2023-02-13 13:30:36 -08:00
Marcus Moore	73f355f3a8	Return 422 instead of 500 when import is invalid	2023-02-08 12:39:42 -08:00
Marcus Moore	b3881a43a7	Fix return type	2023-02-08 12:34:25 -08:00
Marcus Moore	c2c666aef0	Formatting	2023-02-08 12:32:57 -08:00
Marcus Moore	5962f1b627	Catch json encoding exceptions and display them to the user	2023-02-08 12:21:51 -08:00
snipe	c1d484b5df	Fixed mismatched field/fieldset ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-07 13:31:50 -08:00
snipe	dd5f256450	We shouldn’t need this because aliases?? ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-07 11:02:02 -08:00
Ivan Nieto Vivanco	d4c838a979	Add condition in activity report to only access assigned item id if it exist	2023-02-07 11:26:49 -06:00
snipe	cd5546e4a1	Fixed wonky switch statement indenting ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-06 12:44:17 -08:00
snipe	d52d32fed9	Fixed visibility for constants and methods ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-06 12:44:02 -08:00
snipe	7363d4e223	FIxed yoda operator ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-06 12:43:35 -08:00
snipe	c8c5dddcc1	Removed unused else condition ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-06 12:43:19 -08:00
Marcus Moore	38cdcdf064	Eager load company	2023-02-06 10:59:51 -08:00
Godfrey M	74c64c1fc5	adds validation to the update hook, removes typos and deadlines	2023-02-06 09:40:57 -08:00
Marcus Moore	0cefc7de15	Skip security headers middleware when testing	2023-02-02 18:37:35 -08:00
snipe	51f3857a31	Fixed something I think I broke ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-02 15:32:45 -08:00
akemidx	b8951e2b54	fixing name from vipuser to vip	2023-02-02 15:58:05 -05:00
Godfrey M	17f1772143	removes postslack from settings controller	2023-02-01 16:58:08 -08:00
Godfrey M	3a86547ef5	fixes messages for integration test, removes slack request file, rehouses ajax method	2023-02-01 16:51:05 -08:00
snipe	d9cdb92014	Merge branch 'develop' into vip_tag	2023-02-01 16:03:23 -08:00
snipe	1a8fb5bcfe	Merge pull request #12423 from snipe/features/edit_fieldset_name ... Fixed #12418 - added ability to edit custom field names via GUI	2023-02-01 13:39:39 -08:00
Godfrey M	f95a904d90	adds integration button, working on its functionality	2023-02-01 12:08:13 -08:00
cram42	0f3c5d10ba	Merge branch 'feature-label2' into develop	2023-02-01 18:01:46 +11:00
cram42	73fd0a24ca	Clarify example asset variable	2023-02-01 17:58:58 +11:00
cram42	4b4c228f1a	Correct parameter order	2023-02-01 17:56:23 +11:00
snipe	f7ae5db4f3	Merge branch 'develop' into features/fixed_12382_added_checked_out_count_to_accessories	2023-01-31 19:56:43 -08:00
snipe	2d45ebe103	Merge pull request #12433 from inietov/fixes/asset_declined_date_issues ... Fixed Invalid date value on assets acceptance mail notification	2023-01-31 19:14:51 -08:00
Godfrey M	1e0c58c3cf	saves data correctly now	2023-01-31 11:32:05 -08:00
lukasfehling	cddae4869f	fixed the endpoint for user notification with all their assigned assets	2023-01-31 18:27:25 +01:00
Godfrey M	fc044528b8	validation is working, success message appears, database is not updating	2023-01-30 16:10:02 -08:00
Ivan Nieto Vivanco	ccc7b78f62	Store the acceptance dates with format YYY-mm-dd	2023-01-30 15:11:41 -06:00
snipe	22b0b9b090	Fixed gates on fieldsets ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-26 17:05:41 -08:00
snipe	583a0412fe	Added edit fieldsets translations ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-26 17:03:23 -08:00
Godfrey M	a63ea560ae	adds submit button, getting setAttribute error	2023-01-26 15:17:08 -08:00
Brady Wetherington	4a54586690	Add to Accessories#index an additional gate-check against reports.view	2023-01-26 11:56:06 -08:00
Godfrey M	62b4c79150	adds a couple error messages	2023-01-25 16:38:08 -08:00
Godfrey M	a69cb6204a	adds rest of inputs, and corrects Data binding	2023-01-25 16:22:34 -08:00
Godfrey M	2e22eeade5	adds one input	2023-01-25 14:29:20 -08:00
akemidx	53d8008a5f	Merge branch 'vip_tag' of github.com:akemidx/snipe-it into vip_tag	2023-01-25 17:14:29 -05:00
akemidx	b363524305	vipuser label updated to vip	2023-01-25 15:58:44 -05:00
snipe	4c3354b778	Merge branch 'develop' into vip_tag	2023-01-24 20:29:43 -08:00
Brady Wetherington	b00333c9f5	Merge remote-tracking branch 'upstream/develop' into develop	2023-01-24 17:36:39 -08:00
Brady Wetherington	c9f0f5fe8b	Change Accessories report to use server-side pagination from URL	2023-01-24 17:35:44 -08:00
akemidx	596846a94a	Add VIP Checkbox	2023-01-24 15:29:27 -05:00
Marcus Moore	b92d1d3ec7	Logically group query when searching users to scope to company	2023-01-24 11:54:56 -08:00
Godfrey M	0f8ee22053	Creates Slack Setting Form	2023-01-24 09:25:05 -08:00
snipe	dc155846ca	Hoist the autorization higher in the stack so we’re not doing logic or math when the user isn’t authorized to touch this ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-23 21:49:17 -08:00
snipe	7a9ea91be0	Merge pull request #12387 from snipe/fixes/inconsistent_UI_for_image_delete ... Updated - Refactored ImageHandler request to be more re-usable, and checkboxes with missing `minimal` class for iCheck	2023-01-23 21:39:55 -08:00
snipe	02dcb0fbd7	Shorten the additiona form request invocation to just ImageUploadRequest ... We already have the `use App\Http\Requests\ImageUploadRequest` clause at the top of this file. Signed-off-by: snipe <snipe@snipe.net>	2023-01-23 21:37:35 -08:00
cram42	c2c009a018	Merge branch 'develop' into develop	2023-01-24 09:53:42 +08:00
Jeremy Price	d3bcc48ae5	[imports] fix "Backup before importing?" checkbox on import page ... We were always taking backups before import, no matter the status of this box. Turns out we were testing for the presence of the property defined by the checkbox, rather than the value of the property, and as such were always doing a backup. We're now checking the status, and it behaves as expected	2023-01-23 15:08:59 -08:00
snipe	41537a2449	Added field to the API controller endpoints ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-22 00:56:44 -08:00
snipe	5f9af7d509	Updated API response ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-22 00:56:28 -08:00
snipe	cd8cb445ba	Corrected fieldname for user fieldname for avatar in Controller ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 18:20:53 -08:00
snipe	a0aed19f95	Refactor image handler ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 18:05:55 -08:00
snipe	f77d871dff	Use the imageHandler for profile avatar changes ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 18:05:20 -08:00
snipe	60eab08735	Added ->with(‘users as users_count’) in Accessory query ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 14:41:07 -08:00
snipe	90c1631820	Added users_count to transformer for API ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 14:40:35 -08:00
snipe	378dc968b7	Derp. Copypasta ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-18 15:44:28 -08:00
snipe	0c39c7a53d	Updated blades to add byod as a “status” ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-18 13:25:46 -08:00
snipe	f626413502	Added byod to API transformer ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-18 13:04:02 -08:00
snipe	b80d52a9c3	Added byod to asset controller for create and update methods ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-18 13:03:51 -08:00
snipe	ee4b8f4694	Added byod to API controller ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-18 13:03:31 -08:00
Godfrey M	7ce230fadc	missed a few renames	2023-01-18 08:57:59 -08:00
snipe	4ef0005e7c	BREAKING: changed API fieldname result for 2FA ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-17 17:21:40 -08:00
snipe	dbda288a44	Formatting changes only for readability ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-17 17:21:20 -08:00
snipe	eaf9332096	Added filterability to 2FA fields ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-17 17:21:03 -08:00
snipe	9d0a15990e	Check that the $use_db_field has a value before attempting a delete ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-13 11:26:11 -08:00
snipe	8f3a237ea0	More comments ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 16:29:51 -08:00
snipe	151719a91c	Added comments ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 16:24:46 -08:00
snipe	825df2cf75	Load up the item counts with the individual API methods for accurate numbers without n+1 ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 16:17:03 -08:00
snipe	249b188654	Refactor category API and transformer for query optimization ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 13:30:01 -08:00
snipe	529b005d1e	We were previously returning a collection - this reverts the change in the last PR to keep that behavior consistent ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-09 21:05:51 -08:00
snipe	7846251d25	Re-added return for no results (derp) ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-09 20:43:57 -08:00
snipe	cc665d50ed	One more refactor, hopefully simplifying ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-09 20:40:12 -08:00
snipe	ae76d46f87	Small refactor to ALWAYS return deleted assets in a collection transformer ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-09 20:23:05 -08:00
snipe	bf849128fc	Replicate the response behavior in the bySerial endpoint ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-09 19:57:47 -08:00
snipe	44be8c8f60	Determine which transformer to use based on number of assets ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-09 19:54:21 -08:00
snipe	381f89c5a8	Added format to array ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-05 13:15:30 -08:00
snipe	db43628bdc	Added default field info to models API response ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-05 13:12:54 -08:00
snipe	9c63f426d9	Added missing translation string ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-04 14:09:14 -08:00
Ivan Nieto Vivanco	3a9b8a4993	Calculate the proper amount of people in the dashboard if Full Company Support is enabled	2022-12-20 18:39:17 -06:00
snipe	399c7590cd	Merge pull request #12209 from snipe/fixes/error_downloading_unaccepted_assets ... Fixed 500 when downloading the Unaccepted Assets report [sc-19555]	2022-12-15 14:19:41 -08:00
snipe	29c2ff56ec	Merge pull request #12188 from snipe/fixes/decrease_logging_for_saml_when_not_enabled ... Removed extra logging case that was very noisy	2022-12-15 11:26:49 -08:00
snipe	227fef76ee	Merge pull request #11736 from Godmartinz/gh6508_ldap_default_group ... Adds a permission group selection for directory sync	2022-12-15 11:06:53 -08:00
snipe	c432fb9d70	Merge pull request #12181 from Godmartinz/gh12163_asset_age ... Adds asset age to asset index and asset view pages	2022-12-13 10:28:17 -08:00
Godfrey M	fa872b09a9	fixes a typo, the world is great again	2022-12-12 10:38:31 -08:00
snipe	4ac09ff4e4	Add email in assigned_to on asset transformer ... Signed-off-by: snipe <snipe@snipe.net>	2022-12-09 16:07:17 -08:00
snipe	775df0ab60	Merge pull request #12221 from snipe/fixes/throttles_reset_password_form ... Add throttle for password reset form	2022-12-08 14:51:22 -08:00
snipe	f7da87520c	Merge pull request #12134 from Godmartinz/custom_report_user_fields_missing ... fixes a regression with the csv assigned to fields	2022-12-07 16:18:32 -08:00
snipe	c3a6874b16	Add throttle for password reset form ... Signed-off-by: snipe <snipe@snipe.net>	2022-12-06 20:42:40 -08:00
Ivan Nieto Vivanco	eb67d1b064	Filter items from the report if null returned	2022-12-06 18:00:16 -06:00
akemi	2f8a435e18	fixing curly quotes	2022-12-05 18:06:28 -05:00
akemi	55f5e7866d	edits for PR	2022-11-29 15:59:36 -05:00
Godfrey M	3206929ee4	adds AgeFormatter, not working yet	2022-11-29 09:51:42 -08:00
snipe	1fe0bfe17e	Removed extra logging case that was very noisy ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-28 19:27:42 -08:00
akemi	39e06a8856	Update to PR#12119, adding inventory notification to messages and changing code to be dynamicaly translated	2022-11-28 14:16:22 -05:00
Godfrey M	8d861cfd82	adds age to the asset table	2022-11-28 10:59:18 -08:00
snipe	f0c5560c1b	Merge pull request #12141 from Godmartinz/adds_serial_number_to_history ... Added `serial` column to the user history page	2022-11-17 21:15:26 +00:00
Godfrey M	86bc409d3a	adds serial column to the action logs	2022-11-17 12:57:53 -08:00
Godfrey M	a02a04d601	fixes a regression with the csv assigned to fields	2022-11-16 16:34:57 -08:00
snipe	489895a5fa	Added comments and spacing for readability ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-16 17:48:28 +00:00
snipe	1122562b4e	Handle use case where there are no custom fields for any assigned models ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-16 17:45:50 +00:00
snipe	5df76155ce	Check for the format index in the $data array when creating a new custom field via API ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-16 15:53:16 +00:00
Godfrey M	45636b8114	adds should_autoassign boolean to users table	2022-11-15 15:42:57 -08:00
snipe	6400bdc266	Merge pull request #12120 from snipe/features/added_deleted_filter_to_search_by_tag ... Added ability to include deleted items in tag search endpoint	2022-11-15 17:54:34 +00:00
snipe	ffd252a00c	Merge pull request #12119 from lukasfehling/feature/added-endpoint-for-user-notification ... Added: API endpoint to trigger a user email notification with their assigned assets	2022-11-15 17:51:15 +00:00
snipe	7fcf6f2463	Removed deleted parameter ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-15 17:47:21 +00:00
snipe	2c5a0d370c	Clean up API byserial and bytag, allow deleted param ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-15 17:33:56 +00:00
snipe	bcbe517446	Added ability to include deleted items in tag search endpoint ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-15 17:18:09 +00:00
lukasfehling	d9a9bd1c0d	Added a api endpoint for sending email notifications to users with their assigned assets	2022-11-15 18:17:51 +01:00
snipe	9a5d431962	Allow searching firectly for asset tag and serial ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-15 17:13:26 +00:00
snipe	50431c046f	Fixed missing slash in stdClass ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-15 17:04:06 +00:00
snipe	ae259f36ae	Merge pull request #12106 from fernando-almeida/develop ... Fix HTTP AssetTransformer to generate an empty object for missing custom fields	2022-11-15 15:54:43 +00:00
snipe	56c4fa7c27	Override display settings if field is encrypted ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-14 22:41:31 +00:00
Fernando Almeida	47ee2a8153	Fix HTTP AssetTransformer to generate an empty object for missing custom_fields instead of an empty array.	2022-11-14 16:31:08 +00:00
snipe	1e34398c99	Permissions check on the field itself ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-10 17:19:12 +00:00
snipe	1fa624420e	Removed unneeded relationships ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-10 16:46:49 +00:00
snipe	52dc5aa4ba	Added field to controller and tranformer ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-08 15:26:59 +00:00
snipe	04b6f023ae	Use new upload string ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-03 13:57:50 -07:00
snipe	3c7d63c060	Disallow uploads if app is locked ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-03 13:52:23 -07:00
Cram42	36210f1c6a	Allow settings to be overridden in request	2022-11-02 19:30:45 +08:00
Cram42	48fb4f2439	Add labels route for testing layouts	2022-11-02 17:23:52 +08:00
Cram42	4bb40adfce	Add Asset Tag as separate supported feature	2022-11-02 16:07:50 +08:00
Cram42	a8b6a4a259	Allow passing "template" param	2022-11-02 16:04:40 +08:00
snipe	eb81c290dc	Accessory file upload ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 19:50:39 -07:00
snipe	97aeb1fcec	Use the generic file uploads strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 19:31:23 -07:00
snipe	f1cb7ee410	Fixed some translations ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 19:28:39 -07:00
snipe	84c0f50266	Added ComponentFilesController ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 19:10:04 -07:00
snipe	2106b64da6	Fixed some layout issues ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 19:06:49 -07:00
snipe	25f69a7bd2	Added consumable methods for uploads ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 17:52:28 -07:00
Cram42	6b2fe582ca	Merge branch 'feature-label2' into develop	2022-11-01 20:12:28 +08:00
cram42	7e2546b31f	Merge branch 'snipe:develop' into develop	2022-11-01 20:04:59 +08:00
Cram42	7b29ddd283	Tie into tag generation	2022-11-01 20:02:12 +08:00
Cram42	6de48b4dc8	Implement settings for labels	2022-11-01 20:00:53 +08:00
Cram42	5558a005b9	Implement API for labels	2022-11-01 19:57:51 +08:00
snipe	7cb4740359	Merge pull request #11766 from snipe/fixes/wtf_method_names_derp ... Fixed (?) method name?	2022-10-26 17:39:11 -07:00
Cram42	0e69e4248c	Fix: Multiple outputs at hardware/{id}/label	2022-10-27 08:12:42 +08:00
snipe	c1eee2cc72	Corrected string for invalid current password ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-26 12:18:29 -07:00
snipe	12c7223bcd	Renamed column back to assets_count for legacy ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-26 09:39:03 -07:00
snipe	28b0d8cf0f	Null expected_checkin on user bulk checkin and delete ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-26 00:54:37 -07:00
snipe	e670ffe349	Added Assets Assigned to tab ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-26 00:16:06 -07:00
snipe	4eed2baa31	Added default tab to locations ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-20 19:06:58 -07:00
Godfrey M	f2d4a61e3c	removes dead space	2022-10-18 15:31:37 -07:00
Godfrey M	3f25a1bf61	removes dead code	2022-10-18 15:25:38 -07:00
Godfrey M	f9ac447dd1	adds default group to LDAP	2022-10-18 15:18:09 -07:00
snipe	98f2e0271b	Merge pull request #11942 from nh314/develop ... Correct comparison logic	2022-10-12 10:55:29 -07:00
snipe	0312ecf09d	Sets nullable attribute on validation ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-12 10:30:47 -07:00
Phan Nguyen	8ff109e9da	Correct comparison logic ... Comparison operator should be greater than or equal	2022-10-08 12:54:15 +07:00
snipe	14b7319b63	Added start/end to sortable columns ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-05 17:07:07 -07:00
snipe	9d641573b5	Make the APU return null instead of blank ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-05 17:01:04 -07:00
snipe	bdfac1a345	Added start/end to the users API ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-05 16:58:37 -07:00
snipe	f7a9be92ca	Store data for start and end ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-05 16:58:26 -07:00
snipe	56ba8a7e24	Added API select fields and filters ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-05 16:58:16 -07:00
snipe	bcebc1e33b	Stylistic refactoring ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-04 16:37:33 -07:00
snipe	891b5b2882	Added routes, language ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-04 15:45:25 -07:00
Ivan Nieto Vivanco	25c10c3819	Filter non-asset items from download unaccepted assets report	2022-10-03 18:12:30 -05:00
snipe	b07c4caa37	Extra whitespace ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-30 11:47:27 -07:00
snipe	5a7e35c0e8	Made a conditional escape according to .env ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-30 09:48:43 -07:00
snipe	bae200edd7	Use EscapeFormula() in CSV export ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-30 09:29:17 -07:00
snipe	36484d50ef	Fixed depreciation API call ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-29 17:07:42 -07:00
Brady Wetherington	420c216973	Added counts to Dashboard Pie Chart legends and tooltips	2022-09-29 13:20:58 -07:00
snipe	70c766e8b3	Added setting to choose dashboard type ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-29 04:16:46 -07:00
snipe	0b2ce7be07	Fixed #11521 - switch to using status meta from status label name ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-29 03:48:58 -07:00
Ivan Nieto Vivanco	c0f83a7927	Delete not necessary conditional	2022-09-20 19:02:01 -05:00
Ivan Nieto Vivanco	5a1062f0f4	Delete debugging symbols (just kidding, it's just a dd() function)	2022-09-20 18:58:31 -05:00
Ivan Nieto Vivanco	c32676596c	Redirect correctly if not enough license seats exists to be checkout	2022-09-20 18:55:53 -05:00
snipe	dcab1381e7	Check for licenses.files permissions ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-16 14:00:27 -07:00
Ivan Nieto Vivanco	41b75704e3	Removes format when changing to custom fields elements that doesn't need it	2022-09-15 11:21:02 -05:00
snipe	3192a68b06	Pulled assetlog from custom report controller ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-14 18:17:52 -07:00
Godfrey M	6b6a079440	fixes current value and monthly depreciation on reports and calculations	2022-09-14 17:01:18 -07:00
Godfrey M	9b448227f7	tinkering to no avail	2022-09-13 11:40:10 -07:00
Ivan Nieto Vivanco	3aff97ace1	Remove the previous user hashed password	2022-09-06 18:43:35 -05:00
snipe	ae505ef44d	Literally have no idea how this ever worked ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-31 19:20:35 -07:00
Godfrey M	193b31e427	select options working, testing sync then done	2022-08-31 12:58:33 -07:00
snipe	dcbd407698	Merge pull request #11661 from inietov/fixes/notifications_asset_acceptance ... Send notifications when Acceptance Assets actions occur [sc-9917]	2022-08-30 12:14:58 -07:00
Godfrey M	0c362e8b57	gets the groups selector to appear but options are blank	2022-08-29 12:09:56 -07:00
snipe	96ec96ff7f	Merge pull request #11737 from inietov/fixes/validation_error_still_without_required_rule ... Fixed Validation error when empty default customfield values	2022-08-25 17:54:04 -07:00
Ivan Nieto Vivanco	0d4e9c183b	Save correct id in action log if the bulk-checkin is of type license	2022-08-25 19:16:48 -05:00
Ivan Nieto Vivanco	1ff2d15c4a	Replace 'required' rule with 'nullable' to allow blank default customfields values	2022-08-25 18:16:50 -05:00
Godfrey M	fc6fefdb4e	adds migration, variables, checkbox,working on groups	2022-08-25 15:19:38 -07:00
snipe	482a7b2a3a	Merge pull request #11700 from inietov/fixes/unaccepted_assets_reminder_500 ... Fixed 500 error when sending unaccepted assets reminder	2022-08-25 14:00:00 -07:00
snipe	6f0f6c8042	Don’t prevent deletion if user has consumables checked out ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-25 12:51:02 -07:00
snipe	6fde72a693	Log user out of other devices when they change their password ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-25 12:24:26 -07:00
Ivan Nieto Vivanco	6e85c2e5cb	Delete unused import	2022-08-24 16:30:25 -05:00
Ivan Nieto Vivanco	30d0125cbd	Remove the rule 'required' for default values, if custom field is obligatory	2022-08-24 16:18:11 -05:00
snipe	906a36dc1a	Merge pull request #11703 from julian-piehl/fixes/wrong-trans-string ... Fixed Translation String: wrong key at request canceled message	2022-08-22 16:16:10 -07:00
Warren White	ba7d6dde3f	Fixed #11706: changes the display of managers username to First Last name	2022-08-19 10:17:25 -07:00
Peace	94bbf2bf2f	fixed translation string for canceled requests	2022-08-19 13:59:01 +02:00
Ivan Nieto Vivanco	e5cc6ec972	Fixes error 500 if checkout_acceptances table have a created_at null column	2022-08-17 22:02:13 -05:00
snipe	91e824c5b0	Check for nullifying checkboxes ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-11 18:25:07 -07:00
Ivan Nieto Vivanco	a33ca39237	Figure out declined notifications	2022-08-11 16:00:21 -05:00
Godfrey M	814992eb7d	allows company and location ids to be null	2022-08-11 12:47:40 -07:00
Ivan Nieto Vivanco	267997f0a6	Customize the notifications with the needed data	2022-08-11 14:01:11 -05:00
snipe	ef099aa644	Reverted notes to note since pivot ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 16:09:56 -07:00
snipe	acd666fdf5	Added notes to user consumables tab ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 15:34:07 -07:00
snipe	512348cc5a	Added withInput() ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 15:15:09 -07:00
snipe	e3293151a2	Added note on checkout ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 15:04:59 -07:00
snipe	3ec77724d8	Added note pivot ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 15:04:34 -07:00
snipe	024a014298	Changed notes to note ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 15:04:19 -07:00
snipe	e7c47408a7	Derp ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 13:57:42 -07:00
snipe	637604dfaf	Fixed #8928 - add URL and ID to custom asset report ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 13:51:47 -07:00
Godfrey M	92e6ea96b2	if eol is missing from asset model monthly depreciation will be recalculated	2022-08-09 15:05:15 -07:00
snipe	9acfceba29	Added relations to report search ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 23:50:10 -07:00
snipe	cc92d342ea	Added deleted at value ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:58:37 -07:00
snipe	02caa13222	Removed debugging ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:58:30 -07:00
snipe	975b4dee2f	Added deleted header ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:58:17 -07:00
snipe	8e18ce74b2	Update method name ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:12:18 -07:00
snipe	1b657ee995	Merge pull request #11601 from vickyjaura183/bugfix/error_404_bulkcheckout ... Error 404 fixed on submitting without mandatory field	2022-08-02 17:19:22 -07:00
snipe	e3b13143bf	Merge pull request #11594 from Godmartinz/adds_deleted_asset_options_to_custom_reports ... Adds options to include Deleted assets to custom asset reports	2022-08-02 10:33:57 -07:00
Godfrey M	ff080a2d8f	replace checkboxes with radiobuttons	2022-08-02 10:27:55 -07:00
vishalkumar183	96b40a5edd	Error 404 fixed on sumitting witout mandtory field	2022-08-02 18:44:16 +05:30
snipe	af7ccf3beb	Handle logout route names ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 16:17:40 -07:00
snipe	53ff28d2b0	Handle consumables route names ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 16:07:56 -07:00
snipe	4a4636bd03	Handle accessories route names ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 16:06:28 -07:00
snipe	b035003546	Handled hardware route names ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 15:59:54 -07:00
Godfrey M	842dafefec	adds options to include Deleted assets to custom asset reports	2022-08-01 14:52:12 -07:00
snipe	78097df7ff	Aplpies current time to checkin date ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-21 21:45:25 -07:00
snipe	7313bca403	Checkin without deleting ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-20 17:57:19 -07:00
snipe	6428dc5cd2	Removed duplicate supplier_id ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-13 13:08:15 -07:00
mikeroq	f21824a8e2	Changed comparing the action type from translated in presenter to actual value	2022-07-12 17:59:03 -05:00
snipe	0ccd7e09de	Merge pull request #11488 from Godmartinz/feature/sc-19107/add-box-to-custom-reports-to-not-include ... adds a checkbox to exclude archived assets from custom reports	2022-07-12 12:59:18 -07:00
Godfrey M	27039325f3	removed comments, because I forgot	2022-07-12 12:41:07 -07:00
Godfrey M	58c54cc3dc	uses notArchived scope instead now	2022-07-12 12:20:11 -07:00
Godfrey M	48349071ed	accounts for status_id as well	2022-07-12 09:46:44 -07:00
mikeroq	5efe45226d	Fixes Email List of All Assigned being "successful" when the user has no email ... Added check in view to disable button if there is no email Added translation for title on disabled button and for email check in controller Fixed missing trans for user not found message	2022-07-11 20:02:10 -05:00
snipe	bb091760af	Fixedd unclosed brace ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-11 17:11:28 -07:00
Godfrey M	75844c5942	adds a checkbox to exclude archived assets from custom reports	2022-07-11 09:56:58 -07:00
snipe	2518e2f0ee	Removed > 300 ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-08 17:09:56 -07:00
snipe	43e370f35a	Move migrations further up ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-08 16:40:51 -07:00
snipe	ee4f355e49	Changed logging to debug ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-05 17:58:45 -07:00
mikeroq	be8869978d	Added import for Setting model	2022-07-04 07:29:01 -05:00
snipe	92d46edca3	Cleaned up logging output ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-01 13:33:58 -07:00
snipe	45c616639c	Replicates #11444 ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-01 11:21:02 -07:00
snipe	4e547a3639	Fixed typos :( ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-30 21:06:36 -07:00
snipe	b910db0617	Fixed #11393 - reject acceptance if no file is present ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-30 21:01:58 -07:00
snipe	25cb32ca6a	Fixed typo ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-30 18:51:44 -07:00
snipe	1a423a252b	Derp ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-30 15:22:58 -07:00
snipe	7591f3f092	Added auth filter check regex ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-30 15:15:49 -07:00
snipe	2cace3c73a	Added LDAP warnings on page load ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-30 15:08:12 -07:00
snipe	656efc5f92	Fixed missing trans() ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-30 14:20:15 -07:00
Nathan Butler	0617480f73	Asset checkinbytag now consistent with existingAPI ... This is a non-breaking change to the checkinbytag endpoint to bring it inline with the usage/formatting of the other bytag endpoints that currently exist - using the URL path to define the asset_tag instead of passing it through as a url query. Both methods will work, but the URL Path method will take precidence if it is used (the query will be ignored if included)	2022-06-30 09:23:52 +10:00
Godfrey M	cd9d2d0cec	adds docblock	2022-06-29 13:01:29 -07:00
Godfrey M	e471aa8639	adds button to email user list of assets from profile	2022-06-29 11:15:15 -07:00
snipe	5af6330398	Merge pull request #11417 from ntbutler-nbcs/master ... [Feature] - Add checkoutByTag API endpoint for assets	2022-06-29 05:03:01 -07:00
snipe	daaf8713d8	Merge branch 'dampfklon-9813-duplicate-accept-asset' into develop	2022-06-29 04:58:26 -07:00
snipe	5b02d9ed06	Merge branch '9813-duplicate-accept-asset' of https://github.com/dampfklon/snipe-it into dampfklon-9813-duplicate-accept-asset ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # resources/views/account/accept/create.blade.php	2022-06-29 04:58:13 -07:00
snipe	b04cf20735	Merge pull request #10758 from inietov/fixes/badmethodcallexception_undefined_method_Asset.unaccepted_develop ... Fixes BadMethodCallException Call to undefined method App\Models\Asset::unaccepted() for master [ch-17636]	2022-06-29 04:34:51 -07:00
Nathan Butler	e28e7e37b8	Removed unneeded checks when searching for asset	2022-06-29 17:49:50 +10:00
snipe	b590f29f33	Attempt a download via API ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 23:59:13 -07:00
snipe	1debdc47cf	Backups endpoint ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 23:30:17 -07:00
snipe	53bc15900b	Formatted show api ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 23:23:55 -07:00
Nathan Butler	67e9b7795a	Added asset checkoutByTag API endpoint	2022-06-29 16:11:57 +10:00
snipe	52332bc9ed	Include token ID in payload ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 23:10:56 -07:00
snipe	9680b02bce	Check that the user has permission to create their own API keys ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 22:09:18 -07:00
snipe	413487de80	Made method naming consistent ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 21:32:12 -07:00
snipe	1158fa9ea8	Added personal access tokens to api ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 21:29:15 -07:00
snipe	3df9260ca8	Added additional filters for api indexes ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 19:59:45 -07:00
snipe	71c8050883	Added additional search filters for location API ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 19:07:11 -07:00
snipe	c90ed9f25f	Allow models uploads ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 15:50:07 -07:00
snipe	14d8fb66aa	Merge pull request #11405 from snipe/fixes/use_db_column_instead_of_converted_value ... Only care about the custom field's converted name when updating the custom field itself	2022-06-27 17:36:26 -07:00
snipe	bf08e73f8f	Removed comments and server side cookie info ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-27 16:36:09 -07:00
snipe	52bd7d0d68	Merge remote-tracking branch 'origin/develop'	2022-06-27 14:25:38 -07:00
snipe	baad3b9d58	Only care about the converted name when updating the custom field itself ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-27 14:17:07 -07:00
snipe	bee694e605	Fixed typo ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-27 09:57:20 -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	d167d2a10f	Disallow backup deletion and log attempt if not allowed ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-24 15:49:22 -07:00
snipe	77bf28bcb6	Disallow purge ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 20:11:43 -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	9fd3541520	Missed on createdBy ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 18:42:22 -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	d8daec2e0a	Added created_by results to user index API ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 17:19:30 -07:00
snipe	c9b81d65f1	Save the user id who is creating the user ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 17:19:08 -07:00
snipe	7f05029089	Added created_by to API output ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 17:18:31 -07:00
Godfrey M	b0897a1fc9	adds acceptance for consumables and components	2022-06-23 11:52:35 -07:00
Godfrey M	d00b469001	fixed the search for the license	2022-06-23 11:33:36 -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	7976401aa2	Add error message when the default customfield values can't be validated	2022-06-22 22:17:05 -05:00
Ivan Nieto Vivanco	321367b974	Adds validation to custom fields' default values	2022-06-22 21:06:07 -05: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	135fdae209	Merge pull request #11337 from mikeroq/fixes/user_edit_website_missing ... Fixed #11332 Added website field that was missing from update and store method.	2022-06-22 10:16:38 -07:00
snipe	a5b857c753	Return error if token is incorrect ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 19:30:51 -07:00
snipe	a31bca1798	Check that the user is activated before letting them reset their password ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 18:48:02 -07:00
snipe	7f8fc7add9	Make SAML debugging less noisy ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 17:57:17 -07:00
snipe	6bc525bc25	Merge pull request #11352 from inietov/fixes/assets_transformer_date_customfields_fixes ... Fixed #11335 Assets transformer date customfields issues	2022-06-21 17:56:17 -07:00
snipe	f4f400ed87	Handle workflow better for invalid users ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 16:13:43 -07:00
snipe	a49ccf0863	Removed unused rules ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 16:13:26 -07:00
snipe	300879847f	Added a few comments to make it clearer what’s happening ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 14:33:10 -07:00
snipe	21875100b6	Fixed missing password.token string and checked for user existing before trying to reset ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 14:15:38 -07:00
snipe	675f42401c	Fixed #11343 - ability to null asset name ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 10:57:39 -07:00
Ivan Nieto Vivanco	3a5c09c424	Used the getFormattedDateObject() function with the expected parameters	2022-06-20 19:58:51 -05:00
mikeroq	d60af478ad	Added website field that was missing from update and store method.	2022-06-17 08:09:39 -05:00
Mike Roquemore	8a27ef30d5	Missing total argument on transformDeprecations method ... Removed duplicate array key on transformDeprecation method	2022-06-15 21:52:15 -05:00
snipe	af66f83a3d	Check for blank (not null) values i asset transformer date ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-15 13:42:30 -07:00
snipe	74bc06cc49	Removed debugging code ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-15 02:07:58 -07:00
snipe	a33276cb3d	Additional filters on maintenances UI ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-14 16:10:48 -07:00
snipe	954b54f914	Removed duplicated $allowed_columns ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-14 15:06:04 -07:00
Ivan Nieto Vivanco	50c008ead5	Adds check in condition that format custom dates	2022-06-14 01:37:15 -05:00
snipe	dd9c9520fb	Correctly filter by category_id ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-13 20:42:21 -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	0153a37cd7	Merge pull request #11264 from snipe/fixes/set_default_ldap_version ... Fixed default ldap version if not specified	2022-06-13 17:14:57 -07:00
snipe	4c11041477	Fixed regression: missing restore option for assets via API ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-09 17:17:38 -07:00
Ivan Nieto Vivanco	0c3972d7b7	Add spaces to the code for consistency	2022-06-09 13:02:31 -05:00
Ivan Nieto Vivanco	4a0eb2b3f1	Add element type of customfield to API response	2022-06-09 12:57:20 -05:00
snipe	728338bfa8	Merge pull request #10824 from inietov/fixes/accessories_consumables_negative_numbers_develop ... Fixes Accessories total quantity shows a negative number for develop branch	2022-06-08 10:53:57 -07: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	5458676ead	Default to v3 of LDAP on settings save ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-06 21:00:22 -07:00
snipe	e0102ddbf0	Fixes #11093 Return true/false for custom fields/fieldsets required in API ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-06 20:03:20 -07:00
snipe	dba06a3a9e	Check for valid location before trying to print ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-03 16:56:15 -07:00
snipe	07b1062fb2	Better handle API calls to nonexistent users ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-03 16:55:23 -07:00
Achmad Fienan Rahardianto	fe65de1207	implements cookie to maintain display preference	2022-06-01 11:54:05 +07:00
Ivan Nieto Vivanco	eb34cf7917	Evaluates if logo is uploaded before export PDF	2022-05-31 15:59:01 -05:00
Ivan Nieto Vivanco	37f9cca5ec	Minor stylistic change	2022-05-28 08:11:13 -05:00
Ivan Nieto Vivanco	e0050bc844	Don't let a license to be checked out to a non-existent target	2022-05-26 18:06:53 -05:00
Ivan Nieto Vivanco	1f6ab340a6	Give a more descriptive name to variable	2022-05-25 18:53:17 -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	bd384d3f10	Small formatting fixes ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	ad8143b0bd	Added comments ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	625f120813	Removed unused cases ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	b7eb72fe49	Rough refactor of the acceptance controller ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	8e85d316c9	Removed stored_eula_file from API transformer ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	4eab5fd075	Removed older comments ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	266a9e5328	Removed stored_eula_file from controller ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	f609146c29	Corrected field name ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-18 15:37:10 -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
snipe	014a32b050	Run migrations after restore ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-18 14:12:17 -07:00
Ivan Nieto Vivanco	1453b36484	Add filter to only get Assets for the unaccepted assets report	2022-05-18 14:46:48 -05:00
Ivan Nieto Vivanco	a771984619	Add an early return if for some reason the import record is not found	2022-05-18 06:15:46 -05:00
Brady Wetherington	b4a0d33ba8	Reduce logging further; we know the main error condition now	2022-05-17 19:57:42 -07:00
snipe	a8eb138ae0	Merge pull request #11133 from inietov/fixes/backup_createdat_time_incorrect ... Fixes #11096 Backup created_at time is incorrect	2022-05-17 14:39:19 -07:00
Ivan Nieto Vivanco	72493d54aa	Show the date and time as the user select in their settings	2022-05-17 16:36:05 -05:00
Ivan Nieto Vivanco	91c7a89f93	Change to use the date() function instead of Helper::getFormattedDateObject()	2022-05-17 16:24:52 -05:00
snipe	11f540daaf	Added debug line ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-17 09:41:35 -07:00
snipe	0dfc98a493	Force db:wipe ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-17 04:27:48 -07:00
snipe	d4f7b5f80c	Fixed #11100 for individual users ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-16 12:07:18 -07:00
snipe	64b582c657	Merge pull request #11108 from uberbrady/fix_ldap_first_login_password ... Pass the password along directly instead of retrieving it from the In…	2022-05-16 11:01:35 -07:00
Brady Wetherington	6c86a28d18	Pass the password along directly instead of retrieving it from the Input or Request	2022-05-16 10:58:27 -07:00
Brady Wetherington	b05d85ab0a	Fix bulk-user reset-password links	2022-05-16 10:38:12 -07:00
Johnson Yi	4401dab8d6	fix saml slo for logout	2022-05-14 11:59:34 +00:00
snipe	333aa05809	Added missing use statement ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 16:46:13 -07:00
snipe	c5ec3efc70	Merge pull request #11065 from snipe/fixes/double_encoding_for_custom_fields ... Fixed #11014 - double encoding for custom fields	2022-05-13 16:12:24 -07:00
Brady Wetherington	0ddb0f2c81	Switch the barcode backend to SVG, and fix the two-factor middleware	2022-05-13 14:22:27 -07:00
snipe	6fc222a648	Fixed #11014 - Removed double escaping on custom fields ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 05:45:00 -07:00
snipe	ef1eb15a91	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/permissions.php	2022-05-12 09:31:42 -07:00
snipe	c52faaf23d	Added checkout to permissions check ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-11 19:02:23 -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
snipe	4fccf4ddc4	Few more log lines ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-10 12:27:42 -07:00
snipe	646166b2b6	Removed debug line ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-10 12:16:07 -07:00
snipe	f4e737eaf3	More SAML debugging ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-10 12:14:22 -07:00
snipe	f572eaa421	Added debugging for SAML login ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-10 12:07:07 -07:00
snipe	dfd4d54433	Fixed route name ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 15:46:25 -07:00
snipe	220f94faee	Check that the session key exists ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 14:10:47 -07:00
snipe	22ec3c1398	Use error style instead of warn/info when nothing was selected ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:41:52 -07:00
snipe	caf17d4f25	Fixed wrong variable name ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:41:32 -07:00
snipe	e1b24bb763	Added a comment ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:30:21 -07:00
snipe	76213ec3d9	Create a session on bulk actions, store it for redirect, then delete it ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:14:08 -07:00
snipe	243739e9c3	Added missing gate for bulk checkout ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:13:36 -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	b20921cb62	Removed duplicate session regenerate ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-05 21:35:05 -07:00
snipe	0939591efb	Merge pull request #11003 from inietov/fixes/integrity_constraint_violation_column_order_cannot_be_null_develop ... Fixes QueryException Integrity constraint violation: Column 'order' cannot be null for develop	2022-05-05 13:28:00 -07:00
snipe	a859eac4a0	Merge pull request #11002 from inietov/fixes/integrity_constraint_violation_column_order_cannot_be_null ... Fixes QueryException Integrity constraint violation: Column 'order' cannot be null	2022-05-05 13:27:45 -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
Ivan Nieto Vivanco	37805509da	Adds an integer casting to the order input field so it cannot be null	2022-05-01 15:27:05 -05:00
Ivan Nieto Vivanco	01232d9a54	Adds an integer casting to the order input field so it cannot be null	2022-05-01 15:16:56 -05:00
Ivan Nieto Vivanco	ac8da55270	Evaluate if an item still exists before trying to get its name in the report	2022-05-01 13:25:55 -05:00
Ivan Nieto Vivanco	1cbbf8f976	Evaluate if an item still exists before trying to get its name in the report	2022-05-01 13:11:05 -05:00
Johnson Yi	92fe1287ea	Do not saml login automatically after normal logout	2022-04-29 15:35:08 +00: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
snipe	2e9cf8fa87	Added access gate to the requested assets index ... Signed-off-by: snipe <snipe@snipe.net>	2022-04-28 15:45:37 +01:00
snipe	f623d05d0c	Escape checkout target name ... Signed-off-by: snipe <snipe@snipe.net>	2022-04-24 15:27:11 +01:00
snipe	b2087a9947	Adds validator to make sure the status ID is deployable ... Signed-off-by: snipe <snipe@snipe.net>	2022-04-15 13:06:55 +01:00
snipe	6b1329133b	Adds status ID to asset checkout API endpoint ... Signed-off-by: snipe <snipe@snipe.net>	2022-04-15 13:06:35 +01:00
snipe	698c7f4904	Fixes potential XSS vuln in user requestable results ... Signed-off-by: snipe <snipe@snipe.net>	2022-04-15 12:22:20 +01:00
snipe	1441cf9f4f	Ports #10494 to master ... Signed-off-by: snipe <snipe@snipe.net>	2022-04-12 21:04:57 +01:00
snipe	7b891f0952	Merge pull request #10913 from inietov/fixes/bulk_user_edit_not_updating_asset_locations ... Fixes Bulk user edit not updating checked out asset locations	2022-04-07 19:41:01 +01:00
snipe	8218b5ef47	Merge pull request #10914 from inietov/fixes/bulk_user_edit_not_updating_asset_locations_develop ... Fixes Bulk user edit not updating checked out asset locations	2022-04-07 19:40:42 +01:00
snipe	b73542664b	Merge pull request #10919 from Godmartinz/gh10866-checkin_time_always_show_12am ... Fixed #10866 - Checkin time always shows 12am	2022-04-07 19:40:11 +01:00
Godfrey M	3eb7a87a66	fixes action_date for check-in not including H:i:s	2022-04-07 11:24:12 -07:00
Godfrey M	1325628039	fixes typo	2022-04-07 11:18:16 -07:00
Godfrey M	8498082f21	fixes typo	2022-04-07 11:16:40 -07:00
Godfrey M	6dc45c189b	removed deadspace	2022-04-07 11:10:36 -07:00
Godfrey M	5d0a1ebb7a	fixes action_date for check-in not including H:i:s	2022-04-07 11:08:43 -07:00
Ivan Nieto Vivanco	e1927aa154	Update Assets locations when user's location changes whey they got bulk-edited	2022-04-06 19:23:49 -05:00
Ivan Nieto Vivanco	6529a75683	Update Assets locations when user's location changes whey they got bulk-edited	2022-04-06 19:12:02 -05:00
Ivan Nieto Vivanco	b5378eff64	Fix several typos	2022-04-05 16:12:31 -05:00
Ivan Nieto Vivanco	1a448cc4b6	Take the values from the importer form to configure the used importer	2022-03-29 17:31:43 -06:00
snipe	a937bd34f6	Merge master back down into develop ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-29 16:28:43 +01:00
snipe	bdabbbd4e9	Logout user when their activated status is switched to off ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-29 13:44:53 +01:00
snipe	7941a88623	Merge pull request #10817 from dampfklon/fix-10810-unaccepted-assets ... Fix #10810 unaccepted assets	2022-03-29 12:10:37 +01:00
snipe	b5f3a357e2	Merge pull request #10850 from Godmartinz/feature/sc-18937/add-manager-to-ldap-sync ... This looks good, thanks!	2022-03-29 12:06:01 +01:00
snipe	639409fb3f	Backporting #10829 to master ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-25 13:00:16 +00:00
Godfrey M	a1429ce86b	removed manager_name from user files	2022-03-24 11:47:13 -07:00
Godfrey M	c1f8252388	adds manager field to LDAP sync	2022-03-24 11:24:39 -07:00
Godfrey M	55680762de	Merge branch 'develop' into feature/sc-18937/add-manager-to-ldap-sync	2022-03-22 16:33:58 -07: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
Godfrey M	3e01981576	clean up	2022-03-22 10:07:08 -07:00
Godfrey M	62352ef1a1	completes accessory eula agreement blade	2022-03-22 10:04:22 -07:00
Ivan Nieto Vivanco	319d816002	Update in the license seat the user that the asset with that license have assigned	2022-03-21 15:06:43 -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	df60729140	Fixed #10769 - redirect user back to due for audit page ... This could probably take a little reworking, since if you are auditing from the Overdue for Audit page, we’d want to take you back *there* instead of the Due for Audit page. Signed-off-by: snipe <snipe@snipe.net>	2022-03-21 14:27:18 +00:00
snipe	e04ae63d02	Apply the fix to API controller too :( ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-19 23:12:48 +00:00
snipe	7db252ade3	Fixed #10840 - defaulting to 0 on supplier ID if no value provided ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-19 23:11:42 +00:00
Godfrey M	b2e78e3382	formats most of the pdf blade	2022-03-16 15:53:32 -07:00
Dampfklon	9818d16834	fix showDeletedFunction by reverting #9508	2022-03-16 20:20:46 +01: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	7498fe36e9	Removed extra space because pedantry ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-16 16:45:03 +00:00
snipe	babf7c064b	Added ability to filter status label index endpoint by status type ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-16 16:38:45 +00:00
Ivan Nieto Vivanco	570dd09dcd	Add validation to Accessories and Consumables to not let the user update the number of items to less than they already have checked out	2022-03-15 17:52:19 -06:00
Godfrey M	b2f7262cd2	adds table structure for asset history	2022-03-14 19:38:36 -07: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
snipe	e3d2f7cc96	Missed a few ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-08 20:05:17 -08:00
snipe	d1358b6249	Removed experimental feature policies ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-08 16:58:24 -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
snipe	e9d297e97d	Added cache comment ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-07 19:37:06 -08:00
snipe	9269d5945e	Added QR and alt barcode urls to asset transformer ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-07 19:32:18 -08:00
snipe	3e2fe10480	Fixed getAssetBySerial ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-05 09:03:29 -08:00
snipe	2d7a8b5e15	Merge pull request #10776 from snipe/added_trim_to_email_and_username ... Added trim to email and username	2022-03-04 11:57:33 -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	67134ca387	Do a trim() before inserting/updating ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 06:18:52 -08:00
snipe	0dfc27f56e	Added remote to allowed_columns for sorting ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 05:44:46 -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	f840652395	Suppress errors for missing signatures ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 03:18:28 -08:00
snipe	67ed0d91c0	Handle file_get_contents more gracefully ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 02:54:37 -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	29a2e80984	Merge pull request #10771 from uberbrady/retry_fix_bad_metadata_display ... Retry fix bad metadata display	2022-03-03 20:49:30 -08:00
snipe	6fca8350f9	Added notes field to transformers ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 20:29:35 -08:00
snipe	9acb5413f6	Added notes field to controllers ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 20:29:25 -08:00
snipe	08a2fe4edb	Merge pull request #10773 from snipe/features/adds_ldap_import_and_assets_count_to_user_api ... Features/adds ldap import and assets count to user api	2022-03-03 19:15:14 -08:00
snipe	6abe8f296b	We don’t need the users table here ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 19:12:03 -08:00
snipe	a53a67be4a	Added consumables, licenses, accessories count filters too ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 19:08:08 -08:00
snipe	b72cac3511	Adds ldap_import and assets_count filter to user API endpoint ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 19:03:35 -08:00
snipe	c940d36fff	Updated maintenance gate in API ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 18:49:54 -08:00
snipe	cd12028845	Use “update” instead of edit in gate ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 18:47:20 -08:00
Brady Wetherington	3225605ef3	Handling the old weirdly-formatted data wasn't quite working.	2022-03-03 18:17:29 -08:00
Brady Wetherington	31dde20a2b	Actually, re-introduce this code comment as it's still relevant and tricky	2022-03-03 15:48:04 -08:00
Brady Wetherington	aa36ebc947	Merge branch 'fix_bad_metadata_display' into retry_fix_bad_metadata_display	2022-03-03 15:46:19 -08:00
Brady Wetherington	92434fa943	Revert "Revert "refactor and clean up attribute-changing logic for assets"" ... This reverts commit bdc737ce0c.	2022-03-03 15:45:54 -08:00
Brady Wetherington	0164354463	Fix for the weird error that blew up the demo when my PR got merged	2022-03-02 15:15:16 -08:00
snipe	bdc737ce0c	Revert "refactor and clean up attribute-changing logic for assets" ... This reverts commit 290baf1c8d. Signed-off-by: snipe <snipe@snipe.net>	2022-03-02 14:45:14 -08:00
snipe	733b3a7550	Merge pull request #10682 from uberbrady/fix_bad_metadata_display ... Fixed weird JSON-handling on log_meta updates	2022-03-02 14:36:38 -08:00
snipe	3339a691e1	Merge pull request #10721 from snipe/features/adds_users_consumables_endpoint ... Added consumables endpoint to user API	2022-03-02 14:33:45 -08:00
Ivan Nieto Vivanco	0df9dd8320	Delete a function that is not longer used	2022-03-01 18:59:50 -06:00
Godfrey M	533670f3f1	faulty method for converting asset acceptance to pdf	2022-02-24 14:50:16 -08:00
snipe	50f55b4308	Fixes broken API throttling ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-24 13:10:10 -08:00
snipe	a8028e7dd0	Merge pull request #10727 from uberbrady/master ... Fix for negative CORS/SAML interaction	2022-02-23 11:17:17 -08:00
Brady Wetherington	15abc84ab0	Migrate to Fruitcake/laravel-cors which has path-exclusion built-in	2022-02-23 11:06:19 -08: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	dc2e6c2b06	Adds consumables endpoint to user API ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-22 20:44:34 -08:00
Brady Wetherington	294606fb0b	Move new CORS library to global middleware, the only place it works	2022-02-22 19:07:23 -08:00
Brady Wetherington	64f83f9a5f	Move HandleCors middleware to be universal	2022-02-22 17:43:40 -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
Ivan Nieto Vivanco	23a6907975	Some minor stylistic changes	2022-02-17 18:05:06 -06:00
Ivan Nieto Vivanco	5b2a5ff124	Put the 'remember_token' column as null in the users table	2022-02-17 18:03:00 -06:00
Ivan Nieto Vivanco	548b172744	Logout every connected user	2022-02-17 18:00:24 -06:00
Ivan Nieto Vivanco	263893b3c6	Search logged in user that made the restore, if they doesn't exist in the restored system, add it again	2022-02-17 17:42:06 -06:00
Ivan Nieto Vivanco	811ca51c4f	Wipe database before restoration	2022-02-17 16:59:44 -06:00
snipe	d1b45a83b8	Blergh, one more linebreak ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-17 14:51:06 -08:00
snipe	01a8701a8c	Removed extra linebreaks ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-17 14:50:38 -08:00
snipe	67fe53e32a	Removed debugging, added comments ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-17 14:50:07 -08:00
snipe	7f6b8cc43d	Removed carbon, since we went with PHP's datetime instead ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-17 14:48:12 -08:00
snipe	5fe999eb02	Shored up the date math, updated the explanation ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-17 14:34:33 -08:00
snipe	ea429d650e	Initial audit date fix ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 20:19:38 -08:00
snipe	824eedf7c2	Added UI elements for is_unique ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 13:47:48 -08:00
snipe	a4a0aa5124	Removed debugging line ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 13:47:22 -08:00
snipe	4f89dfee49	Merge pull request #10679 from snipe/fixes/timing_attack_mitigation_for_forgot_password ... Added usleep random to forgotten password method to mitigate timing attacks	2022-02-16 11:17:00 -07:00
snipe	017534bc07	Added deleted_at to license transformer ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 09:33:28 -08:00
snipe	5540069cce	Be more specific with deleted license point ... Require this value to be "true" speciically to get the deleted list Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 09:14:04 -08:00
snipe	1ad56760ce	Adds delete endpoint for licenses ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 09:08:50 -08:00
Brady Wetherington	290baf1c8d	refactor and clean up attribute-changing logic for assets	2022-02-15 18:29:45 -08:00
snipe	f878e0ad66	Fixes 2FA cookie -> user issue ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-15 18:29:23 -08:00
snipe	178e440951	Added usleep :( ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-15 18:09:58 -08:00
snipe	cab4fa1687	Fixes some conceptual gates ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-14 15:42:23 -08:00
snipe	4804e5b3ab	Added Asset edit/delete gates to maintenances ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-14 15:34:06 -08:00
snipe	1c0a96b0ce	Added gate to supplier ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-13 11:58:12 -07:00
snipe	d77a47765e	Adds gate to supplier ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-13 11:53:45 -07:00
Dampfklon	0d49fc3a2e	remove unused route, controller functions and view	2022-02-13 12:10:19 +01:00
snipe	2dad27eed6	Added additional gate for selectlists ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-11 11:46:14 -08:00
snipe	f5ffda8053	Ahem. ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-10 22:43:51 -08:00
snipe	70af10ae6c	Merge pull request #10640 from JonathonReinhart/10552-add-checkin-api-date ... Fix #10552: Add checkin_at parameter to /hardware/:id/checkin API	2022-02-10 09:54:20 -08:00
snipe	b9a8d45c07	Better messaging ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-09 16:30:42 -08:00
snipe	7794c2f44b	Check that the fieldset exists before trying to detach it from the fieldset ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-09 16:16:16 -08:00
snipe	d06e3dd892	Merge branch 'master' of https://github.com/snipe/snipe-it	2022-02-09 14:40:33 -08:00
snipe	6b25b53462	Merge pull request #10628 from inietov/fixes/default_values_dont_allow_checkbox_radio ... Fixes #10299 Default Values do not allow Checkbox/Radio Buttons	2022-02-09 14:39:46 -08:00
Ivan Nieto Vivanco	6d79c9f3e2	Save the default values for custom fields with same format than Assets do for actual values	2022-02-09 13:41:33 -06:00
Ivan Nieto Vivanco	a36957dd77	Finish the implementation of custom fields default values for checkboxes	2022-02-09 13:12:42 -06:00
Ivan Nieto Vivanco	2f3499e4b9	Show checkboxes a little less assy, actually save the data checked by them	2022-02-09 10:49:10 -06:00
Jonathon Reinhart	3536d08477	Add checkin_at parameter to /hardware/:id/checkin API ... Fixes #10552	2022-02-08 20:23:09 -05:00
Brady Wetherington	c300e7c7f6	Remove extraneous backslash	2022-02-08 12:23:15 -08:00
Brady Wetherington	fb890fbc30	Properly alert when invalid JSON is submitted to something that wants JSON	2022-02-08 12:22:59 -08:00
Brady Wetherington	9a66f6a254	Remove extraneous backslash	2022-02-08 12:09:40 -08:00
Brady Wetherington	5e94726ec1	Properly alert when invalid JSON is submitted to something that wants JSON	2022-02-08 12:05:05 -08:00
Jonathon Reinhart	cd963179fd	Fix /hardware/{id}/checkin API response on error ... Fixes #10629	2022-02-08 01:08:42 -05:00
snipe	b3a0f86431	Temp fix for weird JSON format in history ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-07 18:27:55 -08: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	06a5ea1530	Fixed duplicate use statement ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-01 18:57: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
Ivan Nieto Vivanco	3ef775533a	Adds actionlog for bulk edits	2022-02-01 12:10:46 -06:00
Ivan Nieto Vivanco	2fec40d7df	Adds actionlog for bulk edits	2022-02-01 00:00:12 -06:00
snipe	aa3aa78204	Adds Lookup Asset by Custom Field via API [sc-18632] ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-28 09:08:48 -08:00
Ivan Nieto Vivanco	7383ec7f1e	Add an early return if the model id is not set (for new Asset Models)	2022-01-21 11:45:45 -06:00
Ivan Nieto Vivanco	f510b9c2a9	Add query to filter non-deprecable assets when the Depreciation Report is called	2022-01-15 14:21:31 -06:00
Ivan Nieto Vivanco	8334ed6f7e	Add query to filter non-deprecable assets when the Depreciation Report is called	2022-01-15 14:01:19 -06:00
Brady Wetherington	ef463a37d8	Make 'pending' assets properly requestable; use requestable scope	2022-01-14 12:48:33 -08:00
Brady Wetherington	65e584c2bd	Revert the unnecessary optimization for asset->count()	2022-01-13 19:37:08 -08:00
Brady Wetherington	4e8ae8a162	Fix extraneous wildcard query in requestable asset search	2022-01-13 16:32:40 -08:00
snipe	984db1ef44	Apply personal API token fix to master ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-13 01:39:56 -08:00
snipe	512dbfee7a	Added gate to check that the user is allowed to view API keys ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-13 01:33:27 -08:00
snipe	eb8f23a888	Removed commented code ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-13 01:32:28 -08:00
snipe	8f4ec95fbb	Remove assets query, since we handle that via API call now and just need the count() ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-12 23:23:00 -08:00
snipe	224d0b2fd2	Small language file additions ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-12 22:21:00 -08:00
snipe	43c57c8461	Merge master into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Http/Controllers/BulkAssetModelsController.php # app/Http/Controllers/CustomFieldsController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/ModalController.php # app/Http/Transformers/GroupsTransformer.php # config/version.php # package-lock.json # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/build/app.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/assets/less/overrides.less # resources/lang/en/admin/hardware/message.php # resources/lang/en/admin/settings/general.php # resources/views/partials/bootstrap-table.blade.php # routes/web.php	2022-01-12 20:51:33 -08:00
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	ea83567e7d	Merge pull request #10494 from exula/fix/increase_max_licenses ... Fixed #7824	2022-01-10 15:04:47 -08: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
Brad	81084fa717	Fixed #7824 ... Previously there was a 999 max seats on Licenses as anything above that seemed to cause slowdowns and failure. This commit allievates those pain points - removed freeSeats as a hydrated Eloquent model on JSON requests for the licenses index - removed 'licenseSeats.user', 'licenseSeats.asset' from the 'with' clause as it's not needed in the view (Datatabales takes care of that) - removed the 999 max seats limit from the License Model, - reworked how new license seats are created when increasing seats or creating licenses - Added an index the license_seats table to help speed up lookups	2022-01-10 14:03:28 -05: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
Haxatron	bb095641c2	Update BulkAssetModelsController.php ... https://huntr.dev/bounties/efdf2ead-f9d1-4767-9f02-d11f762d15e7	2022-01-06 09:50:11 +08:00
snipe	884b6b0270	Fixes format property on invalid custom field object ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-03 19:14:50 -08:00
Brady Wetherington	95c30cae8d	Some duplicate imports at the top of the Settings file	2022-01-03 13:53:53 -08: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
snipe	2ee84c2675	Added a few more comments ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-30 18:33:28 -08:00
snipe	c6ce928567	Added allow list to modal view options ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-30 18:16:49 -08:00
snipe	b4fac3e4ae	Fixed missing index for fieldsets ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-30 13:16:44 -08:00
snipe	bad6b862ca	assets_count doesnt exist as a column ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-30 12:59:16 -08:00
Alex Janes	d0bfd8dfd2	Fixed the collection of the groups total to GroupsTransformer.php. Groups page should now paginate correctly.	2021-12-23 20:54:34 -05:00
Alex Janes	7acb559069	corrected issue with asset not found errors	2021-12-20 19:55:00 -05:00
Alex Janes	2b5aca183c	removed unnecessary additional data call from api method	2021-12-19 19:21:58 -05:00
Alex Janes	14b21a6e95	removed some whitespace	2021-12-19 19:17:32 -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	a68ec8bb57	Update LoginController.php ... Updated if statements to match convention exactly.	2021-12-17 18:52:42 -05:00
Alex Janes	74de91c31a	Merge pull request #1 from snipe/develop ... Develop	2021-12-17 14:51:03 -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
Alex Janes	d99db5c63b	bug fix and formatting fix	2021-12-16 19:04:37 -05: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
Alex Janes	6898119891	Replaced env() with config() to check environment variables ... Made the app.php description for 'REQUIRE_SAML' a bit more... descriptive.	2021-12-16 16:56:39 -05:00
Alex Janes	a6116a1b15	If SAML required, don't accept login form post.	2021-12-16 14:33:25 -05:00
Alex Janes	3c8d70c5fb	Add option to environment to require SAML for a more secure installation.	2021-12-16 11:44:07 -05:00
Bradley Coudriet	dbdc1c7f3f	Update SettingsController.php to save Slack Settings ... This goes with #10438 that I just submitted about Slack Settings not saving. This adds the necessary code to actually save the Slack Settings, As they are already validated by the SlackSettingsRequest, this seems like an easy and low-impact fix.	2021-12-15 10:38:51 -05:00
Ivan Nieto Vivanco	c80aa2a289	Add title column to custom reports	2021-12-14 12:05:33 -06:00
Ivan Nieto Vivanco	0037cdb00c	Add title column to custom reports	2021-12-13 20:27:23 -06:00
snipe	25e2e7ecc6	Merge pull request #10418 from inietov/fixes/bulk_edit_count_more_users_than_selected ... Fixes bulk edit message counts more users than the actual selected users number	2021-12-13 14:13:14 -08:00
snipe	9d5d1a9f9a	Added escape to assigned_to API response ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-13 12:03:03 -08:00
Ivan Nieto Vivanco	a419a690d4	Add a variable to better control the selected user's ids	2021-12-11 18:01:38 -06:00
Brady Wetherington	ea71086dfc	Yank assetlog from eager-load clause in API query for develop	2021-12-10 18:50:34 -08:00
Brady Wetherington	acfb41f129	Remove 'actionlog' from the ::with() clause in the asset query API	2021-12-10 18:42:56 -08:00
Haxatron	1699c09758	Update AssetModelsController.php	2021-12-09 21:42:18 +08:00
Haxatron	918e7c8dae	Fix access control - https://huntr.dev/bounties/19453ef1-4d77-4cff-b7e8-1bc8f3af0862/	2021-12-09 12:57:04 +08:00
snipe	86afe6c4b1	Cleanup slack validation ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 18:03:56 -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	8fa690b635	Reverting form request because it doesn't seem to work (????!!) ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 17:54:15 -08:00
snipe	8c1cd87831	Added slacksettingsrequest as use statement ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 15:56:22 -08:00
snipe	80d36cd72b	Added slack settings request ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 15:53:05 -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
snipe	ff81e6d536	Merge pull request #10361 from snipe/fixes/xss_in_accessories_checkout_notes ... Escape notes in transformCheckedOutAccessory	2021-11-24 19:56:36 -08:00
snipe	00fad35c2a	Escape notes in transformCheckedOutAccessory ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-24 19:54:45 -08:00
snipe	3debe78574	Merge pull request #10350 from inietov/fixes/trim_custom_fields_names ... Apply trim() function when storing Custom Fields names	2021-11-24 19:42:04 -08:00
snipe	29bbfad693	Applied escaping fix from master to develop ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-24 19:38:27 -08:00
snipe	830d07f84f	Removed escaping on input save for asset checkout on creation ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-24 19:19:32 -08:00
Ivan Nieto Vivanco	1ca770895a	Apply trim() function when storing Custom Fields names	2021-11-22 18:43:21 -06: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	f7b483358f	Escape custom field values in API response ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-15 20:32:59 -08:00
snipe	476e17055b	Escape custom fields in API response ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-15 20:31:01 -08:00
snipe	46d2f8a81d	Disallow file upload to backups on demo ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-15 19:42:02 -08:00
snipe	92b7aaf44b	Log the user out upon successful restore ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-15 19:40:01 -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
Brady Wetherington	864cc4f8d5	Fix FIXME's by downgrading them to TODO's :)	2021-11-10 11:37:10 -08:00
snipe	457c6080cc	Better handling if there was no file uploaded ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 01:43:45 -08:00
snipe	96f76e1f6b	INCOMPLETE: Added restore and upload methods for backups ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 00:07:17 -08:00
snipe	3b25093aeb	Removed noisy debugging ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-09 22:38:27 -08:00
snipe	76506dabbf	Made helpers call full namespace (tho I have no idea why this was necessary) ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-09 22:38:14 -08:00
snipe	1b1b54fbf4	Add modified_value and modified_display so we can use the formatted date but still sort correctly ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-09 22:37:49 -08:00
snipe	0e21a95817	Escape error message in asset autdit apI (same as in v5) ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-09 19:39:32 -08:00
Brady Wetherington	91f087258b	Merge branch 'develop' into remove_old_ldap	2021-11-09 18:33:41 -08:00
Brady Wetherington	3ea209a507	Escape asset_tag attribute at controller level for consumption in bulk checkout	2021-11-08 20:27:43 -08:00
Brady Wetherington	a58c5ce27f	Better documentation, disable AdLdap2-based "Add domain" setting	2021-11-08 17:11:47 -08:00
Brady Wetherington	b0417e5bd7	Finish pulling out the AdLdap2-based LDAP remnants that were still in the system	2021-11-03 15:22:06 -07:00
Brady Wetherington	4dda28de9e	WIP: cleaning up LDAP	2021-10-28 18:19:50 -07:00
Brady Wetherington	31933a56fa	Trying to get the login screen working	2021-10-28 18:18:11 -07:00
snipe	ea0d92c439	Merge branch 'develop' into fixes/fmcs_departments	2021-10-28 18:18:08 -07:00
snipe	d36849bd41	Merge branch 'develop' into feature/remove_deleted_user_from_unaccepted_assets_report	2021-10-28 18:11:03 -07:00
snipe	84a3a85823	Fixed parse error for merge conflict ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-28 18:04:03 -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	bdf321ecc9	Merge branch 'develop' into change-var-aws-public-url	2021-10-28 17:46:16 -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	2f9e5f79af	Merge pull request #10139 from FliegenKLATSCH/patch-1 ... API: Do not include deleted items per default on lookup by serial	2021-10-28 17:09:20 -07:00
snipe	3088230236	Merge pull request #10209 from Godmartinz/feature/sc-1474/sync-parent-asset-location-with-children-assets ... Fixes Bug: When parent asset is assigned to other location, children assets loca…	2021-10-28 16:49:44 -07:00
snipe	1895dd326f	Merge pull request #10245 from Sxderp/pr-support-appache-rewrite-redirect-headers-for-remote-user ... support apache REDIRECT_* for remote user login	2021-10-28 16:34:57 -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
Steven Daniele	efc644c960	support apache REDIRECT_* for remote user login	2021-10-28 14:23:38 -04:00
snipe	17bf899a17	Set default_label to 0 instead of null in API ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-25 20:14:01 -07:00
snipe	8b1c60a17a	Make gates a little more consistent ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-25 15:34:22 -07:00
snipe	033c3253bb	Fixed permissions array to handle missing clone button ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-25 14:10:17 -07:00
Ivan Nieto Vivanco	9eaf89aaa7	Add a variable to better control the selected user's ids	2021-10-21 13:28:58 -05:00
snipe	6e0f8068b2	Fixed duplicate use statement from merge fuckery ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-20 17:54:32 -07:00
snipe	9ee13f0d2a	Fixed dupe use statement from merge fuckery ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-20 17:53:43 -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
Godfrey M	9ae7d0b23a	when parent asset is assigned to other location, children assets location are updated as well.	2021-10-20 17:01:25 -07:00
FliegenKLATSCH	24c484303e	Do not include deleted assets by default when doing lookup by serial ... This commit introduces a new query parameter `deleted`, which can be set to `true` to include deleted assets in the response.	2021-10-09 08:56:31 +02:00
snipe	5d94b99035	Switched to 5 in one minute ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-08 15:53:32 -07:00
snipe	0674ef5a3d	Fixed number to 1 (for minutes) ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-08 15:43:32 -07:00
snipe	702791210e	Throttle password reset requests to 5 every 60 seconds ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-08 14:26:30 -07:00
Ivan Nieto Vivanco	23b770fac6	Added a validation to use the same name in categories with different types	2021-10-08 15:19:16 -05:00
snipe	1c77fd0d09	Merge pull request #10178 from inietov/bug/sc-17520/symfony_component_debug_exception_fatalthrowableerror ... Fixed typo when setting the headers	2021-10-08 12:04:45 -07:00
Ivan Nieto Vivanco	d184da8611	Fixed typo (thanks @ssddanbrown)	2021-10-08 13:39:49 -05:00
Dampfklon	7645f23f5c	remove pending Acceptances on checkin	2021-10-07 21:03:46 +02:00
Dampfklon	4418ad2340	Enable display of deleted acceptances, strike deleted users, add date, enable sorting	2021-10-07 21:03:46 +02:00
Dampfklon	12ee06deb6	add Download All Button, change route analogue to activity report	2021-10-07 21:01:50 +02:00
Dampfklon	9a9ca59544	Fix decprecated implode usage	2021-10-07 20:55:47 +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	ccd430ce07	Switched back down to debug level ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-06 12:38:21 -07:00
snipe	f306401e7e	Fixed SVG XSS vuln ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-06 12:26:45 -07:00
snipe	c06a93ef13	Removed extra brace in assets for components ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-06 10:38:13 -07:00
Ivan Nieto Vivanco	ef6eea67d8	Set headers in a different manner in the middleware	2021-10-05 14:09:35 -05: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	34eab88b7e	Removed debugging ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 20:25:31 -07:00
snipe	b20c841a89	Fixed asset models restore ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 19:29:13 -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	9b48732cd2	Force revalidation headers when user logs out ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 12:52:48 -07:00
snipe	daa88f06f7	Added pivot to components JSON ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-30 15:51:08 -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	f3338667c7	Create new ParseCurrency helper and use it in the appropriate controllers	2021-09-28 18:20:39 -07:00
Brady Wetherington	f380da3f19	Try to ensure all currency output is formatted correctly.	2021-09-28 16:45:47 -07:00
NMC	c680977791	Merge branch 'develop' into api-licenses	2021-09-27 15:02:51 -04:00
snipe	d88c0ae5ec	Merge pull request #10103 from snipe/fixes/make_boolean_fields_nullable ... Fixed issue when creating a status label via API - default_label and show_in_nav being not nullable	2021-09-26 13:41:52 -07:00
snipe	2f9582ee5c	Switched to loadMissing for performance ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-23 17:31:19 -07:00
snipe	3b7ce0091c	Load components in the assets API if components=true in API request ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-23 17:23:53 -07:00
snipe	3862b6476b	Merge pull request #10122 from inietov/fixes/api_issue_when_component_checkout ... Fixes API Issue when checking out a component	2021-09-23 13:21:48 -07:00
Ivan Nieto Vivanco	7dfab3a6e2	Change the condition to 'bigger or equal' instead of just 'bigger than' in ComponentsController checkout api	2021-09-23 15:02:39 -05:00
snipe	a6b3aa5f04	Don't try to delete the file if there is no log entry ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-22 19:04:25 -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	0763c76a4e	Fixed scoping with leftjoin ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-21 20:54:24 -07:00
snipe	5d32c17a2e	Removed comments ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-21 20:01:36 -07:00
snipe	10ca7cffc3	Fixes for query scoping, ordering, and nicer readability ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-21 19:59:23 -07:00
snipe	61176335d7	Improved category_type with strtolower() to make it case insensitive ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-21 15:51:41 -07:00
Delta5	c8c3c7fbbd	Fixed issue with incorrect error message	2021-09-21 19:45:18 +00:00
Delta5	59302e1d19	Add restore to users api endpoint	2021-09-21 17:42:26 +00:00
snipe	b331bb33d9	Code fixes and a new migration ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-20 15:37:24 -07:00
snipe	8a93e1e796	Remove asset call on depreciation report controller method ... We ajax this in now, so no need for it Signed-off-by: snipe <snipe@snipe.net>	2021-09-15 13:49:53 -07:00