DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
12398 commits 97 branches 266 tags 291 MiB
Commit graph

622 commits

Author SHA1 Message Date
Marcus Moore 3a9670930d
Define required fields in Custom Field seeder so sqlite can be seeded 2023-05-18 13:17:35 -07:00
snipe d648e9a01c Added Google test user 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 09:13:34 -07:00
snipe 3fb5188037 Removed redirect option 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:54:46 -07:00
snipe 72d1c08fbc Added migration 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:21:17 -07:00
snipe f84f4ffe99 Migration to embiggen state fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-08 14:13:06 -07:00
snipe d70e14de61
Merge pull request #12972 from marcusmoore/bug/sc-23177 
Fixes user name missing in accessory acceptance notifications
 2023-05-08 13:04:37 -07:00
Marcus Moore f96d8fe674
Add CheckoutAcceptance factory 2023-05-03 14:21:13 -07:00
snipe b716f9f55e
Merge pull request #12916 from snipe/features/auto_add_to_fieldset 
Added ability to auto-add fields to new fieldsets
 2023-05-03 11:04:33 -07:00
snipe 54a766c4f9 Added dynamic warranty URL to manufacturers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 16:39:15 -07:00
snipe 970b5e556c
Merge pull request #12903 from marcusmoore/bug/sc-15034 
Fixes sending webhook notifications for checkout and checkin
 2023-04-25 22:22:58 -07:00
snipe d6ea5de5b8 Merge remote-tracking branch 'origin/develop' into features/auto_add_to_fieldset 2023-04-25 22:20:50 -07:00
snipe 6cd3cfe1ea Added new field to factory 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 20:57:03 -07:00
snipe 07336bbc6a Added auto_add_to_fieldsets field 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 15:51:36 -07:00
Godfrey M cb68f41d9c added ldap_location to settings 2023-04-25 11:44:04 -07:00
Marcus Moore 645f6ed692
Remove unneeded doc block 2023-04-19 17:52:44 -07:00
Marcus Moore 2d56675ade
Merge branch 'develop' into bug/sc-15034 
# Conflicts:
#	database/factories/SettingFactory.php
 2023-04-17 17:22:55 -07:00
snipe 955539807c
Merge pull request #12830 from snipe/features/adds_supplier_id_to_components 
Added supplier to components and consumables
 2023-04-15 18:42:23 -07:00
snipe 8c09226b76
Merge pull request #12834 from marcusmoore/mxm/improve-test-setup 
Introduced improved way to interact with settings in tests
 2023-04-15 18:37:34 -07:00
