snipe-it

mirror of https://github.com/snipe/snipe-it.git synced 2024-11-17 19:14:06 -08:00

Author	SHA1	Message	Date
snipe	5a1e5f740d	Merge pull request #12537 from inietov/fixes/expected_checkin_date_validation Fixed #12531 Expected Checkin Date on Asset Checkout throws an error	2023-02-22 16:03:51 -08:00
snipe	81cb29db5e	Merge pull request #12509 from inietov/fixes/add_images_to_user_inventory_mail_report Added images to emailed user inventory report [sc-19801]	2023-02-22 10:38:07 -08:00
snipe	05f6d0bd5e	Merge pull request #11984 from nh314/Correct-assignedusers-relation Correct assignedusers relation setting	2023-02-21 20:15:20 -08:00
snipe	0c3115553e	Merge branch 'develop' into vip_tag	2023-02-21 20:03:49 -08:00
Ivan Nieto Vivanco	d494afcf01	Add order by clause, to ensure assets and accessories are in order in the report	2023-02-21 21:24:19 -06:00
Ivan Nieto Vivanco	6e994c209f	Adds setter to model Asset class for expected checkin	2023-02-19 12:31:10 -06:00
snipe	754842f620	FML - this is a hotfix and I don’t know why this is causing problems Signed-off-by: snipe <snipe@snipe.net>	2023-02-16 16:58:00 -08:00
snipe	e9ab90eafc	Merge pull request #12422 from marcusmoore/fix/adhere-to-email-alerts-setting Have acceptance result notifications adhere to alerts enabled setting	2023-02-15 18:46:08 -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	de4f7bd274	Merge pull request #12408 from snipe/fixes/stricter_date_rectrictions_on_validation Enforce Y-m-d as date format for date fields	2023-02-15 12:54:22 -08:00
snipe	25461caa2c	Removed `date` validation rule Signed-off-by: snipe <snipe@snipe.net>	2023-02-15 12:53:55 -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	1651dbb68d	Use null coalescing operator Signed-off-by: snipe <snipe@snipe.net>	2023-02-06 12:43:00 -08:00
snipe	d9cdb92014	Merge branch 'develop' into vip_tag	2023-02-01 16:03:23 -08:00
snipe	2da4578aa5	Merge branch 'develop' into slack_message	2023-02-01 13:43:09 -08:00
akemidx	90c1bfe03d	fixing pr	2023-02-01 16:12:39 -05:00
akemidx	4e5b8fa213	fixing pr	2023-02-01 16:05:50 -05:00
Marcus Moore	a45ce468cc	Update return type for routing mail notifications	2023-02-01 11:44:56 -08:00
Marcus Moore	3580bdae86	Use object accessor instead of array accessor	2023-02-01 11:44:35 -08:00
snipe	f7ae5db4f3	Merge branch 'develop' into features/fixed_12382_added_checked_out_count_to_accessories	2023-01-31 19:56:43 -08:00
Godfrey M	fc044528b8	validation is working, success message appears, database is not updating	2023-01-30 16:10:02 -08:00
Marcus Moore	39289dd18e	Use user provided alert email for checkout acceptances	2023-01-26 13:18:18 -08:00
akemidx	df31a76906	fixed apostraphe	2023-01-26 15:02:39 -05:00
Brady Wetherington	cfe9c687f9	Mark a bunch of SCIM config as nullable	2023-01-25 15:54:57 -08:00
Brady Wetherington	91cf683f3d	Re-do the entire SCIM config so it no longer inherits	2023-01-25 15:53:46 -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
snipe	9c79fc19cb	Tightened up and removed some validation that wasn’t needed Signed-off-by: snipe <snipe@snipe.net>	2023-01-24 17:37:15 -08:00
snipe	fd2a057d38	Make audit dates fillable Signed-off-by: snipe <snipe@snipe.net>	2023-01-24 17:36:58 -08:00
snipe	3c4f254583	Enforce Y-m-d as date format for date fields Signed-off-by: snipe <snipe@snipe.net>	2023-01-24 13:38:53 -08:00
akemidx	596846a94a	Add VIP Checkbox	2023-01-24 15:29:27 -05:00
cram42	c2c009a018	Merge branch 'develop' into develop	2023-01-24 09:53:42 +08:00
snipe	febfcd4803	Updated model with new field Signed-off-by: snipe <snipe@snipe.net>	2023-01-22 00:56:19 -08:00
snipe	48c85966d7	Added gravatar and avatar as fillable Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 18:07:17 -08:00
snipe	dceb77d4d4	Refactored numRemaining, removed unnecessary numCheckout Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 14:40:20 -08:00
Marcus Moore	181f96ad33	Allow users to set a blank asset name during checkout	2023-01-19 12:35:44 -08:00
snipe	48b8cfcef9	Added byod to model, removed duplicate validation rule Signed-off-by: snipe <snipe@snipe.net>	2023-01-18 13:04:36 -08:00
snipe	f08babfa8a	Just moved some stuff around - no actual meaningful code changes Signed-off-by: snipe <snipe@snipe.net>	2023-01-17 17:22:03 -08:00
snipe	459c95064e	Fixed default Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 17:54:04 -08:00
snipe	0b0fdd8aa5	Small formatting fixes, fixed typo in comment Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 16:32:18 -08:00
snipe	b66cd313b9	Refactored itemCount() to use existing blah_count fields if they exist Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 16:16:25 -08:00
snipe	bef4224e14	Added notes to itemCount() Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 13:50:24 -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
Brady Wetherington	2d0ac5b48b	The cache system in getSettings() cached values "forever." That's bad.	2023-01-09 16:16:09 -08:00
Brady Wetherington	c4f900e9af	Change license_seat changing method to properly 'true up' license seats	2023-01-04 13:02:53 -08:00
snipe	d187174f00	Merge pull request #12090 from Godmartinz/deparmtnet_name_validator Added: validation for department names at Company locations	2022-12-22 11:29:12 -08:00
akemidx	94afe2bc6a	edits & typo fixes	2022-12-19 14:48:43 -05:00
akemidx	133d6ffa50	Commenting on a scope in Models/Company.php	2022-12-15 15:18:24 -05:00
snipe	418ddcfac3	Merge pull request #9876 from Toreg87/fixes/locations-deletable Fixed #9875: Make locations deletable for non Superuser-Accounts with FullMultipleCompanySupport	2022-12-14 17:46:53 -08:00
akemidx	f3e57d7dc0	fixing PR	2022-12-13 16:00:59 -05:00
akemi	07ae91b00f	Created method in users.php for adding up all assigned to user and providing an integer value. this then used to grey out buttons on user view if user has nothing assigned.	2022-12-12 15:47:53 -05:00
Ivan Nieto Vivanco	c082d8b90e	Return empty string if no MAIL_REPLYTO_ADDR var set	2022-11-23 18:22:31 -06:00
snipe	774962c122	Fixed typo Signed-off-by: snipe <snipe@snipe.net>	2022-11-17 21:14:35 +00:00
snipe	24841a75d4	Move common things into the model level validation Signed-off-by: snipe <snipe@snipe.net>	2022-11-17 19:41:10 +00:00
Cram42	17e81af4cd	Add more Avery label sheets	2022-11-12 20:29:50 +08:00
Cram42	ffce6ec327	Need uppercase	2022-11-12 20:29:34 +08:00
Cram42	f849fcca89	Change the way fields are passed	2022-11-10 18:54:02 +08:00
Godfrey M	92ae271292	adds validation for department names at Company locations	2022-11-09 13:11:33 -08:00
snipe	7c37c70164	Added new field to allowed_fields so that the API can change them if needed Signed-off-by: snipe <snipe@snipe.net>	2022-11-08 15:27:22 +00:00
snipe	6d5ace0458	Merge pull request #12049 from uberbrady/improve_scim_externalid_support Fixed writes to the `externalId` from SCIM	2022-11-02 15:43:55 -07:00
Cram42	53513d93fa	Rework TZe labels for Asset Tag support	2022-11-02 22:38:00 +08:00
Cram42	fb467d9078	Include Asset for advanced users	2022-11-02 17:20:01 +08:00
Cram42	4fee5ece43	Support Avery L7163	2022-11-02 16:08:10 +08:00
Cram42	4bb40adfce	Add Asset Tag as separate supported feature	2022-11-02 16:07:50 +08:00
Cram42	a60ee7736b	Add P-touch TZe 12mm Tape Example	2022-11-02 12:22:55 +08:00
snipe	eb81c290dc	Accessory file upload Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 19:50:39 -07:00
Cram42	d0eb3cfc9b	Merge branch 'feature-label2' into develop	2022-11-02 10:09:46 +08:00
snipe	3d3a4b02fc	Added helper method for uploads Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 19:09:34 -07:00
Cram42	19150aeb44	Add P-touch TZe 24mm Tape Example	2022-11-02 10:09:11 +08: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	4ed728d954	Add template to simulate legacy label	2022-11-01 19:54:00 +08:00
Cram42	bbecdb6768	Add QR example	2022-11-01 19:53:11 +08:00
Cram42	df89406987	Create Label model and example	2022-11-01 19:52:34 +08:00
Brady Wetherington	4e5c878b73	Needed to fix the way we write externalId from SCIM	2022-10-31 19:15:08 -07:00
snipe	a94f1c4a64	Cleaned up and added comments Signed-off-by: snipe <snipe@snipe.net>	2022-10-26 00:15:52 -07:00
Brady Wetherington	1e3281c76c	Add externalId support to SCIM integration	2022-10-25 14:19:01 -07:00
Godfrey M	d359bcb88d	adds proper spacing	2022-10-17 13:15:10 -07:00
Godfrey M	28059c878a	gets the proper amount of months and fixes typo of the word depreciation	2022-10-17 11:16:29 -07:00
Phan Nguyen	e457b2e98d	Correct assignedusers relation setting	2022-10-17 13:10:09 +07:00
snipe	ac055c01dc	Use admin ID for audit log notification Signed-off-by: snipe <snipe@snipe.net>	2022-10-12 15:59:43 -07:00
snipe	cf62761d18	Added date casting and fillable to models Signed-off-by: snipe <snipe@snipe.net>	2022-10-05 16:57:59 -07:00
Katharina Drexel	4f5d536e32	Fixed: #11871 Replacing (deprecated) patchwork/utf8 by polyfill/mbstring.	2022-09-28 14:52:02 +02:00
Katharina Drexel	8316a4eb92	Fixed: #11871 Replacing (deprecated) patchwork/utf8 by polyfill/mbstring.	2022-09-26 12:06:06 +02:00
snipe	24910433a1	Fixed 500 when depreciation is set but no purchase_date Signed-off-by: snipe <snipe@snipe.net>	2022-09-15 15:39:47 -07:00
snipe	ac4f91918e	Merge pull request #11771 from rnelsonee/PAT_test Fixed #11769: PAT Test hardcoded text	2022-09-14 20:01:18 -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	a0624fe179	reworks the depreciation formula, includes months passed instead of months remaining	2022-09-14 16:00:21 -07:00
Rick Nelson	6e82de2f47	Fixed #11769 : PAT Test hardcoded text	2022-09-01 11:21:02 -04: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
snipe	7fa9214beb	Merge pull request #11489 from Godmartinz/bug/sc-19333/expiring-assets-report-email-content-ordering Fixed the order expiring assets are listed in notifications	2022-08-29 12:37:01 -07:00
Godfrey M	ea63049b4b	removed redundancy with raw query	2022-08-29 12:33:51 -07:00
snipe	9cf5f30c77	Set safeMode to true and use helper for all parsedown Signed-off-by: snipe <snipe@snipe.net>	2022-08-29 11:26:47 -07:00
snipe	45f17fea8a	Merge pull request #11510 from sunflowerbofh/tmp-ldap Fixed #11509 allow-ldap-anonymous-bind	2022-08-22 16:32:07 -07:00
snipe	3ac84eab58	Merge pull request #11651 from inietov/fixes/activity_report_search Fixed Search in activity report for full name in relation	2022-08-22 16:23:50 -07:00
Ivan Nieto Vivanco	98bcd82108	Add the mail recipient from configuration in the CheckoutAcceptance model	2022-08-11 15:33:18 -05:00
Ivan Nieto Vivanco	0172fe6403	Add Notifiable trait to the CheckoutAcceptance Model	2022-08-11 13:02:25 -05:00
Ivan Nieto Vivanco	8cee5060af	Remove unused DB statement	2022-08-10 19:16:04 -05:00
Ivan Nieto Vivanco	a7de97f060	Found a better place for the where condition	2022-08-10 19:13:28 -05:00
Ivan Nieto Vivanco	c1074000f9	Add a concat to search for full name when the relationship search in the users table	2022-08-10 18:27:28 -05:00
snipe	acd666fdf5	Added notes to user consumables tab Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 15:34:07 -07:00
snipe	c1e5d03340	Added pivot for `note` Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 15:03:41 -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	20fcf7a1e9	Added configuration change to maintenance types Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 20:19:43 -07:00
Katharina Drexel	8596c54d6a	Fixing query order (otherwise you run into app_key exception before anonymous ldap applied). Signed-off-by: Katharina Drexel <katharina.drexel@bfh.ch>	2022-08-02 14:24:00 +02:00
snipe	0fdbd410b6	Use unique_undeleted instead of unique for custom fields Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 17:10:39 -07:00
Katharina Drexel	9d627936e6	Fixed #11509 : Allow LDAP anonymous bind.	2022-07-20 17:24:20 +02:00
Godfrey M	309229619b	fixes the order expiring assets are listed in notifications	2022-07-11 12:25:38 -07:00
snipe	92d46edca3	Cleaned up logging output Signed-off-by: snipe <snipe@snipe.net>	2022-07-01 13:33:58 -07:00
Brady Wetherington	f72aa2415f	Revert a change in our Linear Depreciation math; I think the old algorithm was correct	2022-06-30 18:24:45 -07:00
Brady Wetherington	2451bb9a2b	Make SCIM be more tolerant of missing fields	2022-06-29 14:48:59 -07:00
snipe	c90ed9f25f	Allow models uploads Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 15:50:07 -07:00
snipe	d8d12d4590	Merge pull request #11408 from uberbrady/add_filter_option_to_ldap_sync Add a new `--filter` option to Artisan ldap-sync command	2022-06-28 09:50:48 -07:00
Brady Wetherington	be3388d647	Add a new `--filter` option to Artisan ldap-sync command	2022-06-27 19:49:59 -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	86d2c2b153	Small naming changes Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 19:11:59 -07:00
snipe	0bc3ca5c42	Fixed comments Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 18:44:27 -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	23c50ea9a5	Added admihn scopes Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 17:18:11 -07:00
snipe	daf6c72005	Fleshed out comments on new scope Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 16:02:54 -07:00
snipe	d45d322b54	Use scoped query for asset count Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 13:43:23 -07:00
snipe	07bc2fd742	Added maintenance scope for ordering by supplier Signed-off-by: snipe <snipe@snipe.net>	2022-06-14 16:11:43 -07:00
snipe	a57a6486e7	Only add http:// if the url variable isn’t blank Signed-off-by: snipe <snipe@snipe.net>	2022-06-14 16:11:13 -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	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
snipe	8337628323	Set elvis operator to ensure ldap version is 3 if null Signed-off-by: snipe <snipe@snipe.net>	2022-06-06 20:57:18 -07:00
snipe	7c77e03c5a	Initial rework of locations display Signed-off-by: snipe <snipe@snipe.net>	2022-06-05 18:08:15 -07:00
Brady Wetherington	8fdedf9441	Downgraded/Removed log statements	2022-05-24 19:30:22 -07:00
Ivan Nieto Vivanco	e0b64a4879	Fixes constraint violation when ordering some columns	2022-05-24 14:00:23 -05:00
Brady Wetherington	5130a86854	Google client-side TLS auth works better with null as context(?)	2022-05-23 20:31:43 -07:00
snipe	afb3843fad	Added sig and filename to acceptedCheckout method Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	75acb0f28a	Added sig and eula pdf to checkout_acceptance Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	adbac82c30	Removed stored_eula_file from actionlog Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
Ivan Nieto Vivanco	5d29f77d60	Initialize result variable so return don't crash	2022-05-19 12:47:12 -05: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
snipe	deb2d958d8	Sets maxlength of user fields to 191 Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 04:54:12 -07:00
Godfrey M	2c1f368828	adds validation for all purchase costs variables	2022-05-10 16:26:06 -07:00
Godfrey M	33b1ab3658	prevents values for assets being negative through validation	2022-05-10 16:19:06 -07: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	1441cf9f4f	Ports #10494 to master Signed-off-by: snipe <snipe@snipe.net>	2022-04-12 21:04:57 +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	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
snipe	01342ca266	Fixed activity report Signed-off-by: snipe <snipe@snipe.net>	2022-04-05 22:58:25 +01:00
Brady Wetherington	6756dd193e	SCIM integration using the 're-do-the routes' approach, which seems like a dead-end Cleaning up routes to match laravel-scim-server's recommended implementation Some actually working changes for SCIM support?! Whoops, forgot my route file Fix public SCIM routes Removed Ziggy, removed old generated file, yanked Ziggy references Resolves the first set of comments for SCIM Ensure all /api routes have baseUrl prepended Fix the parent:: call to be, uh, actually correct :P Clarify the route-ordering, as it is quite tricky This gets it so that users can actually be saved.. Work around the lack of callbacks with some inheritance Mapped a bunch more fields from SCIM into Snipe-IT's user table More baseUrl shenanigans since we yanked Ziggy :/ Properly map job title and work with some other necessary attributes Map more fields... Finalized basic mapping for core and enterprise namespaces Latest tuned settings for SCIM config to work with Azure (and others)	2022-04-05 20:26:37 +01:00
Ivan Nieto Vivanco	2d213a9c77	Make the report take the dates of pivot table instead of asset log	2022-04-05 12:57:49 -05:00
snipe	08588a2e6a	Merge pull request #10901 from veenone/fix/invalid_consumable_date_in_user_view Fixes #10898 (invalid consumable date time info in user view)	2022-04-05 18:30:23 +01:00
Achmad Fienan Rahardianto	231a34ace3	FIX: #10898 (invalid consumable date time info in user view)	2022-04-05 15:31:27 +07:00
snipe	a937bd34f6	Merge master back down into develop Signed-off-by: snipe <snipe@snipe.net>	2022-03-29 16:28:43 +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
snipe	20e65804ef	Removed comment Signed-off-by: snipe <snipe@snipe.net>	2022-03-22 18:12:08 +00: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
Ivan Nieto Vivanco	98b78837e1	Validate custom fieldset only if the asset have one	2022-03-22 09:38:57 -06:00
snipe	8c92198636	Possible fix for boolean field check Signed-off-by: snipe <snipe@snipe.net>	2022-03-22 13:47:43 +00:00
Ivan Nieto Vivanco	7571c0b850	Add support for boolean type customfields	2022-03-21 18:48:42 -06:00
Godfrey M	4956eb0410	WIP: needs to be tested. adds ldap_manager field to ldap sync	2022-03-21 11:15:39 -07:00
snipe	42220cc566	Merge pull request #10809 from inietov/fixes/customfields_boolean_format_not_saving Fixes Customfields with boolean format not saving [ch-9973]	2022-03-19 22:10:54 +00:00
snipe	89ddbddada	Fixed comment Signed-off-by: snipe <snipe@snipe.net>	2022-03-16 16:53:18 +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
Ivan Nieto Vivanco	e104195796	Convert value of the customfield element from string to boolean	2022-03-09 18:49:39 -06:00
snipe	b6a1d245e8	Added trim to CC email as well Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 06:20:34 -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	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	ac8a7d0bc9	Made notes field fillable and searchable Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 20:29:48 -08:00
snipe	dd5f812d88	Merge remote-tracking branch 'origin/master' into develop Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Console/Commands/FixDoubleEscape.php # app/Console/Commands/LdapSync.php # app/Exceptions/Handler.php # app/Http/Controllers/Api/AssetMaintenancesController.php # app/Http/Controllers/Api/AssetModelsController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/CategoriesController.php # app/Http/Controllers/Api/CompaniesController.php # app/Http/Controllers/Api/DepartmentsController.php # app/Http/Controllers/Api/LicensesController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/ManufacturersController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/Api/SuppliersController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CustomFieldsController.php # app/Http/Controllers/SettingsController.php # app/Models/Loggable.php # app/Providers/AuthServiceProvider.php # config/version.php # database/migrations/2014_11_04_231416_update_group_field_for_reporting.php # database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php # package-lock.json # package.json # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json # resources/assets/js/components/forms/asset-models/fieldset-default-values.vue # resources/views/hardware/view.blade.php	2022-02-20 13:29:12 -08:00
snipe	6a91d4d19e	Check for uniqueness constraint Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 13:46:22 -08:00
snipe	ea8f9a6dd9	Make is_unique fillable Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 13:45:44 -08:00
snipe	b78f32e876	Merge pull request #10655 from inietov/fixes/trying_to_get_property_checkin_email_of_non-object_develop Fixes ErrorException: Trying to get property 'checkin_email' of non-object for develop[sc-17568]	2022-02-16 11:19:14 -07:00
Godfrey M	7b9a2ae909	added rounding	2022-02-14 09:34:42 -08:00
Godfrey M	6e204a20ca	fixed current value formula	2022-02-14 09:28:35 -08:00
Godfrey M	e6e68934f7	adds a months depreciated variable	2022-02-14 09:13:14 -08:00
Godfrey M	cdc402fa04	WIP formula for linear Depreciation has been corrected. still one variable left to fix.	2022-02-14 09:01:42 -08:00
Ivan Nieto Vivanco	f36de6c670	Validates if model and model->category exist before return the checkin_email property	2022-02-10 13:53:49 -06:00
Ivan Nieto Vivanco	bf4ee18123	Validates if model and model->category exist before return the checkin_email property	2022-02-10 11:58:55 -06:00
Ivan Nieto Vivanco	413e44be2f	Add custom date to checkin actionlogs and show it in the history of the asset tab	2022-02-08 11:58:23 -06:00
Ivan Nieto Vivanco	d71aa859fc	Add custom date to checkin actionlogs and show it in the history of the asset tab	2022-02-08 11:43:24 -06:00
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	a05795420a	Respect the default value of 60 days in expiring licenses	2022-01-18 14:34:14 -06:00
Ivan Nieto Vivanco	42d86bf57b	Adds default values if the expiring alerts threshold is null	2022-01-18 14:21:49 -06:00
Brady Wetherington	ef463a37d8	Make 'pending' assets properly requestable; use requestable scope	2022-01-14 12:48:33 -08:00
snipe	ea83567e7d	Merge pull request #10494 from exula/fix/increase_max_licenses Fixed #7824	2022-01-10 15:04:47 -08:00
Brad	6b6a83a525	Removing something stupid PHPStorm put in the use area	2022-01-10 14:21:19 -05: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
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	359b22e17a	Applies #10470 to develop Signed-off-by: snipe <snipe@snipe.net>	2021-12-27 13:22:47 -08:00
snipe	8588e9ebf1	Fixed #10469 - increased size of supplier address field Signed-off-by: snipe <snipe@snipe.net>	2021-12-27 12:28:02 -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
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	6d84482104	Merge pull request #10388 from snipe/features/switch_to_dusk WIP - Fixing unit tests, switching to dusk	2021-12-06 14:19:36 -08:00
snipe	ebdbc20740	Adds stricter validation for slack endpoints Signed-off-by: snipe <snipe@snipe.net>	2021-12-06 11:40:24 -08:00
snipe	00b63fe7c7	Fixed category factory methods Signed-off-by: snipe <snipe@snipe.net>	2021-12-02 13:40:16 -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
Brady Wetherington	91f087258b	Merge branch 'develop' into remove_old_ldap	2021-11-09 18:33:41 -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
Terrell Eaton	2c7a71a2a1	Fixes not being able to search by checked out user in advanced search	2021-11-01 22:14:19 +01:00
snipe	76cc46c419	Merge pull request #9814 from 01ste02/importMinAmt Improved Consumable Import: Import min_amt for consumables	2021-10-28 17:49:44 -07:00
snipe	371a39a118	Merge branch 'develop' into fixes/advanced_search_serial_v2	2021-10-28 16:42:10 -07:00
Ivan Nieto Vivanco	ee9133f722	Return the proper Asset-Components relationship	2021-10-27 16:42:51 -05:00
snipe	ae1a4bb3c9	Fixed extra braces from merge fuckery Signed-off-by: snipe <snipe@snipe.net>	2021-10-20 17:36:06 -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
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	6e270c0ed2	Include created_at in pivot Signed-off-by: snipe <snipe@snipe.net>	2021-09-23 17:23:17 -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	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	f9c0eee7c9	Merge pull request #10048 from inietov/fixes/blank_results_for_non_superadmins Fix to PR #10009. The asset search now works as intended for normal users	2021-09-07 12:14:29 -07:00
Ivan Nieto Vivanco	b5525e6a21	Deleted additional bindings present also in the User model	2021-09-07 00:57:12 -05:00
Ivan Nieto Vivanco	c3eb7a3425	Remove aditional bindings that 'overflows' the generated queries	2021-09-07 00:15:21 -05:00
snipe	a02534b6c8	Merge pull request #10009 from inietov/fixes/blank_results_for_non_superadmins Fixes #9985. Error 500 when using the asset search - blank results for non super-admins	2021-08-30 13:29:18 -07:00
snipe	6d3a82aacf	Merge pull request #10008 from uberbrady/fix_unlink_error_ldap Fixed rb445 and rb446 - the unlink calls for the client-side certs...	2021-08-30 12:47:38 -07:00
Brady Wetherington	da0b375773	Fixed rb445 and rb446 - the unlink calls for the client-side certs need to be wrapped around a file-existence check	2021-08-30 12:29:16 -07:00
Ivan Nieto Vivanco	d1304cc975	Add sentence to infer the table's name according to the query passed	2021-08-30 13:44:26 -05:00
snipe	4abb9baa95	Merge remote-tracking branch 'origin/develop'	2021-08-24 15:29:41 -07:00
snipe	70f6753f50	Merge pull request #9979 from uberbrady/add_client_side_ldap_certs Add client side ldap certs	2021-08-23 16:30:46 -07:00
snipe	9285697611	Merge remote-tracking branch 'origin/develop'	2021-08-20 17:30:52 -07:00
snipe	9687bcb41c	Fixed issue where consumables model number was not searchable Signed-off-by: snipe <snipe@snipe.net>	2021-08-20 17:30:35 -07:00
Brady Wetherington	4d4badf830	Got the client-side LDAP setup working well enough for sync!	2021-08-17 14:43:36 -07:00
Godfrey M	cef0e424e1	adds a Floor value for depreciation models	2021-08-16 18:14:10 -07:00
Tobias Regnery	eced1ab77f	Fix advanced search with serial and another field The advanced search in /hardware produces incorrect results if the serial is combined with another field like category. There is a typo as the fieldname 'product_key' doesn't exist. Change this to 'serial'. Also change the last If-Statement from ->orWhere() to ->where(). Now additional fields like custom fields can be combined with other searches in an And-Clause. I think this function could be simplified further, but this is the minimal bugfix.	2021-08-05 15:07:28 +02:00
Tobias Regnery	1a908e361e	Make locations deletable for non Superuser-Accounts with FullMultipleCompanySupport locations->isDeletable() checks via gate::allows if a locations is deletable. This calls SnipePermissionsPolicy->before() and checks for !Company::isCurrentUserHasAccess($item). This returns false because locations don't have a company_id. Check for this and return true if the item don't have a company_id.	2021-07-29 10:43:01 +02:00
snipe	9a5d9eafeb	Merge pull request #9709 from morning-bird/master add CompanyableTrait	2021-07-27 14:38:21 -07:00
Oskar Stenberg	5b5874499d	Added import for min_amt for consumables	2021-07-12 11:46:19 +02:00
snipe	a016f4ecd0	Applies PR #9761 to integration Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 13:11:22 -07:00
snipe	19413a63da	Make notes field searchable on status labels Signed-off-by: snipe <snipe@snipe.net>	2021-06-28 11:53:17 -07:00
Petri Asikainen	ae2c77f97f	Allow to bulk update min_amt	2021-06-17 00:36:04 +03:00
GMS ICT 2	ea7f18d0e6	add CompanyableTrait	2021-06-15 15:32:44 +07:00
snipe	fa786e615e	Moved HasFactory Signed-off-by: snipe <snipe@snipe.net>	2021-06-11 19:02:19 -07:00
Laravel Shift	b62d1f49e4	Shift cleanup	2021-06-10 20:19:27 +00:00
Laravel Shift	104b441e0d	Shift to class based factories	2021-06-10 20:17:44 +00:00
Laravel Shift	9f43ce97e9	Convert deprecated `$dates` property to `$casts`	2021-06-10 20:17:18 +00:00
Laravel Shift	802dc9240d	Shift bindings PHP 5.5.9+ adds the new static `class` property which provides the fully qualified class name. This is preferred over using class name strings as these references are checked by the parser.	2021-06-10 20:16:56 +00:00
Laravel Shift	934afa036f	Adopt Laravel coding style Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions. You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started. [1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer [2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200	2021-06-10 20:15:52 +00:00
Ivan Nieto Vivanco	d9f5f1182a	Delete a couple lines that rewrites validation rules for asset tags in the model Asset.php:save() method.	2021-05-25 23:09:27 -05:00
snipe	a704614397	Bumped max for country on model Signed-off-by: snipe <snipe@snipe.net>	2021-05-07 16:42:26 -07:00
Istvan Basa	b037d0efdd	fix ldap ad authentication filter query mechanism (#7441 )	2021-04-20 21:25:45 -07:00
Ivan Nieto Vivanco	36bc47c61c	Handle regex format when assigned from API (#9443 )	2021-04-20 14:44:47 -07:00
snipe	2986765a68	Implements #9373 Signed-off-by: snipe <snipe@snipe.net>	2021-04-14 11:17:59 -07:00
Godfrey Martinez	246cc0eaa8	Feature/ch16172/adding other fields to ldap sync settings (#9416 ) * new branch, added manager as an additional field. Currently having DB issues * WIP DB Issue with eloquent * added department to LDAP sync * removed unused variables	2021-04-14 10:17:57 -07:00
Sxderp	f01c93e162	Extend #6229 to include superuser permission check (#6772 )	2021-04-05 20:26:06 -07:00
Ivan Nieto Vivanco	90a24539b0	Fixes/cli importer issue (#9199 ) * Added logic to handle the CLI importer. * Fix bug introduced with the commit previous to the regression. * Adds a validation for variable when is null, add comments to clarify where the class variable came from. * Add support for when variable is an instance of User class.	2021-04-05 19:28:31 -07:00
Godfrey Martinez	5ea759f615	Fixed #7211 , #9197 , #7864 , [ch15504] - Added additional LDAP fields to sync (#9318 ) * LDAP and Active Directory has plenty of other [ch15504] * removed department id from ldap sync * removed department id from ldap sync * Update 2021_03_18_184102_adds_several_ldap_fields.php	2021-04-05 19:26:04 -07:00
Ivan Nieto Vivanco	eb0ae74ef8	Fixes typo that doesn't accepts 'textarea' as custom field type element. (#9387 )	2021-04-01 18:23:05 -07:00
snipe	a199c75f5c	Added textarea and checkbox to validation rules Signed-off-by: snipe <snipe@snipe.net>	2021-03-31 14:04:01 -07:00
Marc Leuser	90b7d34c69	Added #6695 : add API endpoint for license seats (#8058 ) * remove miselading comment line * added dedicated API endpoint for license seats * don't display a seat name via API it makes no sense and we don't have any particular sorting order so the numbering would be inconsistent anyway * reduce amount of IFs * add sanity checks to show() * fix goofed logging logic * add tests for action log entries	2021-03-29 19:41:26 -07:00
Jo Drexl	0114373468	Fixing #9224 (#9328 )	2021-03-22 12:57:26 -07:00
Brady Wetherington	44eee019d9	Add variable declaration for $result (#9168 )	2021-02-19 10:19:24 -08:00
snipe	5754f0aa3f	Revert "Added logic to handle the CLI importer. (#9088 )" This reverts commit `2e2d087639`.	2021-02-18 14:21:19 -08:00
Ivan Nieto	2e2d087639	Added logic to handle the CLI importer. (#9088 )	2021-02-17 13:13:17 -08:00
Ivan Nieto	f89d789832	Fixes #8918 The validation rules on Manufacturer Model 'name' attribute are malformed. (#9133 ) * Fixes the validation rules on Manufacturer Model * Fixes a little issue; if the manufacturer is active soft-deletes it, if is already deleted permanently deletes it	2021-02-16 12:52:55 -08:00
Ivan Nieto	6772835efc	Added support for radio buttons in Custom Fields. (#9053 )	2021-01-27 14:41:58 -08:00
snipe	0031fab0fe	Added termination date, depreciation in license column selection [ch14505] (#9052 )	2021-01-27 01:34:32 -08:00
snipe	9f7f1460e9	Simplified availableForCheckout() on asset	2021-01-26 22:12:24 -08:00
snipe	75a8639a20	Fixed weird checkbox display TODO: fix the 500 on the save	2021-01-12 18:16:42 -08:00
Brady Wetherington	0329028e2c	Fixed #8926 , #8252 - introduce circular reference check for location parent_id - rebased from #8253 (#8927 ) * Fixed #8252 - circular references in location parents * Remove non-translated translation changes * Fix typo * Add loop limit to avoid unforseen infinite loops * Remove check against parent_id in location controllers * Remove the Location->id=null piece (no longer needed) * Fix some formatting and whitespace * Re-introduce accidentally merged-out language file Co-authored-by: Travis Miller <milletr@tulsaschools.org>	2020-12-18 17:18:04 -08:00
Brady Wetherington	93cf8d4e0a	Forward-port of the old LDAP sync system (#8801 ) * Forward-port of the old LDAP sync system * Need to rename the class to avoid classname conflicts * Make 'classic' LDAP sync not add surrounding parens to filters that already have them * Re-work Test LDAP button to return 10 sample users * Remove useless debugging code	2020-11-30 17:11:44 -08:00
snipe	6cf5426540	Removed unused validation rule	2020-11-25 11:00:28 -08:00
snipe	72fc03aa50	Adds location to searchableRelations for asset model	2020-11-24 19:49:46 -08:00
snipe	2c0b9f959b	Comment with possible alternatve to the custom undeleted validator	2020-11-24 12:01:09 -08:00
snipe	2ea805b7ed	Added search/sort by Location OU, added to listing	2020-11-17 22:17:07 -08:00
snipe	0286cf6d46	Prevent license categories from being deleted if there are licenses in that category	2020-11-17 19:22:10 -08:00
snipe	08784f9cc5	Make expected_checkin fillable	2020-11-13 03:22:26 -08:00
snipe	5ea9c31eab	Removed debugging	2020-11-12 15:14:56 -08:00
snipe	f0e04ab9e4	Fixed #8726 - disallow archived assets to be checked out	2020-11-12 15:01:13 -08:00
snipe	7f7064c835	Make last_checkout fillable	2020-11-11 13:30:11 -08:00
snipe	30d68309a9	Add ability to checkout an asset if the user it’s assigned_to isn’t valid This would only happen if a merge-users went wonky	2020-11-10 05:06:47 -08:00
snipe	bbd7a752a0	Minor cleanup	2020-11-02 23:58:49 -08:00
Brady Wetherington	0eda53c484	Add a new custom validator for Users to prevent someone from managing themselves	2020-10-23 16:55:10 -07:00
snipe	2aa8e1e76b	Merge pull request #8596 from snipe/fixes/8462_move_accessory_notes Fixes #8462 - move accessory notes into pivot table	2020-10-23 14:19:51 -07:00
snipe	d03d4deef9	Temp fix for #8561 - manager_id validation error	2020-10-23 11:55:53 -07:00
snipe	21ceea0aed	Removed extra debugging	2020-10-23 08:19:04 -07:00
snipe	88f03e6b55	Added last_checkout and notes from pivot for accessories	2020-10-23 00:44:26 -07:00
snipe	e80b63b5c1	Fixed #8526 - skip cache for setup check	2020-10-19 12:33:38 -07:00
snipe	292370b02f	Cleaned up validation	2020-10-08 18:43:23 -07:00
snipe	52848ca8d8	Fixed checkin/checkout notification crashing	2020-09-11 16:10:18 -07:00
snipe	1bea83ee5a	Fixed missing setting call This is still broken further down the line in the event handler for license checkin, but this gets us closer	2020-09-04 15:44:37 -07:00
snipe	9c8ca6af21	Squashed commit of the following: commit `e321aeabae` Merge: `8ec99ff43` `37568ae9e` Author: snipe <snipe@snipe.net> Date: Mon Aug 31 12:14:44 2020 -0700 Merge branch 'master' into integrations/2020-08-31-v5-rc # Conflicts: # .all-contributorsrc # .nvmrc # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/ConsumablesController.php # app/Http/Controllers/Api/ImportController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/UsersController.php # app/Importer/import_mappings.md # app/Models/Ldap.php # app/Models/Loggable.php # composer.json # composer.lock # config/version.php # public/css/build/all.css # public/css/dist/all.css # public/css/skins/skin-contrast.css # public/css/skins/skin-contrast.css.map # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/dist/all.js # public/mix-manifest.json # resources/assets/js/components/importer/importer-file.vue # resources/assets/less/overrides.less # resources/macros/macros.php # resources/views/custom_fields/fieldsets/view.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/labels.blade.php # resources/views/hardware/view.blade.php # resources/views/layouts/default.blade.php # resources/views/modals/model.blade.php # resources/views/modals/user.blade.php # resources/views/users/index.blade.php # routes/api.php # routes/web/fields.php # tests/unit/UserTest.php commit `37568ae9ec` Merge: `01a832169` `32ad9050c` Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:49:37 2020 -0700 Merge pull request #8365 from snipe/fixes/8338_google_maps_CSP Fixed #8338 - Added google maps to CSP commit `32ad9050cf` Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:48:53 2020 -0700 Added google maps to CSP commit `01a832169c` Merge: `bcad49ce7` `3c6883489` Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:38:31 2020 -0700 Merge pull request #8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist Fixed #8335 - added assignedTo scope on status labels API call for assetlist commit `3c6883489c` Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:37:30 2020 -0700 Added assignedTo scope commit `bcad49ce79` Author: snipe <snipe@snipe.net> Date: Fri Aug 14 16:10:22 2020 -0700 Try to better handle slack “too many requests” issue commit `b5acca89d7` Author: snipe <snipe@snipe.net> Date: Fri Aug 14 16:02:15 2020 -0700 Check for admin for slack notifications commit `e52919cf1b` Merge: `714576be4` `29f3a5c48` Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:35:15 2020 -0700 Merge pull request #8327 from snipe/features/checkin_license_from_all_users Checkin license from all users cli tool commit `29f3a5c48f` Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:27:40 2020 -0700 Use more verbose annotation for Auth::user if/else commit `134e8e6fb9` Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:25:07 2020 -0700 Moved user email nulling until after the save commit `714576be45` Merge: `b999c50a2` `512899294` Author: Brady Wetherington <bwetherington@grokability.com> Date: Fri Aug 14 15:24:03 2020 -0700 Merge pull request #8328 from snipe/fix_deprecation_report Fix deprecation report for customers with many active assets commit `5128992940` Author: Brady Wetherington <uberbrady@gmail.com> Date: Fri Aug 14 15:03:03 2020 -0700 Fix deprecation report for customers with many active assets commit `0291323502` Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:57:58 2020 -0700 Use the user as the target commit `e0f6f9b839` Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:43:37 2020 -0700 Artisan command to check in licenses from all users commit `f1a6308002` Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:43:07 2020 -0700 Check for Auth::user before trying to log id (for cli) commit `b999c50a2e` Merge: `9ca20e496` `e3906b245` Author: snipe <snipe@snipe.net> Date: Wed Aug 12 12:37:47 2020 -0700 Merge pull request #8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation Looks great, thank you! commit `e3906b245c` Author: Godfrey M <godmartinz@gmail.com> Date: Wed Aug 12 12:27:18 2020 -0700 added translation for admin/licenses/message.not_found commit `9ca20e4964` Merge: `e0644dbbf` `456a74d88` Author: Brady Wetherington <bwetherington@grokability.com> Date: Tue Aug 11 17:33:19 2020 -0700 Merge pull request #8313 from snipe/improve_ldap_search_error_reporting Improve ldap search error reporting commit `456a74d88c` Author: Brady Wetherington <uberbrady@gmail.com> Date: Tue Aug 11 16:41:20 2020 -0700 De-merge out incorrectly merged files. Whoops! commit `799c059070` Author: Brady Wetherington <uberbrady@gmail.com> Date: Tue Aug 11 16:21:18 2020 -0700 Add internationalized version of LDAP error message commit `c62d43a778` Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Aug 10 17:04:17 2020 -0700 Improve Exception management in Artisan LDAP Sync method. Still need to localize this better commit `b725bd0fae` Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Aug 10 17:23:04 2020 -0700 Add @PeterUpfold as a contributor commit `e0644dbbf6` Merge: `5b6925b00` `004ecad05` Author: Brady Wetherington <bwetherington@grokability.com> Date: Mon Aug 10 17:22:31 2020 -0700 Merge pull request #8105 from PeterUpfold/PeterUpfold-7661workaround Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result() commit `5b6925b00c` Author: snipe <snipe@snipe.net> Date: Tue Aug 4 21:00:37 2020 -0700 Removed debugging :( commit `df17a859bf` Author: snipe <snipe@snipe.net> Date: Tue Aug 4 20:59:54 2020 -0700 Changed modal IDs so manager creation modal works on user creation main page commit `24c43056ba` Author: snipe <snipe@snipe.net> Date: Tue Aug 4 20:58:28 2020 -0700 Moved pGenerator script to default layout footer This fixes an issue where the password generator wouldn’t load in a modal in Chrome commit `606b7e905d` Author: snipe <snipe@snipe.net> Date: Fri Jul 31 17:02:33 2020 -0700 Small edits to PR template Slight text changes to ask specifics about versions commit `d73ddad477` Author: snipe <snipe@snipe.net> Date: Fri Jul 31 16:59:26 2020 -0700 Created a PR template First draft of the PR guidelines template commit `9a39cf721e` Merge: `7410b1683` `8994f3e15` Author: snipe <snipe@snipe.net> Date: Fri Jul 31 12:18:49 2020 -0700 Merge pull request #8258 from ballertv/features/consumable-api This looks great, thank you! commit `7410b16835` Merge: `e955c983a` `b09e7d19b` Author: Brady Wetherington <bwetherington@grokability.com> Date: Fri Jul 24 16:22:44 2020 -0700 Merge pull request #8270 from snipe/improve_ad_useraccountcontrol_v4 Add new useraccountcontrol value for valid AD users commit `8994f3e15e` Author: andres <andresgutierrez535@gmail.com> Date: Wed Jul 22 19:57:06 2020 -0400 cleanup commit `d23f1a77ca` Author: andres <andresgutierrez535@gmail.com> Date: Wed Jul 22 18:46:02 2020 -0400 implement checkout API commit `e955c983a3` Merge: `2fa17ac18` `eed41e454` Author: snipe <snipe@snipe.net> Date: Wed Jul 22 13:43:29 2020 -0700 Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer Added address, city, state and country to importer and city to bulk editor commit `b09e7d19b3` Author: Brady Wetherington <uberbrady@gmail.com> Date: Wed Jul 22 13:32:16 2020 -0700 Add new useraccountcontrol value for valid AD users; document algorithm and values commit `2fa17ac185` Merge: `b90515437` `3b1e46f72` Author: snipe <snipe@snipe.net> Date: Wed Jul 22 12:06:31 2020 -0700 Merge pull request #8254 from Godmartinz/gmartinez_adds_email_formats Added firstinitial.lastname, lastname_firstinitial, firstnamelastname… commit `3b1e46f72b` Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com> Date: Wed Jul 22 11:25:57 2020 -0700 Update general.php commit `0c1a1de2a2` Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com> Date: Wed Jul 22 11:24:36 2020 -0700 Update general.php fixed typo commit `20c9ae5818` Author: Godfrey M <godmartinz@gmail.com> Date: Wed Jul 22 10:21:19 2020 -0700 Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats commit `eed41e4549` Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:57:32 2020 -0700 Moved address down further, fixed broken HTML commit `b750f4754f` Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:49:54 2020 -0700 Added city to bulk user importer commit `c17a06792a` Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:49:38 2020 -0700 Added address, city, state, country to user importer commit `4f76cc6cfb` Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:46:13 2020 -0700 I don’t actually know what this file is for commit `b905154373` Author: snipe <snipe@snipe.net> Date: Mon Jul 20 14:29:32 2020 -0700 Fixed #8247 - added notes field to user details display commit `daf748e531` Author: snipe <snipe@snipe.net> Date: Fri Jul 17 12:32:01 2020 -0700 Bumped hash commit `799a93c46a` Author: snipe <snipe@snipe.net> Date: Fri Jul 17 12:11:32 2020 -0700 Allow for email/username search on users commit `34aa12e229` Merge: `81a633288` `897757bd0` Author: snipe <snipe@snipe.net> Date: Thu Jul 16 17:44:13 2020 -0700 Merge pull request #8239 from snipe/fixes/api_rtd_to_location_on_create Set location_id to rtd_location_id on asset creation commit `897757bd04` Author: snipe <snipe@snipe.net> Date: Thu Jul 16 17:43:44 2020 -0700 Removed added line for location commit `c7125c3937` Author: snipe <snipe@snipe.net> Date: Thu Jul 16 16:34:39 2020 -0700 Set location_id to rtd_location_id on asset creation commit `81a6332889` Author: snipe <snipe@snipe.net> Date: Tue Jul 14 13:55:38 2020 -0700 Removed license ID from seats table cookie info This typically wouldn’t be necessary, since most people would want to view the same types of data across licenses commit `6e563f6e4b` Merge: `5320f5c67` `7f69ae953` Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:54 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit `5320f5c67c` Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:45 2020 -0700 Disallow non-super users from editing their own permissions commit `7f69ae953b` Merge: `c79f8c1ba` `17f6fbabf` Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:00 2020 -0700 Merge pull request #8227 from snipe/fix_select2_ajax_pulldowns Changes how we do AJAX calls via Select2 for dynamic drop-down menus commit `17f6fbabfa` Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Jul 13 21:12:03 2020 -0700 Switch to 'items' to maintain compatbility with other internal API's commit `c79f8c1baf` Merge: `12c92e30b` `536401fe0` Author: snipe <snipe@snipe.net> Date: Mon Jul 13 17:42:16 2020 -0700 Merge pull request #8207 from EDVLeer/patch-1 Update snipeit.sh commit `e7a820f7c9` Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Jul 13 17:14:31 2020 -0700 Changes how we do AJAX calls via Select2 for dynamic drop-down menus commit `12c92e30b7` Author: snipe <snipe@snipe.net> Date: Fri Jul 10 16:21:27 2020 -0700 Show whether or not the user was imported via LDAP in the view page commit `fd10b755b0` Author: snipe <snipe@snipe.net> Date: Fri Jul 10 11:30:01 2020 -0700 Removed the sr-only tag in table headers It was breaking Bootstrap Tables column selector :( commit `dbbb7680d9` Author: snipe <snipe@snipe.net> Date: Thu Jul 9 21:12:50 2020 -0700 A few more fixes for the cli Do not check out a piece of software if it’s already been checked out to the user commit `cf0dd5bbad` Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:43:13 2020 -0700 Small fixes for cli tool commit `25e53d8c7f` Merge: `ec6ed256f` `89d433b41` Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:27:01 2020 -0700 Merge pull request #8216 from snipe/features/checkout_license_to_all_users Added CLI tool to checkout license to all users commit `89d433b41a` Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:26:02 2020 -0700 Removed duplicate seat call commit `e2570ada6f` Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:04:05 2020 -0700 CLI tool to checkout a license to ALL users commit `45afe725a1` Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:03:47 2020 -0700 Only try to get the company if there is an auth’d user (Needed for command line tools, where no Auth::user() is present) commit `536401fe0f` Author: EDVLeer <32170051+EDVLeer@users.noreply.github.com> Date: Tue Jul 7 08:21:36 2020 +0200 Update snipeit.sh Ubuntu 20.04 commit `ec6ed256fb` Author: snipe <snipe@snipe.net> Date: Mon Jul 6 18:45:43 2020 -0700 Bumped minor version commit `2aaa7bed2d` Merge: `339bdddc3` `cc9f1577a` Author: snipe <snipe@snipe.net> Date: Thu Jun 25 18:37:41 2020 -0700 Merge pull request #8183 from snipe/features/merge_users Added merge utility commit `cc9f1577a4` Author: snipe <snipe@snipe.net> Date: Thu Jun 25 17:43:53 2020 -0700 Removed unused use directives commit `ab1fe8be0c` Author: snipe <snipe@snipe.net> Date: Thu Jun 25 17:42:39 2020 -0700 Added merge utility commit `339bdddc38` Author: snipe <snipe@snipe.net> Date: Thu Jun 25 11:00:33 2020 -0700 Fix for Vue js not loading due to CSP :( commit `35b9cf4b70` Author: snipe <snipe@snipe.net> Date: Tue Jun 23 02:41:59 2020 -0700 Fixed missing db prefix on scopeDueOrOverdueForAudit commit `7ccb41371e` Author: snipe <snipe@snipe.net> Date: Tue Jun 23 01:09:39 2020 -0700 Removed unoptimized images directive securityheaders.com is claiming it’s onrecognized, even though I got that directive from their site, so… whatever. ¯\_(ツ)_/¯ commit `2e60a457bf` Author: snipe <snipe@snipe.net> Date: Tue Jun 23 01:07:00 2020 -0700 Dumb fix for feature-policy being dumb. commit `2390d2160b` Merge: `b42801f6a` `00b051b8c` Author: snipe <snipe@snipe.net> Date: Tue Jun 23 00:27:47 2020 -0700 Merge pull request #8164 from snipe/features/additional_security_headers Additional security headers commit `00b051b8c7` Author: snipe <snipe@snipe.net> Date: Tue Jun 23 00:26:09 2020 -0700 Added a few more comments commit `05b3a9ad7e` Author: snipe <snipe@snipe.net> Date: Mon Jun 22 23:17:27 2020 -0700 Config variable for HSTS commit `4fb880384f` Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:37:14 2020 -0700 Changed comment commit `43042ad841` Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:35:59 2020 -0700 Consolidated ReferrerPolicy into new SecurityHeaders file commit `a716382ac4` Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:33:37 2020 -0700 Removed CSP middleware (it’s added in the general header) commit `36c8f7f4f1` Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:31:01 2020 -0700 Additional security headers commit `b42801f6ae` Merge: `de4934f21` `946129f20` Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:47:35 2020 -0700 Merge pull request #8163 from snipe/fixes/fix-for-css-on-column-selector Fixed weird padlock display in asset listing with encrypted custom fields commit `946129f206` Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:45:20 2020 -0700 Made quote style consistent commit `b941ef1e08` Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:41:40 2020 -0700 Pulled CSS font awesome styles out of the blade and into overrides.css commit `d1aa11ec89` Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:29:19 2020 -0700 Fix for weird padlock display in asset listing with encrypted custom fields commit `de4934f21d` Merge: `af06e4205` `b10076b01` Author: snipe <snipe@snipe.net> Date: Mon Jun 22 17:28:38 2020 -0700 Merge pull request #8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings commit `b10076b015` Author: Godfrey M <godmartinz@gmail.com> Date: Mon Jun 22 17:04:39 2020 -0700 corrected an error where font-size for labels were static in settings. commit `af06e42056` Author: snipe <snipe@snipe.net> Date: Wed Jun 17 11:17:25 2020 -0700 Bumped version commit `9a2440dc4b` Merge: `beae8efb2` `2ac1c1636` Author: snipe <snipe@snipe.net> Date: Tue Jun 16 20:20:07 2020 -0700 Merge pull request #8141 from snipe/fixes/better_handling_when_license_is_invalid Better handle the logic to determine if we should display the license checkout blade [ch13792] commit `2ac1c1636c` Author: snipe <snipe@snipe.net> Date: Tue Jun 16 16:12:57 2020 -0700 Better handle the logic to determine if we should display the license checkout blade commit `004ecad059` Author: Peter Upfold <pgithub@upfold.org.uk> Date: Wed Jun 3 08:59:50 2020 +0100 Force suppress deprecation warning on ldap_control_paged_result() commit `beae8efb21` Merge: `d14ab7e3e` `9839e5e56` Author: snipe <snipe@snipe.net> Date: Wed May 27 23:01:33 2020 -0700 Merge pull request #8088 from Godmartinz/Label_Woes Barcode resizing and text adjustment commit `9839e5e566` Author: Godfrey M <godmartinz@gmail.com> Date: Wed May 27 12:27:40 2020 -0700 adjusted for all label text, removed local variable commit `d14ab7e3e1` Author: snipe <snipe@snipe.net> Date: Wed May 27 00:22:44 2020 -0700 Porting change from #8053 to master Signed-off-by: snipe <snipe@snipe.net> commit `e7f74d94c1` Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:22:45 2020 -0700 Label_Woes commit `e97cf011b6` Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:15:39 2020 -0700 Label_Woes commit `ed23505054` Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:10:45 2020 -0700 Label_Woes commit `001e721530` Merge: `f88683766` `8210da6e8` Author: snipe <snipe@snipe.net> Date: Wed May 20 10:21:52 2020 -0700 Merge pull request #8063 from dmeltzer/backport-8092 BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635] commit `8210da6e82` Author: Daniel Meltzer <dmeltzer.devel@gmail.com> Date: Wed May 20 10:29:27 2020 -0400 Fix Missing Category selection in Asset Model Modal dialog. A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information. commit `f88683766b` Author: snipe <snipe@snipe.net> Date: Thu May 14 00:55:47 2020 -0700 Roll back previous change Signed-off-by: snipe <snipe@snipe.net> commit `e4385c0f8c` Author: snipe <snipe@snipe.net> Date: Thu May 14 00:48:30 2020 -0700 Fixes #8051 regression Signed-off-by: snipe <snipe@snipe.net> commit `0550fe0ffa` Author: snipe <snipe@snipe.net> Date: Tue May 12 10:31:54 2020 -0700 Fix for session fixation vulnerability Signed-off-by: snipe <snipe@snipe.net> commit `7fb3a9b82c` Merge: `9a2ed804c` `ecb1e87fe` Author: snipe <snipe@snipe.net> Date: Mon May 11 22:41:36 2020 -0700 Merge pull request #8043 from snipe/features/backup-optional-in-import-and-ldap Added option to disable backup in import commit `ecb1e87fe6` Author: snipe <snipe@snipe.net> Date: Mon May 11 20:45:15 2020 -0700 Updated assets Signed-off-by: snipe <snipe@snipe.net> commit `f43df5f041` Author: snipe <snipe@snipe.net> Date: Mon May 11 20:44:46 2020 -0700 Fixed form label Signed-off-by: snipe <snipe@snipe.net> commit `95cc48e422` Author: snipe <snipe@snipe.net> Date: Mon May 11 20:41:10 2020 -0700 Added option to disable backup in import Signed-off-by: snipe <snipe@snipe.net> commit `9a2ed804ca` Author: snipe <snipe@snipe.net> Date: Mon May 11 20:28:42 2020 -0700 Fixed mismatched HTML header tags Signed-off-by: snipe <snipe@snipe.net> commit `d20fad28e5` Author: snipe <snipe@snipe.net> Date: Mon May 11 20:28:24 2020 -0700 Use more modern request helper Signed-off-by: snipe <snipe@snipe.net> commit `ae813ddf75` Author: snipe <snipe@snipe.net> Date: Mon May 11 18:11:16 2020 -0700 Add @alek13 as a contributor commit `bb42109c0c` Author: snipe <snipe@snipe.net> Date: Mon May 11 18:10:45 2020 -0700 Added a clarifying comment Signed-off-by: snipe <snipe@snipe.net> commit `f46ecf8ec0` Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:20 2020 -0700 Updated composer lock Signed-off-by: snipe <snipe@snipe.net> commit `b9e821c0e6` Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:14 2020 -0700 Small fix for Group Functional Tests Signed-off-by: snipe <snipe@snipe.net> commit `9ee28c7513` Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:02 2020 -0700 Switched to use info instead of danger on undeployable statuses Signed-off-by: snipe <snipe@snipe.net> commit `1a8ba06702` Merge: `0fd232e70` `ee4d69b1c` Author: snipe <snipe@snipe.net> Date: Mon May 11 17:53:32 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit `0fd232e70d` Author: snipe <snipe@snipe.net> Date: Mon May 11 17:53:24 2020 -0700 Fixed group functional test (We had changed the minimum to 2 instead of 3) Signed-off-by: snipe <snipe@snipe.net> commit `ee4d69b1c5` Merge: `31c535094` `d1ad11194` Author: snipe <snipe@snipe.net> Date: Mon May 11 17:52:45 2020 -0700 Merge pull request #8041 from alek13/patch-1 use supported package for slack commit `d1ad111949` Author: Alexander Chibrikin <alek13.me@gmail.com> Date: Mon May 11 20:31:13 2020 +0300 use supported package for slack see https://github.com/maknz/slack/issues/94 commit `31c5350941` Author: snipe <snipe@snipe.net> Date: Fri May 1 01:05:48 2020 -0700 Fixed incorrect route for groups edit Signed-off-by: snipe <snipe@snipe.net> commit `7eb70e17e0` Merge: `5bb4f271a` `3dfcb4699` Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:50:37 2020 -0700 Merge pull request #7993 from snipe/fixes/7989_column_selector Fixed #7989 - Converted table heading icons in People to CSS glyphs commit `3dfcb46991` Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:41:08 2020 -0700 Minor formatting changes Signed-off-by: snipe <snipe@snipe.net> commit `96eb96f964` Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:27:00 2020 -0700 Removed stray val (typo) Signed-off-by: snipe <snipe@snipe.net> commit `a2f08bd3ba` Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:08:54 2020 -0700 Added comments Signed-off-by: snipe <snipe@snipe.net> commit `e009fbe59f` Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:04:53 2020 -0700 Converted table heading icons in People to CSS glyphs Signed-off-by: snipe <snipe@snipe.net> commit `5bb4f271aa` Author: snipe <snipe@snipe.net> Date: Fri Apr 24 00:47:19 2020 -0700 Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets Signed-off-by: snipe <snipe@snipe.net>	2020-08-31 12:17:19 -07:00
Daniel Meltzer	f0546bf689	Clean up Transformers and extract an isDeletable() method to models where it makes sense.	2020-05-23 15:24:10 -04:00
snipe	8507bcd16b	Merge pull request #8008 from dmeltzer/component-checkinout-fixes Component checkout/checkin fixes.	2020-04-30 17:49:22 -07:00
Daniel Meltzer	b28a4f3108	Add component unit test and unify some validation.	2020-04-30 09:50:12 -04:00
Daniel Meltzer	68224757f4	Validate when editing the quantity of a component that the new quantity is > the amount checked out	2020-04-29 13:25:04 -04:00
Daniel Meltzer	f8d18a8eb0	Revert asset-checkout-different validation. This was causing issues when trying to check an item out to a user or a location because of the way laravel handles validation. Instead, rely on the exception check we had in the controller. I moved this exception up to the model checkout method so that it would work for anywhere that that method was called, even if it avoided the controller.	2020-04-29 10:59:00 -04:00
snipe	fa5134603f	Added type casting and a few more validation rules Signed-off-by: snipe <snipe@snipe.net>	2020-04-22 06:37:40 -07:00
snipe	c02adace61	Ensure at the model level that location.id/user.id and location.parent_id/user.manager_id cannot be the same	2020-04-21 19:51:20 -07:00
snipe	5dc64ea91b	Re-added EasySlugger to fix tests	2020-04-21 19:28:24 -07:00
snipe	066e5588b5	Fixed slugging in custom fields to no longer use old library	2020-04-21 04:14:23 -07:00
snipe	87464e6ec0	Merge branch 'develop' into integrations/2020-04-15-v5-merge # Conflicts: # README.md # app/Http/Controllers/AccessoriesController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/LicensesController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/ForgotPasswordController.php # app/Http/Controllers/CategoriesController.php # app/Http/Controllers/CompaniesController.php # app/Http/Controllers/ComponentsController.php # app/Http/Controllers/ConsumablesController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/DepartmentsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/LocationsController.php # app/Http/Controllers/ManufacturersController.php # app/Http/Controllers/SettingsController.php # app/Http/Controllers/SuppliersController.php # app/Http/Controllers/UsersController.php # app/Http/Requests/AssetRequest.php # app/Http/Requests/ImageUploadRequest.php # app/Models/LicenseSeat.php # app/Models/Location.php # app/Models/Setting.php # composer.json # composer.lock # config/database.php # config/version.php # npm-shrinkwrap.json # package.json # public/css/AdminLTE.css # public/css/AdminLTE.css.map # public/css/overrides.css # public/css/overrides.css.map # public/css/skins/skin-blue-light.css # public/css/skins/skin-blue.css # public/css/skins/skin-green-dark.min.css # public/js/app.js # public/js/bootstrap-table.js # public/js/bootstrap/js/bootstrap.js # public/js/bootstrap/js/bootstrap.min.js # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/demo.js # public/js/ekko-lightbox.js # public/js/ekko-lightbox.min.js # public/js/extensions/export/bootstrap-table-export.js # public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js # public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js # public/js/extensions/toolbar/bootstrap-table-toolbar.min.js # public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js # public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js # public/js/plugins/timepicker/bootstrap-timepicker.js # public/js/plugins/timepicker/bootstrap-timepicker.min.js # public/js/vue.js # public/mix-manifest.json # resources/assets/js/bootstrap-js.js # resources/assets/js/bootstrap.min.js # resources/assets/js/ekko-lightbox.js # resources/assets/js/ekko-lightbox.min.js # resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js # resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js # resources/assets/js/plugins/chartjs/Chart.js # resources/assets/js/plugins/timepicker/bootstrap-timepicker.js # resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js # resources/assets/less/AdminLTE.less # resources/assets/less/overrides.less # resources/assets/less/skins/_all-skins.less # resources/assets/less/skins/skin-black.less # resources/assets/less/skins/skin-blue.less # resources/assets/less/skins/skin-green.less # resources/assets/less/skins/skin-purple.less # resources/assets/less/skins/skin-red.less # resources/assets/less/skins/skin-yellow.less # resources/assets/less/variables.less # resources/js/components/importer/importer-file.vue # resources/lang/en/auth/message.php # resources/lang/en/passwords.php # resources/lang/es-CO/general.php # resources/lang/es-ES/general.php # resources/lang/es-VE/general.php # resources/less/skins/skin-black-dark.less # resources/less/skins/skin-blue-dark.less # resources/less/skins/skin-contrast.less # resources/less/skins/skin-green-dark.less # resources/less/skins/skin-orange-dark.less # resources/less/skins/skin-orange.less # resources/less/skins/skin-purple-dark.less # resources/less/skins/skin-red-dark.less # resources/less/skins/skin-yellow-dark.less # resources/views/accessories/checkin.blade.php # resources/views/accessories/checkout.blade.php # resources/views/accessories/edit.blade.php # resources/views/account/profile.blade.php # resources/views/account/view-assets.blade.php # resources/views/asset_maintenances/edit.blade.php # resources/views/auth/passwords/email.blade.php # resources/views/auth/passwords/reset.blade.php # resources/views/categories/edit.blade.php # resources/views/companies/edit.blade.php # resources/views/components/checkin.blade.php # resources/views/components/checkout.blade.php # resources/views/components/edit.blade.php # resources/views/consumables/checkout.blade.php # resources/views/consumables/edit.blade.php # resources/views/custom_fields/fields/edit.blade.php # resources/views/custom_fields/fieldsets/edit.blade.php # resources/views/dashboard.blade.php # resources/views/departments/edit.blade.php # resources/views/groups/edit.blade.php # resources/views/hardware/audit.blade.php # resources/views/hardware/bulk-checkout.blade.php # resources/views/hardware/bulk.blade.php # resources/views/hardware/checkin.blade.php # resources/views/hardware/checkout.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/index.blade.php # resources/views/hardware/quickscan.blade.php # resources/views/hardware/view.blade.php # resources/views/importer/import.blade.php # resources/views/layouts/basic.blade.php # resources/views/layouts/default.blade.php # resources/views/layouts/edit-form.blade.php # resources/views/licenses/checkin.blade.php # resources/views/licenses/checkout.blade.php # resources/views/licenses/edit.blade.php # resources/views/locations/edit.blade.php # resources/views/manufacturers/edit.blade.php # resources/views/modals/upload-file.blade.php # resources/views/models/bulk-edit.blade.php # resources/views/models/custom_fields_form.blade.php # resources/views/models/edit.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/partials/forms/edit/address.blade.php # resources/views/partials/forms/edit/asset-select.blade.php # resources/views/partials/forms/edit/category-select.blade.php # resources/views/partials/forms/edit/category.blade.php # resources/views/partials/forms/edit/company-select.blade.php # resources/views/partials/forms/edit/company.blade.php # resources/views/partials/forms/edit/department-select.blade.php # resources/views/partials/forms/edit/depreciation.blade.php # resources/views/partials/forms/edit/email.blade.php # resources/views/partials/forms/edit/image-upload.blade.php # resources/views/partials/forms/edit/item_number.blade.php # resources/views/partials/forms/edit/location-profile-select.blade.php # resources/views/partials/forms/edit/location-select.blade.php # resources/views/partials/forms/edit/location.blade.php # resources/views/partials/forms/edit/maintenance_type.blade.php # resources/views/partials/forms/edit/manufacturer-select.blade.php # resources/views/partials/forms/edit/manufacturer.blade.php # resources/views/partials/forms/edit/minimum_quantity.blade.php # resources/views/partials/forms/edit/model-select.blade.php # resources/views/partials/forms/edit/model_number.blade.php # resources/views/partials/forms/edit/name.blade.php # resources/views/partials/forms/edit/notes.blade.php # resources/views/partials/forms/edit/order_number.blade.php # resources/views/partials/forms/edit/phone.blade.php # resources/views/partials/forms/edit/purchase_cost.blade.php # resources/views/partials/forms/edit/purchase_date.blade.php # resources/views/partials/forms/edit/quantity.blade.php # resources/views/partials/forms/edit/serial.blade.php # resources/views/partials/forms/edit/status.blade.php # resources/views/partials/forms/edit/submit.blade.php # resources/views/partials/forms/edit/supplier-select.blade.php # resources/views/partials/forms/edit/supplier.blade.php # resources/views/partials/forms/edit/user-select.blade.php # resources/views/reports/custom.blade.php # resources/views/settings/alerts.blade.php # resources/views/settings/asset_tags.blade.php # resources/views/settings/barcodes.blade.php # resources/views/settings/branding.blade.php # resources/views/settings/general.blade.php # resources/views/settings/labels.blade.php # resources/views/settings/ldap.blade.php # resources/views/settings/localization.blade.php # resources/views/settings/security.blade.php # resources/views/setup/user.blade.php # resources/views/suppliers/edit.blade.php # resources/views/users/bulk-edit.blade.php # resources/views/users/edit.blade.php # resources/views/users/ldap.blade.php # resources/views/users/print.blade.php # resources/views/users/view.blade.php # routes/api.php # routes/web/hardware.php # webpack.mix.js	2020-04-20 23:20:34 -07:00
snipe	154db9a416	This literally never fucking worked. Ever. Shoot me.	2020-04-09 22:20:05 -07:00
snipe	cf9d0201e0	Catch weird edge case where target wouldn’t have an ID (?!)	2020-04-09 20:23:02 -07:00
snipe	5707df0239	Check that location isset in checkout	2020-04-09 18:32:34 -07:00
snipe	206bd675f2	Pulled slack validation out of setting model validation so it doesn’t fail mysteriously on other pages	2020-04-08 15:07:02 -07:00
snipe	9eb4b0dda7	Disallow 0 as a number for labels per page	2020-02-04 19:14:58 -08:00
Fabian Grutschus	5becb93e6c	Added: allow appending of domain name to username when user tries to login (#7790 )	2020-02-04 12:47:49 -08:00
bigtreeEdo	e27a9b137b	added 'requestable' to fillable attributes. (#7787 )	2020-02-03 19:37:03 -08:00
snipe	88fb1370f0	Added slightly friendlier error handling for assets without models This scenario should never happen, barring someone manually editing their data, but better to handle that scenario in a more user-friendly way.	2019-12-06 18:17:03 -08:00
snipe	ff57f10e9f	Fix for searching on child location names (#7646 ) * Fix for child locations * Reverts temp changes to indenter	2019-12-06 13:14:10 -08:00
Godfrey Martinez	f0af750b0a	Fixed comment (#7617 ) * Set theme jekyll-theme-hacker * fixed commenty about scopebyDeprecationID being identified as a method to location ID * fixed commenty about scopebyDeprecationID being identified as a method to location ID	2019-11-22 16:13:42 -08:00
snipe	88cf456386	Adding Dept to license seats (#7609 ) * Adding Dept to license seats * Added query scope to order by department * Make license seat department sortable * Disable license seat internal search - this never actually worked	2019-11-21 22:03:56 -08:00
snipe	dd40ddf5a5	Fixed an error on audit due list when no audit_warning_days had been set [ch9764]	2019-11-21 21:34:41 -08:00
snipe	8127fdc5bc	Min password requirement set to 8 characters	2019-11-18 21:17:51 -08:00
snipe	5290c47e2a	Merge branch 'develop' into v5-master-develop-integration # Conflicts: # .env.example # .travis.yml # Dockerfile # README.md # app/Console/Commands/LdapSync.php # app/Console/Kernel.php # app/Http/Controllers/AccessoriesController.php # app/Http/Controllers/Api/AccessoriesController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Assets/AssetFilesController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/CategoriesController.php # app/Http/Controllers/CompaniesController.php # app/Http/Controllers/ComponentsController.php # app/Http/Controllers/ConsumablesController.php # app/Http/Controllers/DepartmentsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/LocationsController.php # app/Http/Controllers/ManufacturersController.php # app/Http/Controllers/ReportsController.php # app/Http/Controllers/SettingsController.php # app/Http/Controllers/SuppliersController.php # app/Http/Controllers/UsersController.php # app/Http/Middleware/EncryptCookies.php # app/Http/Requests/AssetRequest.php # app/Http/Transformers/AssetMaintenancesTransformer.php # app/Importer/AssetImporter.php # app/Models/AssetMaintenance.php # app/Models/Location.php # app/Models/User.php # composer.json # composer.lock # config/backup.php # config/database.php # config/version.php # public/mix-manifest.json # resources/lang/en-ID/general.php # resources/lang/vi/admin/settings/general.php # resources/views/accessories/edit.blade.php # resources/views/hardware/view.blade.php # resources/views/layouts/default.blade.php # tests/api/ApiCategoriesCest.php	2019-11-18 19:49:39 -08:00
snipe	0290257734	Limit license seats to 999 to prevent latency	2019-10-28 13:48:18 -07:00
snipe	22d2ad9248	Fixes nested location selectlist (#7483 ) * Rename child locations method * Use Ajax dropdown for locations selectlist for edit/create * Removed locations database call on edit/create blades for faster loading * Updated locations controller to use the new iterator * Increase pagination on locations controller to 500 We’re already loading all of that data up beforehand anyway, so no point in keeping the query smaller. * Fixed the else to make codacy happy * Improve the design and performance of the nested location selectlist (#7484) * Improve the design and performance of the nested location selectlist * Fixed parse errors * Removed debugging code/comments	2019-10-02 03:56:56 -07:00
snipe	ab05a44e0b	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2019-09-30 19:18:54 -07:00
snipe	7f5f4a1297	Added softwarew support and hardware support to maintenance types	2019-09-24 01:34:23 -07:00
Martin Berg	3dcef9aac9	Add support for custom remote user header (#7370 )	2019-09-03 11:07:26 -07:00
snipe	0544164015	Fixed Eloquent Builder path in docblock	2019-08-20 18:10:36 -07:00
snipe	b6a188a87b	Removed erroneous linebreak	2019-08-20 18:10:21 -07:00
snipe	441ae69f5c	Integrations/develop into master (#7352 ) * Fixes #6204 - added email alerts and web/API access to assets due for audits (#6992) * Added upcoming audit report TODO: Fid diff/threshold math * Added route to list overdue / upcoming assets via API * Controller/API methods for due/overdue audits We could probably skip this and just handle it via view in the routes… * Added query scopes for due and overdue audits * Added audit due console command to kernel * Added ability to pass audit specs to main API asset search method * Added audit presenter * Added bootstrap-tables presenter formatter to display an audit button * Added gated sidenav items to left nav * Added audit due/overdue blades * Cleanup on audit due/overdue console command * Added language strings for audit views * Fixed :threshold placeholder * Removed unused setting variable * Fixed next audit date math * Added scope for both overdue and upcoming * Derp. Wrong version * Bumped version (I will release this version officially tomorrow) * Leave the activated state for users alone in normal LDAP synchronisation. (#6988) * Fixed #7003 - crash when warranty months or purchase date is null * Fixed #6956 - viewKeys policy inconsistent (#7009) * Fixed #6956 - Added additional gates show showing/hiding license keys * Modified gate to allow user to see licenses if they can create or edit the license as well * Added API middleware to API routes to enable throttling TODO: Figure out how to make this costumizable without touching the code * Import locations from CSV via command line (#7021) * Added import locations command * Small fixes to location importer * Added country, LDAP OU * Cleaned up comments, added more clarification to what the script does * Added ability to update groups via API Fixes [ch9139] * Bumped version * Fixed #6883 - remove escaping of fields on LDAP import * Fixed #6880 - correctly encrypt encrypted fields via the API * Fixes #5054: LDAP users deactivated for none-ad (#7032) When using none-AD ldap, users are automatically deactivated every LDAP sync. This commit changes the behaviour so that if the active flag isn't set, the users are enabled. Fixed #5054, at least for 4.X * Updated packages - Updating erusev/parsedown (v1.7.2 => 1.7.3): Downloading (100%) - Updating squizlabs/php_codesniffer (3.4.1 => 3.4.2): Downloading (100%) - Updating symfony/polyfill-mbstring (v1.10.0 => v1.11.0): Downloading (100%) - Updating symfony/var-dumper (v3.4.23 => v3.4.27): Downloading (100%) - Updating league/flysystem (1.0.50 => 1.0.51): Downloading (100%) - Updating symfony/translation (v3.4.23 => v3.4.27): Downloading (100%) - Updating nesbot/carbon (1.36.2 => 1.37.1): Downloading (100%) - Updating symfony/debug (v3.4.23 => v3.4.27): Downloading (100%) - Updating symfony/console (v3.4.23 => v3.4.27): Downloading (100%) - Updating symfony/finder (v3.4.23 => v3.4.27): Downloading (100%) - Updating symfony/polyfill-ctype (v1.10.0 => v1.11.0): Downloading (100%) - Updating symfony/polyfill-php70 (v1.10.0 => v1.11.0): Downloading (100%) - Updating symfony/http-foundation (v3.4.23 => v3.4.27): Downloading (100%) - Updating symfony/event-dispatcher (v3.4.23 => v3.4.27): Downloading (100%) - Updating symfony/http-kernel (v3.4.23 => v3.4.27): Downloading (100%) - Updating symfony/process (v3.4.23 => v3.4.27): Downloading (100%) - Updating symfony/routing (v3.4.23 => v3.4.27): Downloading (100%) - Updating symfony/polyfill-util (v1.10.0 => v1.11.0): Downloading (100%) - Updating symfony/polyfill-php56 (v1.10.0 => v1.11.0): Downloading (100%) - Updating symfony/psr-http-message-bridge (v1.1.1 => v1.1.2): Downloading (failed) Downloading (100%) - Updating rollbar/rollbar (v1.7.5 => v1.8.1): Downloading (100%) - Updating symfony/yaml (v3.4.23 => v3.4.27): Downloading (100%) - Updating symfony/browser-kit (v3.4.23 => v3.4.27): Downloading (100%) * Fixed #7044 - API update deleted custom fields if they are not re-presented * Fixed XSS vulnerability when creating a new categories, etc via modal on create Same fix as before, because of the weird select2 post-parsing ajax behavior * Updated email strings * Fixed #7046 - added user website url back into UI * Updated language strings * Bumped version * Updated packages * New backups config for spatie * Removed debugbar service provider (autodiscovery) * Use laravel v5.5 withCount manual aliases * Added spatie language files * Removed old laravel backups config This config file was renamed in a newer version of spatie laravel-backup * Set the serialization * Added the command loader to console kernel * Renamed fire() to handle() * Updated withCount to use manual naming * Updated backup path in backup admin * Updated travis with new php versions * Bumped laravel version in readme * Fixed custom field edit screen * Fixed baseUrl is undefined error I literally cannot figure out how this ever worked before. * Fix for included files in backup * Bumped version * Switch has() to filled() * Change ->has() to ->filled() * Removed cosole log * Bumped packages * Use getReader instead of fetchAssoc for CSV parser https://csv.thephpleague.com/9.0/upgrading/ * Handle JSON validation errors like 5.4 * Handle JSON validation errors like 5.4 * Handle JSON validation errors like 5.4 * Trying to fix ajax asset validation This I think gets us closer, but still not handling the validation on the asset properly. When I do a print_r of the validation in the other items, its looking for an error bag that looks something like this: ``` Illuminate\Support\MessageBag Object ( [messages:protected] => Array ( [name] => Array ( [0] => The name field is required. ) [seats] => Array ( [0] => The seats field is required. ) [category_id] => Array ( [0] => The category id field is required. ) ) [format:protected] => :message ) ``` Currently the Assets ajax returns: ``` [2019-05-24 06:52:06] develop.ERROR: array ( 'messages' => array ( 'model_id' => array ( 0 => 'The model id field is required.', ), 'status_id' => array ( 0 => 'The status id field is required.', ), 'asset_tag' => array ( 0 => 'The asset tag field is required.', ), ), ) ``` So not sure why it’s not working. * Fixed missing asset validation * Check that a model exists before trying to fiddle with fieldsets * Tidied up license check * Removed extra escaping on checkin * Updated importer to work with newer CSV Reader::getRecords() method * Fixed field mapping * Small fix for reordering fields Fixes Illuminate\Database\QueryException: SQLSTATE[23000]: Integrity constraint violation: 1048 Column 'order' cannot be null (SQL: insert into `custom_field_custom_fieldset` (`custom_field_id`, `custom_fieldset_id`, `order`, `required`) values (12, 7, , 0)) [ch1151] This needs revisiting for a more solid fix, especially for data that was already entered bad. * Fixed bug where sorting by company name in Users API did not work Fixes [ch9200] * Removed custom fields from AssignedSearch to prevent confusing data in selectlist Fixes [ch9193] * Removed alert-danger from tests * Fixed missed consumables_count withCount() statement * Fixed Undefined variable user in $backto if checked out to a non-user Fixes [ch9194] * Check for valid model before attempting to access fieldsets Fixes [ch1249] * Only build the log upload destination path if there is a matching record Fixes [ch1232] * Fixed free_seats_count variable name (I forgot that Laravel switched camel case to snake case for their old 5.4 withCount variables) * Only gtry to delete the file if a record is found in the log * Only try to get fieldset if model is valid * Fixed more camel-casing -> snake-casing * Only display the file if the log record can be found * Fixed casing in sync command * Updated README * Derp - typo * Added link to Atlassian plugin * More Atlassian clarifications * Show accessory image on view page * Increased image size to 800px, added lightboxes * Fixed #7083 - Removed user_exists constraint on department save If the user has been deleted, this prevented the department from being successfully saved on edit * Updated branch in version file * Dockerfile update to bring us up to php v7.1 for Laravel 5.5 (#7084) * bump up to php7.1 & change deprecated MAINTAINER to a LABEL so it is visible with `docker inspect` * AND modapache >< * 2 updates required to get software-properties+ppa * Bumped version * Bumped release again :( * Missed one * Fixed #7098 - updated backup config for deleteFile() method * Fixed #7092 - handle weird port forwarding/port numbers for baseUrl * Bumped version * Fixed #7099 - set email to null by default for backup notifications * Removed old comments * Fixed #7100 - Check if $user isset on checkin * Increased throttle to 120 requests per minute * Added Filipino, corrected order for Spanish variations * Update language strings * Bumped hash * Changed has to filled to fix bulk asset editing * Bumped point version * Small fixes for phpleague CSB reader v9 * Improved error checking in locations importer * Fixed #7145 - rename groups table to permissions_group for mysql 8 reserved word compatibility * Reduce minimum group name length to 2 (from 3) eg: IT * Back in time fix FOR #7145 for new installs on MySQL 8+ * Fixed permission insert //TODO Handle this via model * Possible fix for reporting/admin migration back in time * Fixed #7164 - change table name to permission_groups * Fixed LDAP password blanking on save * fixing previous commit's actual wiping of password (#7183) replaced Input::fille('ldap_pword') with _filled_. Should be good to go. https://github.com/snipe/snipe-it/issues/7179 https://github.com/snipe/snipe-it/issues/7169 * Bumped version * Downgrading rollbar for Laravel 5.5 * Spelling Correction (#7206) Fixed Spelling for the word reqrite, to be rewrite. * Fix #6910: Add logic to manipulate the eloquent query. (#7006) * Added company_id to consumables_users table * Added logic to manage when a pivot table doesn't have the column company_id trough a join with users * Remove a migration that tries to fix this problem, but is not longer necessary * Addresses #7238 - add PWA code to layout Needs additional UX testing * Better log message for bad LDAP connection * Fixed #7186 - has vs filled in User’s API blanking out groups if no group_ids are passed * Comment clarification on #7186 * Check for valid seat on hardware view * Added space between footer and custom message * Cap warranty months to three characters Filles rollbar 209 * Cap warranty months to 3 on the frontend blade * Fixed countable() strings on user destroy * Check that the user has assets and that the aset model is valid * Bumped hash * Caps asset warranty to 20 years * Command to fix custom field unicode conversion differences between PHP versions (#7263) * Fixes #7252 form request changes (#7272) * Fixes for #7252 - custom fields not validating / no validaton messages in API w/form requests * Removed debug info * More fixes for #7252 This is mostly working as intended, if not yet the way Laravel wants us to do it. Right now, the API returns correctly, and the form UI will return highlighted errors, with the input filled in ~sometimes~. I’m not sure why it’s only sometimes yet, but this is potentially progress. * Removed experimental method * Check for digits_between:0,240 for warranty * Removed debug code * Apply fix from PR #7273 to master * Bumped hash * Fixed #7250 - permission issue for API fieldsets and fields endpoints This applies the change from #7294 to master * Add @mskrip as a contributor * Fixed #7270 - Checking-in Assets via API Removes the Item's Asset Name * CORS for api (#7292) * Added CORS support to API * Changed order so CORS will still work if throttle hit * Added APP_CORS_ALLOWED_ORIGINS env option * Fixed typo * Clarified header comments * More clarification * DIsable CORS allowed origins by default to replicate existing behavior * Change variable name to be clearer * Bumped version * Added condition to deal with fieldname 'rtd_location' which can be tried to be queried in some places and doesn't exist in database (#7317) * Added comments to the ByFilter query scope for clarity * Added accessories checkout/checkin API endpoint * Fixed CVE-2019-10742 https://nvd.nist.gov/vuln/detail/CVE-2019-10742 * Update README.md (#7334) Add reference to CSV importer. * Group related variables in .env * History importer fixes * Fixes to history importer	2019-08-14 21:48:14 -07:00
snipe	1608dba7dd	Commenting again?	2019-07-31 14:29:19 -07:00
snipe	c593b3645c	Added comments to the ByFilter query scope for clarity	2019-07-31 14:24:01 -07:00
Ivan Nieto	28ae90fa8a	Added condition to deal with fieldname 'rtd_location' which can be tried to be queried in some places and doesn't exist in database (#7317 )	2019-07-31 13:55:21 -07:00
Ivan Nieto	f407b86aa8	Added condition to deal with fieldname 'rtd_location' which can be tried to be queried in some places and doesn't exist in database (#7318 ) 💥 Nice work, Ivan!	2019-07-31 13:54:55 -07:00
snipe	74e647fea7	Apply fix from PR #7273 to master	2019-07-18 14:37:48 -07:00
snipe	55ee90b25d	Fixes #7252 form request changes (#7272 ) * Fixes for #7252 - custom fields not validating / no validaton messages in API w/form requests * Removed debug info * More fixes for #7252 This is mostly working as intended, if not yet the way Laravel wants us to do it. Right now, the API returns correctly, and the form UI will return highlighted errors, with the input filled in ~sometimes~. I’m not sure why it’s only sometimes yet, but this is potentially progress. * Removed experimental method * Check for digits_between:0,240 for warranty * Removed debug code	2019-07-18 14:32:23 -07:00
Ivan Nieto	af1857b6ee	Fix for the issue when the user tries to query assets due for audit without appropiate configuration [ch9625] (#7273 ) * Added propper routes to the controller * Logic to handle the not setted ->audit_warning_days variable * Change the variable name for more clarity * Got rid of the unnecesary if sentence in sake of brevity * Adding the null coalesce operator so it can properly handle when the setting is null	2019-07-18 14:08:55 -07:00
snipe	cef22c3158	Caps asset warranty to 20 years	2019-07-18 09:49:58 -07:00
snipe	15bfd07f30	Cap warranty months to three characters Filles rollbar 209	2019-07-17 12:13:15 -07:00
Ivan Nieto	d409be6d43	Fix #6910 : Add logic to manipulate the eloquent query. (#7006 ) * Added company_id to consumables_users table * Added logic to manage when a pivot table doesn't have the column company_id trough a join with users * Remove a migration that tries to fix this problem, but is not longer necessary	2019-07-15 13:02:44 -07:00
snipe	a85251aa83	Fixed #7164 - change table name to permission_groups	2019-06-14 10:37:20 -07:00
snipe	30904dd019	Reduce minimum group name length to 2 (from 3) eg: IT	2019-06-12 15:56:19 -07:00
snipe	1d0d25db37	Fixed #7145 - rename groups table to permissions_group for mysql 8 reserved word compatibility	2019-06-12 15:51:47 -07:00
snipe	a014af4c47	Fixed #7083 - Removed user_exists constraint on department save If the user has been deleted, this prevented the department from being successfully saved on edit	2019-05-28 13:18:31 -07:00
snipe	1e6c85da41	Removed custom fields from AssignedSearch to prevent confusing data in selectlist Fixes [ch9193]	2019-05-24 13:50:11 -07:00
snipe	c5a23e8f5e	Fixed bug where sorting by company name in Users API did not work Fixes [ch9200]	2019-05-24 13:37:20 -07:00
snipe	b2eacb147b	Fixed #7046 - added user website url back into UI	2019-05-21 18:55:12 -07:00
snipe	407445456a	Merge branch 'features/6204_email_audit-alerts' into develop # Conflicts: # app/Console/Commands/LdapSync.php # app/Console/Kernel.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/LicensesController.php # composer.json # composer.lock # config/version.php # resources/views/auth/two_factor_enroll.blade.php	2019-05-06 08:45:13 -04:00
snipe	e5c2d77c7d	Fixes #6204 - added email alerts and web/API access to assets due for audits (#6992 ) * Added upcoming audit report TODO: Fid diff/threshold math * Added route to list overdue / upcoming assets via API * Controller/API methods for due/overdue audits We could probably skip this and just handle it via view in the routes… * Added query scopes for due and overdue audits * Added audit due console command to kernel * Added ability to pass audit specs to main API asset search method * Added audit presenter * Added bootstrap-tables presenter formatter to display an audit button * Added gated sidenav items to left nav * Added audit due/overdue blades * Cleanup on audit due/overdue console command * Added language strings for audit views * Fixed :threshold placeholder * Removed unused setting variable * Fixed next audit date math * Added scope for both overdue and upcoming * Derp. Wrong version * Bumped version (I will release this version officially tomorrow)	2019-05-05 22:32:52 -04:00
snipe	a86409868e	Derp. Wrong version	2019-05-05 22:31:43 -04:00
snipe	e4a298ca2a	Added scope for both overdue and upcoming	2019-05-05 22:13:30 -04:00
snipe	7497eaf302	Removed unused setting variable	2019-05-05 19:58:08 -04:00
snipe	0e234bac70	Added query scopes for due and overdue audits	2019-05-05 19:14:02 -04:00
snipe	fe553aec02	Added first-initial dot lastname format for usernames/email Fixed [ch1379]	2019-04-02 18:21:54 -07:00
snipe	bca82684a1	Merge branch 'hotfixes/2fa_qr' into develop # Conflicts: # .all-contributorsrc # Dockerfile # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/ImportController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CategoriesController.php # app/Http/Controllers/CompaniesController.php # app/Http/Controllers/DepartmentsController.php # app/Http/Controllers/ImportsController.php # app/Http/Controllers/LocationsController.php # app/Http/Controllers/ManufacturersController.php # app/Http/Controllers/SuppliersController.php # app/Http/Requests/ItemImportRequest.php # app/Http/Transformers/ActionlogsTransformer.php # composer.json # composer.lock # config/app.php # config/version.php # docker/startup.sh # public/css/build/all.css # public/css/dist/all.css # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/dist/all.js # public/mix-manifest.json	2019-03-20 02:17:02 -07:00
snipe	0e1289f12f	Fixes #6821 - fixed 2 fa active for users list (#6822 ) * Fixed #6821 - confusing UI for 2FA when 2FA is universally enforced I also updated the language in the user’s listing table to clarify what “activated” means * Added login enabled info to user view * Clarified comments * Added info about 2FA on user profile Because why not * Added nowrap to table, and added 2FA reset for superadmins	2019-03-18 11:59:02 -07:00
snipe	26c0cf5d33	Allow null for logCheckin $action_date	2019-03-14 01:22:29 -07:00
snipe	239f21b0d7	Set null option for $action_date	2019-03-14 01:09:16 -07:00
Ivan Nieto	c7f48951a9	Valo/checkin date in history of asset (#6733 ) * To see checkin/checkout Date in History of Asset * Added some logic to get today's date if the checkin_at input is blank * Updating the action_date taking the value from the action_log table * Hide created_at field and rename 'Action Date' as only 'Date'	2019-03-13 21:36:32 -07:00
Martin Meredith	e3e0d57f56	Minor code cleanup bits and bobs (#6805 ) * Add IDE Helper files * Cleanup imports - Alphabetises imports - Removes unused imports * Add Platform requirements * Move filling asset into block where asset exists * Remove duplicate array keys	2019-03-13 20:12:03 -07:00
Martin Meredith	f403db274a	(develop) Fix asset auto-incrementation (#6806 ) * Fix auto-increment not updating This is due to the addition of caching for settings. If we're not explicitly saving the Settings model, then the cache isn't getting updated, causing the asset tag auto-increment to get an old cached version with the wrong number * Move Setting cache clear to an observer	2019-03-13 10:58:35 -07:00
snipe	61afdeac2e	Merge branch 'develop' of https://github.com/VELIKII-DIVAN/snipe-it into VELIKII-DIVAN-develop	2019-03-08 16:18:48 -08:00
snipe	6f1a70ee09	Fixed ch1086 - Merge branch 'fixes/search_consumables_by_item_number' into develop # Conflicts: # app/Http/Controllers/Api/UsersController.php	2019-03-05 23:23:46 -08:00
snipe	58768e5aee	Added ability to search consumables by item number (#6785 ) Fixes ch1086	2019-03-05 23:21:22 -08:00
snipe	3b41aa52c8	Added ability to search consumables by item number Fixes ch1086	2019-03-05 23:20:16 -08:00
snipe	28a450ea25	Added ability to do full name search in user dropdown selectlist (#6784 )	2019-03-05 21:13:39 -08:00
snipe	6696685d0b	Merge branch 'fixes/full_name_search_user_selectlist' into develop # Conflicts: # app/Http/Controllers/Api/UsersController.php # routes/api.php	2019-03-05 20:57:10 -08:00
snipe	f065bd7784	Added ability to do full name search in user dropdown selectlist	2019-03-05 20:40:05 -08:00
Steffen	e1907e30b1	Allow multiple upload fields and add logo option to labels (#6736 ) * Change upload js to work with multiple upload elements on a single page * Change uploadFile in upload modal and form partial * Change uploadFile to js-uploadFile to avoid potential issues in the future * Remove duplicate style attribute causing webpack to fail * Missed a css class in rename to js- prefix * - Move logo uploads to partial for eaiser usage - Add label logo - Add css classes to label elements - Change label prefix text (M: S: ...) to css::before content for easy removal in config * Add more css classes to labels * Allow unescaped " (quot) in css ouput * Add max size param to partial, set defaults for allowedType and size	2019-03-01 15:25:42 -08:00
Dmitrii Minaev	16bb784e78	Codestyle & bug fixes	2019-02-28 01:37:58 +03:00
Dmitrii Minaev	d3c320e56f	Code comments and format	2019-02-23 22:44:03 +03:00
Dmitrii Minaev	5f3a0bdea5	app\Services\PredefinedKitService.php rename to app\Services\PredefinedKitCheckoutService.php add accessories and consumables tables add selectlist api to: app\Http\Controllers\Api\AccessoriesController.php app\Http\Controllers\Api\ConsumablesController.php app\Http\Controllers\Api\LicensesController.php templates for selectlist apply kit to user works	2019-02-19 22:19:00 +03:00
snipe	533649f24e	Merge branch 'develop' into dev-master-integration # Conflicts: # .gitignore # .travis.yml # app/Console/Commands/LdapSync.php # app/Console/Commands/SendExpectedCheckinAlerts.php # app/Console/Commands/SendExpirationAlerts.php # app/Console/Commands/SendInventoryAlerts.php # app/Console/Kernel.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/ManufacturersController.php # app/Http/Controllers/Api/StatuslabelsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetMaintenancesController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/ForgotPasswordController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/Auth/ResetPasswordController.php # app/Http/Controllers/ReportsController.php # app/Http/Controllers/SettingsController.php # app/Http/Controllers/UsersController.php # app/Http/Transformers/AssetMaintenancesTransformer.php # app/Importer/Importer.php # app/Importer/ItemImporter.php # app/Importer/UserImporter.php # app/Importer/import_mappings.md # app/Models/Ldap.php # app/Models/License.php # app/Models/Location.php # app/Models/Recipients/AlertRecipient.php # app/Models/User.php # app/Providers/AppServiceProvider.php # composer.json # composer.lock # config/trustedproxy.php # config/version.php # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/dist/all.js # public/mix-manifest.json # resources/assets/js/components/importer/importer-file.vue # resources/lang/ar/admin/settings/general.php # resources/lang/bg/admin/settings/general.php # resources/lang/en-ID/admin/settings/general.php # resources/lang/en-ID/passwords.php # resources/lang/en/passwords.php # resources/lang/es-CO/passwords.php # resources/lang/es-ES/passwords.php # resources/lang/es-MX/passwords.php # resources/lang/es-VE/passwords.php # resources/lang/fi/admin/settings/general.php # resources/lang/id/admin/settings/general.php # resources/lang/id/passwords.php # resources/lang/ja/passwords.php # resources/lang/nl/passwords.php # resources/lang/pl/admin/settings/general.php # resources/lang/pl/passwords.php # resources/lang/pt-BR/admin/settings/general.php # resources/lang/pt-BR/passwords.php # resources/lang/ru/admin/settings/general.php # resources/lang/ru/admin/statuslabels/table.php # resources/lang/ru/passwords.php # resources/lang/sr-CS/general.php # resources/lang/sr-CS/mail.php # resources/lang/sv-SE/admin/settings/general.php # resources/lang/tr/admin/settings/general.php # resources/lang/tr/passwords.php # resources/lang/vi/admin/models/message.php # resources/lang/vi/admin/users/general.php # resources/lang/zh-CN/admin/settings/general.php # resources/views/importer/import.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/partials/forms/edit/image-upload.blade.php # resources/views/users/edit.blade.php # resources/views/users/view.blade.php # tests/unit/ImporterTest.php	2019-02-13 06:42:52 -08:00
snipe	1e1d32dc85	Make user notes field editable via API	2019-02-13 01:32:00 -08:00
snipe	f88fee0f21	Make user notes field editable via API	2019-02-12 23:58:30 -08:00
snipe	da34b82b3e	Do not count deleted locations in managedLocation check on user delete	2019-02-12 23:33:01 -08:00
snipe	5e19178a30	Do not count deleted locations in managedLocation check on user delete	2019-02-12 23:32:10 -08:00
Steffen	3530603797	Simplify slack channel regexp and allow private (no # prefix) channels and direct messages (@ prefix) (#6699 )	2019-02-08 15:41:54 -08:00
Dmitrii Minaev	e01e0c5596	Add licenses, accessories and consumables table presenters app\Presenters\PredefinedKitPresenter.php resources\views\partials\bootstrap-table.blade.php Add refresh licenses, accessories and consumables tables refresh when add a new element resources\assets\js\snipeit_modals.js Some design fixes resources\views\kits\edit.blade.php Add default value to form (template) resources\views\modals\kit-model.blade.php New routes for kit accessories and kit consumables routes\api.php New routes for kit models, kit accessories and kit consumables routes\web\kits.php New templates	2019-01-27 23:19:24 +03:00
snipe	a371e8d53f	Added calibration as a maintenance type Should just make these custmizable options	2019-01-24 15:17:33 -08:00
snipe	d1fe7abb18	Replaced custom deleted query scopes with onlyTrashed()	2019-01-24 14:47:44 -08:00
snipe	39bca49e8f	Specify table name in deleted user display	2019-01-24 14:38:18 -08:00
snipe	b8269020ae	Specify table name in deleted user display	2019-01-24 14:37:39 -08:00
snipe	ffc51d6db6	Specify table name in deleted user display	2019-01-24 14:33:54 -08:00
Ivan Nieto	3fa5976315	Language of mail doesn't show as intended by the settings. [ch87] (#6619 ) * Fixes #5554. Language of mail doesn't show as intended by the settings.	2019-01-22 14:02:08 -08:00
fanta8897	49073742b5	Updating LDAP such that each user is not required to be bindable to LDAP (#6571 ) * Update Ldap.php * Update Ldap.php * Update Ldap.php * Update Ldap.php * Update Ldap.php Updating LDAP.php such that the admin bind will ONLY occur if the user attempting auth cannot bind. If that is the case, it will attempt to bind as admin and search for that user, prior to failing.	2019-01-15 14:04:21 -08:00
Hubert	8420cb7ec1	Fixed problem with import when using snipeit:import command (#6550 )	2019-01-15 13:58:23 -08:00
Steffen	1de9087427	LDAP fixes (#6533 ) * Add iCheck png files to webpack config (inconsistency for css <> png) and blue.png to public folder * php 7.3 collect() fix (undefined variable) * Fix travis ci * Add iCheck png files to webpack config (inconsistency for css <> png) and blue.png to public folder * php 7.3 collect() fix (undefined variable) * change LDAP implementation from model to (singleton) service * Re-apply check for content in ldap_server variable before parsing * Update LDAP implementation * Switch iCheck to minimal as referenced in js * Don't init on load but on first access via init (returns ldap enabled status) * Re-Enable notifications * Re-add missing test target php versions * Only init() once (singleton class, so ldap variable is already set)	2019-01-10 13:20:43 -08:00
Brady Wetherington	1fdb057199	New LDAP system tries to load LDAP configuration before determining (#6512 ) whether or not LDAP is actually enabled	2018-12-17 14:04:35 -08:00
snipe	6a6923b1d8	Fixed parse_url() expects parameter 1 to be string, null given	2018-12-12 16:37:27 -08:00
Steffen	28edf13457	WIP develop ldap fixes (errors, check if disabled, parsing in one place) (#6500 ) * Fix errors and exception when ldap settings are empty (even with ldap disabled) * Re-add newline at the end of file	2018-12-11 21:01:11 -08:00
snipe	8b8ce256f5	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2018-12-11 13:07:48 -08:00
snipe	8313a069bf	Temp fix for blank LDAP values when LDAP is disabled	2018-12-11 13:07:14 -08:00
Wes Hulette	b38d07064b	Fixed: #5896 Custom fields of type "CUSTOM REGEX" are always saved as "ANY" (#6381 ) * Fixed missing oauth tables during setup. * Custom fields of type "CUSTOM REGEX" are always saved as "ANY" Fixes #5896 * Updated per PR Fixed spelling * Fixed logic error Moved conditional code from view to controller Added getFromatType function for dropdown	2018-12-06 20:05:04 -08:00
snipe	a874cc32a8	Fixed bonked merge conflict	2018-12-06 14:20:01 -08:00
Wes Hulette	34246ee4ef	[WIP] v5 Develop: New LDAP implementation (#6352 ) * Fixed missing oauth tables during setup. * WIP New LDAP implementation * WIP New LDAP implementation * WIP New LDAP implementation Merge remote-tracking branch 'origin/WIP_LDAP' into WIP_LDAP * WIP New LDAP implementation Added Adldap2 to handle ldap intergration. * Updated per PR quality review * Added specific LDAP settings method * Corrected version number * Added return documentation * Added imports * Changed class to be injected into controller * Updated with PR suggestions	2018-12-06 14:05:43 -08:00
snipe	fb502df089	Fixed dumb code indenting	2018-12-05 18:36:39 -08:00
snipe	f6c0e7cc9c	Fixed #6464 - added company name to searchable field in user search	2018-12-05 17:20:22 -08:00
Minaev Dmitriy	79d979f47f	Full kits manipulation without users intagration	2018-11-06 19:27:28 +03:00
snipe	b6daad7573	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2018-11-02 17:15:08 -07:00
snipe	67d2953080	Fixed #6386 - licenses not searching on category name	2018-11-02 17:15:04 -07:00
snipe	192aa9eb71	Fixed #6386 - licenses not searching on category name	2018-11-02 17:14:08 -07:00
Wes Hulette	0d2eef5894	v5 Develop Fixed: Setup error because setting table does not exist (#6390 ) * Fixed missing oauth tables during setup. * Merge remote-tracking branch 'snipe-it-upstream/develop' into develop * Merge remote-tracking branch 'snipe-it-upstream/develop' into develop Merge remote-tracking branch 'origin/develop' into develop * Fixed error during setup when settings table is not present	2018-11-02 12:23:41 -07:00
Wes Hulette	88b1da4260	Added: Caching of settings (#6378 ) * Fixed missing oauth tables during setup. * Cache settings Cache the setting to reduce unnecessary database calls	2018-11-01 19:59:50 -07:00
snipe	65aef11ae3	Fixed #5879 - added user department filter for custom report	2018-10-31 15:19:13 -07:00
Minaev Dmitriy	9d5cd27575	New save mechanic	2018-10-31 16:06:38 +03:00
snipe	f744696043	Fixed #6375 - lowercase keys on findAndBindUser to address LDAP syncing issue	2018-10-30 13:12:10 -07:00
snipe	8579c5a68a	Allow 0 as a consumable min amt	2018-10-15 17:04:51 -07:00
snipe	78b6e84774	Allow min:0 for consumables	2018-10-15 16:52:20 -07:00
Ivan Nieto	5516978f2e	#5696 proposed fix (#6314 ) * Another 'or' caught in a blade template * Added the requireAcceptance() method in LicenseSeat.php. Changed the permission in checkout-license mail to view. * Getting right the permission in the view checkout-license	2018-10-11 14:08:09 -07:00
snipe	c8ad45b11e	Port import manager code to develop	2018-10-03 00:52:29 -07:00
snipe	8937edb97e	Better validation for manager_id	2018-10-03 00:26:51 -07:00
snipe	c8bff3ef38	Features/add manager and dept to importer (#6277 ) * Ignore the simlink for public storage * Added manager and department to user import * More UI importer tweaks * Fisxed typos	2018-10-02 15:43:54 -07:00
Djamon Staal	80393d73ae	Public function save() missing array. (#6276 ) The class was missing as a result that the composer was unable to update and the site returned a 500 error ``` $ composer update Loading composer repositories with package information Installing dependencies (including require-dev) from lock file Nothing to install or update Package guzzle/guzzle is abandoned, you should avoid using it. Use guzzlehttp/guzzle instead. Generating optimized autoload files > Illuminate\Foundation\ComposerScripts::postAutoloadDump > @php artisan package:discover In Asset.php line 30: Declaration of App\Models\Asset::save($params = Array) should be compatible with Illuminate\Database\Eloquent\Model::save(array $options = Array) Script @php artisan package:discover handling the post-autoload-dump event returned with error code 1 ```	2018-10-02 04:40:20 -07:00
snipe	79367642b1	[WIP] Added #5957 - Flysystem support (#6262 ) * Added AWS url to example env * Upgrader - added check for new storage path and attempt to move * Ignore symlink * Updated paths for models * Moved copy methods * Added AWS_URL support For some reasin, Flysystem was generating the wrong AWS url (with a region included) * Switch to Flysystem for image uploads * Nicer display of image preview * Updated image preview on edit blades to use Flysystem * Twiddled some more paths * Working filesystems config * Updated Asset Models and Departments to use Flysystem * Janky workaround for differing S3/local urls/paths * Try to smartly use S3 as public disk if S3 is configured * Use public disk Storage options for public files * Additional transformer edits for Flysystem * Removed debugging * Added missing use Storage directive * Updated seeders to use Flysystem * Default logo * Set a default width We can potentially override this in settings later * Use Flysystem for logo upload * Update downloadFile to use Flysystem * Updated AssetFilesController to use Flysystem * Updated acceptance signatures to use Flysystem * Updated signature view to use Flysystem This isn’t working 100% yet * Use Flysystem facade for displaying asset image * Set assets path Should clean all these up when we’re done here * Added Rackspace support for Flysystem * Added Flysystem migrator console command * Added use Storage directive for categories * Added user avatars to Flysystem * Added profile avatar to Flysystem * Added the option to delete local files with the migrator * Added a check to prevent people from trying to move from local to local * Fixed the selectlists for Flysystem * Fixed the getImageUrl method to reflect Flysystem * Fixed AWS copy process * Fixed models path * More selectlist updates for Flysystem * Updated example .envs with updated env variable names * sigh * Updated non-asset getImageUrl() methods to use Flysystem * Removed S3 hardcoding * Use Flysystem in email headers * Fixed typo * Removed camera support from asset file upload We’ll find a way to add this in later (and add that support to all of the other image uploads as well) * Fixed path for categories * WIP - Switched to standard handleImages for asset upload. This is currently broken as I refact the handleImages method. Because the assets store/create methods use their own Form Request, the handleImages method doesn’t exist in that Form Request so it wil error now. * Fixed css URL error * Updated Debugbar to latest version (#6265) v3.2 adds support for Laravel 5.7 * Fixed: Missing CSS file in basic.blade.php (#6264) * Fixed missing CSS file in basic.blade.php * Added * Changed stylesheet import for authorize.blade.php * Updated composer lock * Added AWS_BUCKET_ROOT as env variable * Use nicer image preview for logo upload * Removed AssetRequest form request * Removed asset form request, moved custom field validation into model * Added additional help text for logo upload * Increased the size of the image resize - should make this a setting tho * Few more formatting tweaks to logo section of branding blade preview * Use Flysystem for asset/license file uploads * Use Flysystem for removing images from models that have been deleted * Enable backups to use Flysystem This only handles part of the problem. This just makes it so we can ship files to S3 if we want, but does not account for how we backup files that are hosted on S3 * Use Flysystem to download license files * Updated audits to use Flysystem	2018-09-29 21:33:52 -07:00
snipe	32951bbc90	Make CustomFieldset rules public instead of protected	2018-09-28 15:18:23 -07:00
snipe	afac0bc441	Removed old isActive model (unused)	2018-09-26 19:05:42 -07:00
snipe	ffbee77f6f	Patch for 5965 - multiple email recipients no longer working (#6238 )	2018-09-26 15:47:53 -07:00
Wes Hulette	16e56646b8	Fixed #5965 : Allow multiple alert email addresses (#6233 ) * Fixed #5965: Allow multiple alert email addresses * Style changes based on PR feedback.	2018-09-26 14:07:41 -07:00
nix	f85e3edfc7	fixed checking permissions for users with no permissions set (#6229 ) When a user has no permissions set (=NULL) in the database (like after an LDAP import) but is a member of a group with permissions, those group permissions would not have be applied, effectively denying every access regardless of group permissions.	2018-09-25 13:24:50 -07:00
Brady Wetherington	c97db3259f	Merge pull request #5913 from tilldeeke/refactore-checkout-checkin-notification-sending Refactor: Decouple checkin/checkout notifications from logging	2018-09-21 18:18:27 -07:00
Juho Taipale	05b03df600	Fix for issue #6165 (#6168 ) * Fix problem when using ValidatingTrait * Checking that email alerts are enabled when trying to send expected check-in alerts (fix for issue #6169)	2018-09-12 22:49:50 -07:00
Till Deeke	007e8fbdf9	simplified checkout event handling per @uberbrady’s suggestion This generalizes the checkout events into the CheckoutableCheckedOut and CheckoutableCheckedIn events.	2018-09-10 16:40:26 +02:00
snipe	05ea61421f	Added manager_id to fillable for locations API	2018-09-07 18:11:38 -07:00
snipe	10d19be66c	Added manager ID to validation	2018-09-07 17:27:31 -07:00
snipe	b903ca05f7	Added manager ID to fillable fields in Location model This should enable the API to update manager ID	2018-09-07 17:27:19 -07:00
snipe	181e75adb4	Apply hotfix for fixed category model scope	2018-09-07 03:56:17 -07:00
snipe	51d3d130e4	Fixed Not unique table/alias: 'models' on custom report triggered when category is selected	2018-09-07 03:19:54 -07:00
snipe	b80b91514d	Fixed Laravel 5.7 compatibility issue re: boot() method This was causing the error: Undefined index: App\Models\CustomField (View: /Users/snipe/Sites/snipe-it/snipe-it/resources/views/hardware/index.blade.php) and pointed to the Eloquent model library method: ``` protected function initializeTraits() { foreach (static::$traitInitializers[static::class] as $method) { $this->{$method}(); } } ``` Thanks to https://github.com/laravel/framework/issues/25455 for the clue.	2018-09-05 19:27:37 -07:00
Dmitriy Minaev	bc8fa31eb2	Add depreciation with half-year convention. Fixed #1237 (#6128 ) * Add half-year convention in depreciation for Models/Depreciable.php * Add a setting for the depreciation method * Integrate half-year convention inside working output * fix: add more checks at Depreciable.php * depreciation value rounding * Codestyle fix	2018-08-28 12:32:46 -07:00
Till Deeke	62195a805a	Adding some comments	2018-08-06 14:47:26 +02:00
Till Deeke	8c96e8fd4b	Updates asset acceptance report to show unaccepted assets	2018-08-06 14:47:26 +02:00
Till Deeke	1bdf71b584	Handle side effects of accepting/declining When declining an asset, it gets checked in.	2018-08-06 14:47:26 +02:00
Till Deeke	8648d53d25	Adds checkout acceptances A checkout acceptance gets generated for every item that needs to be checked out. This resource tracks the user user who can accept the item and their signature	2018-08-06 14:47:26 +02:00
Till Deeke	6b05106dcb	Moves license checkout stuff to the license seat Since we are really checking out a license seat instead of the whole license, we operate the checkin/checkout on the license seat instance.	2018-08-06 14:47:26 +02:00
Till Deeke	43437aac14	Adds acceptable contract to asset	2018-08-06 14:46:10 +02:00
Till Deeke	e0423418d2	Moves logging checkin/checkout to separate listener	2018-08-06 14:46:10 +02:00
Till Deeke	775e46288e	Cleanup of model attributes	2018-08-06 14:46:10 +02:00
Till Deeke	722f032895	Remove notification sending from loggable trait	2018-08-06 14:46:10 +02:00
Till Deeke	ea64abc607	Adds checkout events	2018-08-06 14:46:10 +02:00
snipe	9168979d9e	Fixed #6027 - added model to asset maintenances listing	2018-08-01 18:24:52 -07:00
snipe	2c38036123	Improvement: Better documentation, small refactors (#6017 ) * Better documentation, small refactors * Small comment fixes	2018-08-01 00:06:41 -07:00
snipe	b1b5eeecba	Fixed #6013 - add accessory checkout notes to detail page	2018-07-31 16:00:38 -07:00
snipe	7a9a78ec53	Make Codacy happy by reversing the signature params	2018-07-25 07:14:16 -07:00
snipe	91a9e410df	Fixed weird whereNULL	2018-07-25 06:46:06 -07:00
snipe	b2968ea6c6	Fixed paths to Aurhorizable/Authenticatable contracts	2018-07-24 21:29:08 -07:00
Daniel Meltzer	64d649be7f	Monster: Cleanup/Refactor http controllers. (#5916 ) * Extract a handlesimages trait to centralize logic for parsing/storing images on upload in create/edit methods. * Use same image upload/layout in accessories as consum+components. * Monster: Cleanup/Refactor http controllers. This cleans up docblocks, pulls most non-crudy actions into their own controllers, and does general cleanup/logic refactoring. There /should/ be no functional changes, but we all know how should works.. Extract checkin/checkout functions to a separate controller for accessories. Move controllers to subdirectory. Cleanup AssetModelsController Extract component checkin/checkout Assorted cleanups/doc/formatting in controllers. Refactor LicenseController. Refactor UsersController Update viewassetscontroller. * Codacy cleanups * More codacy cleanups. Extract a LicenseCheckout Form request as well. * A bit more refactor/cleaning of the license checkout method. * Review Related Cleanups * Fix most of the item_not_found translations. In many cases, the string being generated did not even use the id parameter. Where it does, pass it as id instead of as a different value. * Remove some old $data arrays from when we manually sent emails from the controllers. This has been superseeded by the notification system (yay!) * Bugfix: Only log the checkin of an accessory if the checkin completes sucessfully.	2018-07-24 19:35:26 -07:00
Daniel Meltzer	059126f642	Checkout update locationid (#5919 ) * Fix missing punctuation. Bad merge. * If we're checking out to an location, use it's id instead of location_id	2018-07-23 06:47:21 -07:00
Till Deeke	e1c095adca	Removes the typehint for search term string (#5904 ) The „string“ typehint only works in PHP >= 7.0.0. Since we are still supporting versions below that, remove the type hint.	2018-07-20 13:23:44 -07:00
Till Deeke	45a2932f4b	Fixes the generation of where conditions (#5902 )	2018-07-20 13:23:29 -07:00
Till Deeke	b6e3715cd8	Fix: No Notifications for checking out Consumables (#5898 ) * Adds a method to consumables to check if a notification should be sent Adds the checkin_email method to Consumables, this gets checked in notifications when checking out the consumable. Without the method, no notifications get sent for checking out consumables. * Fixes the checkin_email method on the License model This should allow the License to also send checkout/checkin notifications again.	2018-07-20 13:22:49 -07:00
snipe	5a34d43a86	Fixed #5895 - wrong date validation in maintenances	2018-07-19 10:19:55 -07:00
Daniel Meltzer	cf03d25934	Fix importer emailformat (#5871 ) * Fix Importer emailformat Str::slug() strips periods from the string, which caused our existing logic to misbehave when generating a user's email on an import. Adjust logic to use generateEmail() helper on user instead. Also clean up some of the logic in this method. * Remove dead code. * More refactor/cleanup of the user create method. I think it is almost readable now.	2018-07-17 16:46:08 -07:00
Till Deeke	b5de5ac19c	Fix: Searching for multiple terms on assets (#5860 ) * Give advancedTextSearch all search terms at one The additional conditions for assets had some problems, since they were joining tables for the additional attributes. The method was called once for every search term, so the join was added multiple times if the user entered multiple search terms. * Allows search to handle multiple search terms better The search now better handles multiple search terms, adding additional orWhere clauses, instead of duplicating all queries. * Fixing typo	2018-07-16 17:44:31 -07:00
Till Deeke	baa3be728d	Refactoring: A nicer and easier syntax for searching models (#5841 ) * Adds the ability to search by dates Adding extra „where“-conditions to the „TextSearch“ queries, allowing the users to search by dates * Adds missing dates to $dates in models * Removes duplicated „where“ conditions * Adds the Searchable trait to models, defining the searchable attributes and relations * Removes the old text search methods * Adds back additional conditions to the search These conditions could not be modeled in the „attributes“ or „relations“, so we include them here * Removes unnecessary check for the deleted_at attribute * Fixes typo in comments * suppresses errors from Codacy We can safely ignore the error codacy is throwing here, since this method is a standin/noop for models who need to implement more advanced searches	2018-07-16 14:13:07 -07:00
Till Deeke	dbd177576e	Brings back the „pending“ state when checking out (#5837 ) When a user would get an asset checked out for them, and the assets category required acceptance of the asset, the „pending“ state would not get set.	2018-07-16 14:07:24 -07:00
Antti	9dc226e3d6	Feature: PostgreSQL support (#5642 ) * Made migrations work with pgsql and changing empty integers to null * Fixed the last functional test	2018-07-12 18:24:43 -07:00
snipe	339263a295	Fixed #5751 - added option for unique constraint on serial	2018-07-05 19:30:36 -07:00
snipe	9442736518	Adds textarea as a custom field type	2018-06-21 09:35:04 -07:00
Daniel Meltzer	ad21857cae	Update my email address across files. (#5716 )	2018-06-20 01:59:59 -07:00
snipe	15916e6668	Allow checkout to non-user objects even if the object requires checkout	2018-05-21 17:35:04 -07:00
snipe	20a3b556bb	Removed log	2018-05-21 14:33:27 -07:00
snipe	4c656c0321	De-normalize new counters from 4.3.0 (#5547 ) * Added de-norm counter migration for assets * Renaming counter columns, since Eloquent has a magical _count helper Added artisan command to sync counters (one-off) * Update API to use de-normed fields * Increment counters for checkin;/checkout * Derp. * Added request increment/decrementer * Move increment for checkout to the Asset::checkout method * Added “could take a while” message	2018-05-16 19:20:43 -07:00
snipe	aab190423f	Partial fix for license+category tests	2018-05-16 18:35:11 -07:00
snipe	0476ffecdb	Removed debugging comments	2018-05-08 03:46:48 -07:00
snipe	04709dc1df	Fixed #5477 - added GDPR privacy policy link in email and webpage	2018-05-08 00:50:13 -07:00
snipe	f48171dcab	Add category to licenses	2018-05-08 00:14:38 -07:00
snipe	7b8362b64c	Added license categories	2018-05-04 21:01:38 -07:00
snipe	3a1b432234	Fixed #5472 - show_in_email for custom fields missing in edit field UI	2018-05-03 08:06:28 -07:00
snipe	276d2bc866	Fixed advanced search on model number (RB:347)	2018-05-03 05:43:25 -07:00
snipe	0be69f57ac	Improved files display	2018-05-02 14:13:06 -07:00
snipe	6df7f6d6ec	Fixes wrong users index route name	2018-04-26 16:31:02 -07:00
snipe	5365182c86	Fixed advanced search on supplier, count for PHP7.2	2018-04-25 20:25:03 -07:00
Hannah Tinkler	c4c520c1a3	Fixes #4445 : prevents assigned assets from being checked out in bulk checkout (#5421 ) * Fixes #4445: prevents assigned assets from being checked out in bulk checkout * Updates data attribute to more versatile 'data-asset-status-type' * Fixes broken unit test	2018-04-25 02:39:23 -07:00
snipe	1ef4cc9fc2	Fixed #4301 - added image upload to audit	2018-04-24 02:54:54 -07:00
Hannah Tinkler	8d501e1c24	Feature/custom fields default values (#5389 ) * Fixes CustomFieldsetsController::fields() which I think is not used anywhere else and don't think ever worked as you can't call get() on a Collection. Have tested extensively and doesn't seem to affect anywhere else? * Adds default value functionality * Adds built assets * Fixes assignment to asset_model_id which should have been evaluation and alters route so it sits more in line with existing work * Updates built assets * Remove silly docker.env file; fix Dockerfile to preserve Oauth keys (#5377) * Added department to custom asset export Updates build assets * Adds translation support for 'add default values' checkbox label	2018-04-23 21:16:55 -07:00
Stephen	c23955d0b5	Allow setting of "ldap_import" through the API (#5218 ) * Allow setting of "ldap_import" through the API, this will allow cusom scripts to be made to import data from Active directory using the API, this would allow any field to be filled such as the manager (based on the ID), department etc. * Password fix for LDAP through API	2018-04-20 14:02:52 -07:00
snipe	bbc0695a8f	Added count of checkins, checkouts, requests (#5314 ) * Added count of checkins, checkouts, requests * Removed old commented items * Use actionlog instead of redefining the relationship	2018-04-06 16:23:39 -07:00
snipe	8a6713d5c0	WIP - Improved requested assets (#5289 ) * WIP - beginning of improved requested assets - Use Ajax tables for faster loading - Use new notifications for requesting an asset TODO: - Use ajax tables for requestable asset models - Use new notifications for canceling an asset request - Expire requests once the asset has been checked out to the requesting user * Only show asset name in email if it has one * Refactor requested method to only include non-canceled requests * Refactored requestable assets to log request and cancelation * Added softdeletes on checkout requests * Differentiate between canceling and deleting requests * Added asset request cancelation notification * Added timestamps and corrected unique key on requests table * Improved requests view * Re-use blade for cancel/request email * Refactored BS table formatter for requested assets * Location name min reduced to 2 * Added PAT test as maintenance option This needs to be refactored into database-driven options with a UI * Better slack message * Added getImageUrl method for assets * Include qty in request notifications TODO: - Try to pull requested info from original request for cancelation, otherwise it will default to 1 * Removed old asset request/cancel emails * Added user profile asset request routes * Added profile controller requested assets method * Added blade link to requested assets for profile view * Sort user history desc * Added requested assets blade * Added canceled at to checkoutRequest method * Include qty in request * Fixed comment, removed allowed_columns * Removed Queable methods, since we don’t use a queue * Fixed return type in method doc * Fixed version number * Changed id to user_id for clarity	2018-04-04 17:33:02 -07:00
Daniel Meltzer	787f2390fb	Add location_id to fillable (#5286 ) Should fix #5268	2018-03-29 05:11:07 -07:00
snipe	a510ac4052	Fixed #5272 - make city min length 2 instead of 3	2018-03-29 04:36:18 -07:00
snipe	9f414baa99	Remove notifiable from asset	2018-03-28 19:08:08 -07:00
snipe	dfe8aac10b	Fixed checkout to checkin in loggable checkin trait	2018-03-28 19:01:10 -07:00
snipe	983786c29f	Fixed component checkout bug	2018-03-28 18:53:18 -07:00
snipe	46f5f21368	Notification improvements (#5254 ) * Added “show fields in email” to custom fields * Added “show images in email” to settings * Added nicer HTML emails * Break notifications out into their own, instead of trying to mash them all together * Remove old notification for accessory checkout * Janky fix for #5076 - “The asset you have attempted to accept was not checked out to you” * Add method for image url for accessories * Added accessory checkout email blade * Make accessory email notification on checkout screen consistent with assets * Added native consumables notifications * Fixes for asset notification * Updated notification blades with correct-er fields * Updated notifications * License checkin notification - does not work yet Need to figure out whether the license seat is assigned to a person or an asset before we can pass the target * Added alternate “cc” email for admins * Only try to trigger notifications if the target is a user * Fix tests * Fixed consumable URL * Removed unused notification * Pass target type in params * Show slack status * Pass additional parameters There is a logic bug in this :( Will send to slack twice, since the admin CC and the user are both using the same notification. Fuckity fuck fuck fuck. * Pass a variable to the notification to supress the duplicate slack message * Slack is broken :( Trying to fix Will try a git bisect * Put preview back into checkout * Pulled old archaic mail * Removed debugging * Fixed wrong email title * Fixed slack endpoint not firing * Poobot, we hardly knew ye. * Removed old, manual mail from API * Typo :-/ * Code cleanup * Use defined formatted date in JSON * Use static properties for checkin/checkout notifiers for cleaner code * Removed debugging * Use date formatter * Fixed target_type * Fixed language in consumable email	2018-03-25 13:46:57 -07:00
snipe	d0f14d7a3c	Fixed #5186 - email being sent to admin as well as user on checkout This should be introduced as a setting, but not arbitrarily send	2018-03-22 20:30:45 -07:00
snipe	8557cb5305	Added - make accessory manufacturer field searchable	2018-03-22 09:43:53 -07:00
David Kaatz	53735f2026	Authentication via REMOTE_USER (clean repull) (#5204 ) - Implementation in Login - Configuration - Database migration	2018-03-14 12:48:07 -07:00
snipe	d05dfb18a7	Fixed #5150 - added lastname first initial as username format	2018-03-05 21:39:05 -08:00
snipe	052132ec37	Remove pyrchase cost from accessory search	2018-03-05 20:57:50 -08:00
snipe	2df19bcbb4	Only pull category matches for accessory category	2018-03-05 20:22:44 -08:00
snipe	36cd63836e	Fixed #5151 - added asset tag to maintenances	2018-03-05 16:26:40 -08:00
snipe	9effa3d2ab	Fixed manufacturer restore	2018-03-03 19:14:27 -08:00
snipe	f7784b6543	Fixed #2402 - add ability to restore manufacturers	2018-03-03 18:46:19 -08:00
fordster78	4e0c8e218d	New Test Notification (#5137 ) Created Test Notification. Updated Vendor Mail message.blade files. Updated api settings controller to use Notification Façade.	2018-03-02 18:01:20 -08:00
Daniel Meltzer	9ee2c6be57	Api tests2 (#5098 ) * Cleanup * API tests for asset models and related cleanup/improvements * Api license test. Tests incomplete because create/update/destroy are not implemented yet in the controller * API Category tests. * Manufacturers API Test. * Implement License Create/Update/Delete Methods for API and enable test. * Add missing gate for api. Fixes only superadmins being able to generate Personal Access Toekns	2018-02-25 12:10:02 -08:00
Daniel Meltzer	7de8f71f58	Api tests (#5096 ) * Use the formated date helper to clean up verifications. * Add Checkin/Checkout api tests. * Accessories api test * Add Companies API Test. * Return ModelNotFound as a 404. * Cleanups/simplficiations/updates. * Locations api test. * currency and image should be fillable on location. * Update components api test. * Use findOrFail so we return a 404 instead of a 200. Matches other item types. * order_number should be fillable in component. * Add updated_at and permissions to information returned from api for a user. * Add users test and flesh out factory and fillable fields. * Add test for assets method * API status label test. * Disable php7.2 for now on travis until the count(null) issues are remedied * Add serial to update. * API model not found should return a 200	2018-02-24 19:01:34 -08:00
Daniel Meltzer	f7dbda4ed3	Disable broken tests (#5073 ) * Work towards a functional travis. Step 1: Disable broken unit tests. * Fix functional tests This updates the login information and model factories to work with changes to source. * Importer name/full name fixes. Fix a bug where "name" was used ambigously and mapping "item name" to "name" would confuse the importer into thinking it should also be a user name. Now we default to "full name" for the users name, and "item name" for the item name. These are still both configurable through the custom mapping. Also update sample csvs and remove an outdated sample. * Max length of supplier notes is 191, not 255, as per default laravel string length. Might make sense to change this to a text field in the future to match other places. * Use sqlite/different db setup for unit tests. * Fix assets api test. * Fix Components API test. * increase travis memory limit for functional tests. * Use travis config for api tests as well. * Fix memory limit file. * Disable ApiComponentsAssetsCest until it's fixed.	2018-02-22 21:46:58 -08:00
snipe	e49a36c9fd	Fixed #5084 - min supplier name now 1	2018-02-22 16:37:05 -08:00
snipe	cbd8409611	Fixed #5067 - account for only one name in generateFormattedNameFromFullName	2018-02-22 14:10:58 -08:00
snipe	ca50ea190f	Applied master changes to develop Wrong branch :(	2018-02-21 15:51:04 -08:00
snipe	698ea36cc2	Added - Order location by manager	2018-02-21 05:09:40 -08:00
snipe	0cf9cdd3b1	Make department columns sortable	2018-02-21 05:04:20 -08:00
snipe	1e8c32fbdb	Fixed - missing table prefix for location parent search	2018-02-21 04:33:47 -08:00
snipe	62edf14893	Refactored method to generate usernames from full names	2018-02-13 20:31:11 -08:00
snipe	facf1d42f7	Sigh.	2018-01-25 11:06:37 -08:00
snipe	4be8ae7f3d	Fuckery.	2018-01-25 03:34:52 -08:00
snipe	1d04897b32	Order by default location	2018-01-24 14:27:12 -08:00
snipe	60c38a0c47	Added setting to choose what appears in model select list - Fixes #4879	2018-01-24 10:43:46 -08:00
snipe	543ea28b72	Added qty to asset components - fixed #4876	2018-01-24 05:25:01 -08:00
Tim Bishop	b346556caa	Allow manager_id to be fillable. (#4882 ) The API UsersController accepts manager_id, but calls the following: $user->fill($request->all()); This results in manager_id being ignored. I can't see any problem with allowing a user's manager to be modified using the API, so this change allows it.	2018-01-22 13:12:02 -08:00
snipe	a9441521a4	Small refactor for Setting method	2018-01-20 08:52:50 -08:00
snipe	86c0194e9a	Fixed #4628 and #4590 - Illegal mix of collations for operation error when searching on some languages	2018-01-20 03:08:27 -08:00

... 8 9 10 11 12 ...

1316 commits