snipe 8ae14c43f3 This is a temp fix for the seeders 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-15 18:27:53 -07:00
snipe e7c6771e73 Added supplier to components and consumables factories for seeding 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:07:22 -07:00
snipe 45142c6888 Migration to add supplier ID to components and consumables 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:06:49 -07:00
Marcus Moore f767cc082f
Introduce improved way to interact with settings in tests 2023-04-06 17:27:18 -07:00
Marcus Moore aefc53cfcf
Explicitly disable webhook settings in tests 2023-03-30 16:40:21 -07:00
Marcus Moore 362d5b9fd4
Merge branch 'develop' into bug/sc-15034 2023-03-27 11:46:30 -07:00
Marcus Moore 317335e79f
Allow the migration of sqlite databases 2023-03-23 17:40:03 -07:00
Marcus Moore fa69a580ab
Start to scaffold license checkout notification test 2023-03-23 17:18:33 -07:00
Marcus Moore 66224765ea
Use factory state for webhook settings 2023-03-22 12:31:47 -07:00
snipe 4efac7827b Trying other save method, I guess? 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 22:10:30 -07:00
snipe 76425ca2a5 Fixes back-in-time Slack v slack migration 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 21:59:17 -07:00
Marcus Moore 751abe1438
Re-add asset factory states 2023-03-21 09:54:55 -07:00
Marcus Moore 272cc1adac
Skip creating user when creating a setting since it isn't needed 2023-03-20 15:33:40 -07:00
Marcus Moore a0e547c7fb
Remove some unused imports 2023-03-20 14:18:59 -07:00
Marcus Moore 44a91f0a2b
Seed license checkouts 2023-03-20 14:18:54 -07:00
Marcus Moore 92e0c59f89
Fix typo in Keyboard accessory name 2023-03-20 12:01:39 -07:00
Marcus Moore 1bad8e1fc2
Remove outdated comments 2023-03-20 11:42:15 -07:00
Marcus Moore 1fd574779b
Remove unneeded or outdated comments and update imports 2023-03-20 11:39:27 -07:00
Marcus Moore a37d69fcf1
Replace remaining user_ids in factories 2023-03-20 11:19:34 -07:00
Marcus Moore 3849bb838d
Make a few more factories a bit more pure 2023-03-16 18:29:51 -07:00
Marcus Moore 605f214597
Add properties necessary for factories to be called in isolation 2023-03-16 17:08:18 -07:00
Marcus Moore d9c1a548f1
Update deprecated faker calls 2023-03-16 17:07:46 -07:00
Marcus Moore 582c3b987b
Update some faker calls 2023-03-16 16:38:21 -07:00
Marcus Moore f47a28f790
Actually remove unused methods 2023-03-16 15:40:16 -07:00
Marcus Moore ca677038b0
Remove unused methods 2023-03-16 15:39:02 -07:00
Marcus Moore a50ddb4a5d
Improve actionlog factory and seeder 2023-03-16 15:25:23 -07:00
Marcus Moore daf6e9fa4b
Seed assets with randomized locations 2023-03-16 14:23:40 -07:00
Marcus Moore 31630e3677
Seed licenses with categories 2023-03-16 13:47:02 -07:00
Marcus Moore 2f0f9586b1
Remove default category relationship from license factory 2023-03-16 13:46:30 -07:00
Marcus Moore a98cc01766
Seed users with departments 2023-03-16 13:25:35 -07:00
Marcus Moore 345946d6d4
Remove default department relationship from user factory 2023-03-16 13:25:02 -07:00
Marcus Moore 76861c0c30
Remove hard-coded manager_id in factory 2023-03-16 12:46:47 -07:00
Marcus Moore 7062b0acaa
Remove hard-coded supplier_id in factories 2023-03-16 12:41:34 -07:00
Marcus Moore 0ec885bf18
Remove hard-coded fieldset_id in factories 2023-03-15 18:49:21 -07:00
Marcus Moore dfd6cf0d29
Improve factories for location relationships 2023-03-15 18:31:08 -07:00
Marcus Moore b944945377
Remove hard-coded company_id in factories and update seeders 2023-03-15 14:12:34 -07:00
Marcus Moore fb789eb048
Remove hard-coded depreciation_id in factories 2023-03-14 17:51:20 -07:00
Marcus Moore f7577bff52
Merge branch 'develop' into fixes/purify-factories 2023-03-14 17:09:30 -07:00
snipe c12d261fc8
Merge pull request #12673 from marcusmoore/fixes/fix-component-factory 
Fixed Component factory
 2023-03-14 17:05:38 -07:00
Marcus Moore 9cd8460e1e
Add proper date format to purchase date in the component factory 2023-03-14 17:02:45 -07:00
Marcus Moore 72a61783a3
Inline two relationships in asset maintenance factory 2023-03-14 14:59:34 -07:00
Marcus Moore 1ff094dd47
Remove hard-coded model_id in asset factory 2023-03-14 13:56:25 -07:00
Marcus Moore ef8007a890
Remove hard-coded status_id in asset factory 2023-03-14 13:24:50 -07:00
Marcus Moore a2efe3fa67
Remove hard-coded category_id in factories 2023-03-14 12:50:02 -07:00
Marcus Moore 4c4101fe64
Fix key name 2023-03-14 12:04:31 -07:00
Marcus Moore 7cf424b914
Remove hard-coded manufacturer_id in factories 2023-03-14 12:01:23 -07:00
Marcus Moore e8ff7cc09c
Remove hard-coded user_id in factories 2023-03-14 11:34:58 -07:00
Ivan Nieto Vivanco 66bb897ac4 Fix format to purchase date 2023-03-14 02:55:20 -06:00
Marcus Moore adba450b40
Remove some hard-coded ids in factories 2023-03-13 17:27:06 -07:00
snipe 1b9c3c93ad Removed loading and reduced chunking to 10 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-13 17:12:51 -07:00
Marcus Moore 099ec3f550
Remove creation of category within category factory state 2023-03-13 16:45:43 -07:00
Godfrey M 7612c5d852 lowercases variables 2023-03-13 15:26:51 -07:00
Godfrey M 27a2ed5c79 Merge branch 'develop' into generalize_webhooks 2023-03-13 10:41:08 -07:00
Godfrey M 15c19a7ab7 silenced Discord option and validation, more translations 2023-03-08 10:35:45 -08:00
Godfrey M 35dd0d8def adds generalized webhooks, updates settings page, translations, validation 2023-03-07 15:48:21 -08:00
Marcus Moore d27fe7d4b9
Merge branch 'develop' into fix/test-suite 2023-03-06 17:04:00 -08:00
Marcus Moore ef27c35d1d
Update array keys to set asset location properly 2023-03-06 16:33:40 -08:00
Marcus Moore ad9eef6393
Update deprecated faker calls in Asset and Supplier factories 2023-03-02 13:41:52 -08:00
Marcus Moore c3cc20fe0c
Merge branch 'develop' into fix/test-suite 2023-03-02 13:23:00 -08:00
Godfrey M 354f04534e add multi array, migration, still having issues 2023-03-01 12:30:32 -08:00
snipe 1f7ae08d76
Merge branch 'develop' into features/make_eol_sortable 2023-02-28 18:05:09 -08:00
Marcus Moore a7a26bb154
Fix License Factory 2023-02-28 15:55:28 -08:00
Marcus Moore 4197e613b2
Fix License Factory 2023-02-28 14:50:48 -08:00
Marcus Moore 589a5d0d8b
Merge branch 'develop' into fix/test-suite 2023-02-28 09:48:48 -08:00
Marcus Moore bdac0f16ce
Set purchase date field to the correct format in asset factory 2023-02-23 13:39:05 -08:00
snipe 8e72da42e8
Merge pull request #12406 from akemidx/vip_tag 
Added a checkbox to notate VIP status
 2023-02-23 12:23:29 -08:00
snipe eb6357636a
Merge pull request #12467 from marcusmoore/fix/scope-people-with-full-multiple-companies 
Fix full company scoping in user selects
 2023-02-23 10:36:33 -08:00
snipe 4bf1566d2a
Merge pull request #12124 from Godmartinz/feature/sc-16946/add-checkbox-to-allow-skipping-a-user-during 
Adds Boolean to Users Table for Auto Assigning Licenses
 2023-02-21 20:10:46 -08:00
snipe 0c3115553e
Merge branch 'develop' into vip_tag 2023-02-21 20:03:49 -08:00
Ivan Nieto Vivanco 99122ccb50 Add migration to fix already escaped formats in the database 2023-02-12 17:40:04 -06:00
Marcus Moore 3fdf4dea1b
Use factories for relationships in asset factory 2023-02-07 16:17:05 -08:00
Marcus Moore 89eff23e44
Continue implementing tests 2023-02-02 17:41:32 -08:00
snipe 2a8851bbd7
Merge pull request #12342 from marcusmoore/fix/dusk-test-suite 
Fixed Dusk Test Suite
 2023-02-02 09:50:34 -08:00
akemidx b363524305 vipuser label updated to vip 2023-01-25 15:58:44 -05:00
akemidx 19cf170dd9 Add VIP Checkbox 2023-01-24 15:30:21 -05:00
cram42 c2c009a018
Merge branch 'develop' into develop 2023-01-24 09:53:42 +08:00
Marcus Moore cd582be851
Drop tables that may exist in down methods 2023-01-23 15:42:45 -08:00
Marcus Moore 760844de6f
Add conditionals 2023-01-23 15:42:33 -08:00
Marcus Moore e6dc61d2cf
Revert column names to legacy versions in down method 2023-01-23 15:42:05 -08:00
snipe 2f7ca37666 Migration to normalize eol date for assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-22 00:54:24 -08:00
snipe 45019c65f1 BYOD migration 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:10:39 -08:00
Godfrey M 7ce230fadc missed a few renames 2023-01-18 08:57:59 -08:00
Godfrey M 6fbb484dfd renames db column for auto_assign boolean, rewords trans string, default value of 1 now 2023-01-18 08:43:03 -08:00
Marcus Moore b5ea8b8a4f
Conditionally drop table 2023-01-10 17:29:38 -08:00
Marcus Moore aec64fa64a
Comment out migration's down method to match its up method 2023-01-10 17:25:25 -08:00
Marcus Moore 03938d0f32
Conditionally drop table 2023-01-10 17:24:38 -08:00
Marcus Moore 296c9a723d
Reverse column rename in migration's down method 2023-01-10 17:22:29 -08:00
Marcus Moore c5b09ed955
Fix column name typo 2023-01-10 17:21:46 -08:00
Marcus Moore 4ee3cbf60e
Comment out migration's down method to match its up method 2023-01-10 17:20:20 -08:00
Marcus Moore 39ab545cf5
Update alter statement to use correct suffix for column 
This is brittle...
 2023-01-10 17:08:28 -08:00
Marcus Moore e5cb68cc5e
Move drop column command to correct migration 2023-01-10 17:06:16 -08:00
Marcus Moore b8b2543b0d
Reference the correct table in migration down method 2023-01-10 17:04:21 -08:00
snipe 685cc86d71 Sets the ldap_default_group field to nullable and default null 
Signed-off-by: snipe <snipe@snipe.net>
 2022-12-20 17:24:01 -08:00
snipe 227fef76ee
Merge pull request #11736 from Godmartinz/gh6508_ldap_default_group 
Adds a permission group selection for directory sync
 2022-12-15 11:06:53 -08:00
Godfrey M 2e228ccb0b redid a few things. should be good now :) 2022-12-15 10:45:42 -08:00
Godfrey M 45636b8114 adds should_autoassign boolean to users table 2022-11-15 15:42:57 -08:00
snipe f91e1d58ad Migration to add the field to the custom_fields table 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-08 15:27:34 +00:00
Cram42 3d470d6f2f Drop asset tag from default field def. 2022-11-02 22:39:08 +08:00
Cram42 6b2fe582ca Merge branch 'feature-label2' into develop 2022-11-01 20:12:28 +08:00
Cram42 6de48b4dc8 Implement settings for labels 2022-11-01 20:00:53 +08:00
Brady Wetherington cd385e0865 Set scim_externalid to nullable, default null 2022-10-25 14:38:19 -07:00
Brady Wetherington 1e3281c76c Add externalId support to SCIM integration 2022-10-25 14:19:01 -07:00
Godfrey M f9ac447dd1 adds default group to LDAP 2022-10-18 15:18:09 -07:00
snipe 7353ecd388 Added start_date and end_date migration to users table 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 16:55:59 -07:00
snipe 70c766e8b3 Added setting to choose dashboard type 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-29 04:16:46 -07:00
Godfrey M 193b31e427 select options working, testing sync then done 2022-08-31 12:58:33 -07:00
Godfrey M 0c362e8b57 gets the groups selector to appear but options are blank 2022-08-29 12:09:56 -07:00
Godfrey M fc6fefdb4e adds migration, variables, checkbox,working on groups 2022-08-25 15:19:38 -07:00
snipe f9956cc5df Added DB migration 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 14:54:33 -07:00
snipe e833052e8e Check for column 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-08 16:46:00 -07:00
Brady Wetherington 61813a6f2c This adds some indexes for performance on license_seats 2022-07-06 18:10:48 -07:00
Brady Wetherington f515bd2dc8 Add index across username and deleted_at to improve large directory sync performance 2022-06-28 17:12:14 -07:00
snipe ef86c0273a Added migration to store admin ID 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 17:17:38 -07:00
snipe bcd0671213 Migration to drop stored_eula_column 
It’s extraneous, since we already have a file field in the action_logs, and we already store the stored_eula_file in checkout_acceptances.

Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
Brady Wetherington 5357b1fa10
Remove extraneous { in migration 
It looks like we inadvertently got an extra `{` in here - I noticed it because my IDE threw a big red dot on this migration. We must've accidentally put that in when we were adding the 'id' column.
 2022-05-09 11:56:05 -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
Brady Wetherington 6b0a1ab3fb Backport the license index fix from Develop onto the v5 branch 2022-04-12 20:11:25 +01:00
snipe 4b255ada70 Removed first() 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-06 12:08:51 +01:00
snipe 3dd7c00a0b Update migration back in time 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-05 20:31:17 +01:00
snipe c12ef19fcc Fixed #10892 - MySQL 8 compatibilty requires primary key 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-05 18:58:14 +01:00
snipe a937bd34f6 Merge master back down into develop 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-29 16:28:43 +01:00
snipe 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
Godfrey Martinez fe6a6740db
Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf 2022-03-22 10:10:56 -07:00
Godfrey M 4956eb0410 WIP: needs to be tested. adds ldap_manager field to ldap sync 2022-03-21 11:15:39 -07:00
snipe 9db8bd782d Merging master down into develop 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-16 18:02:07 +00:00
Godfrey M b2f7262cd2 adds table structure for asset history 2022-03-14 19:38:36 -07:00
Godfrey M e1a6a2afc6 adds translation for accept_eula, a bit more logic on the Acceptance Controller that is not working yet 2022-03-10 12:15:50 -08:00
snipe 86a2312a31 Check if table exists before trying to create 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-07 20:13:10 -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 9adcf58ae5 Added notes migration 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 20:30:58 -08:00