DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 01:54:09 -08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity
15555 commits 96 branches 267 tags 295 MiB
Commit graph

240 commits

Author SHA1 Message Date
Spencer Long b4b4927370
Merge branch 'develop' into bug/sc-24884 2024-03-20 12:36:39 -05:00
spencerrlongg 86ab880c90 buncha progress 2024-03-19 15:34:59 -05:00
snipe a4941031cb
Merge pull request #14260 from marcusmoore/chore/sc-24808 
Added tests around asset check in and added missing actions to the api controller action
 2024-02-28 13:34:12 +00:00
Marcus Moore 87ba2cb407
Generate unique names for departments 2024-02-27 12:47:56 -08:00
Marcus Moore aa2632fe46
Merge branch 'develop' into chore/sc-24808 2024-02-21 12:33:06 -08:00
Marcus Moore 9ab56fe9ca
Implement tests 2024-02-13 17:04:53 -08:00
Marcus Moore 31a75bd252
Add some assertions 2024-02-13 13:17:02 -08:00
Marcus Moore 307b39bd38
Implement tests around asset check in 2024-02-13 12:03:27 -08:00
Marcus Moore adfb8895df
Improve factory state name 2024-02-12 16:31:32 -08:00
Marcus Moore c8e12ddb5c
Remove bug in factory state 2024-02-12 16:30:09 -08:00
Marcus Moore 728aaaab20
Ensure accessory check in emails are not sent when the setting is disabled 2024-02-12 16:22:59 -08:00
Marcus Moore 095a7d9b34
Scaffold tests around accessory check in 2024-02-12 12:54:48 -08:00
Marcus Moore 2e0e39ccc8
Ensure notification is sent when consumable is checked out via api 2024-01-30 13:19:20 -08:00
Marcus Moore 13c37e708f
Implement tests around consumable checkout 2024-01-30 12:43:20 -08:00
Marcus Moore 987676df08
Implement additional tests 2024-01-29 15:56:18 -08:00
Marcus Moore f16f62f76c
Scaffold and implement some tests around accessory checkout 2024-01-29 14:21:30 -08:00
Spencer Long 8546407083
Merge branch 'develop' into refactor/store_asset_form_request 2024-01-02 18:05:15 -06:00
snipe 8bc5f08da5 Fixed a few more small localization issues 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 20:14:49 +00:00
snipe 02d35449d2 Updated seeder with en to en-US 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 19:41:48 +00:00
snipe 4f56c2e9d6 Added radio to seeder for custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-13 14:03:13 +00:00
snipe 7b85a30b64 Fixed checkbox seeder 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-13 13:16:45 +00:00
spencerrlongg cba5f869c0 standardize some of the validation rules, fix int/string issue 2023-11-28 21:19:19 -06:00
snipe a2ba39c837 Removed required custom field from seeder 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 17:57:05 +01:00
snipe 9d887484c8 Added encrypted custom field to seeder 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 07:41:25 +01:00
snipe c3b3aa4de6 Set one field to encrypted in the seeder 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 06:25:51 +01:00
snipe 3717d60170 Added two more custom fields/fieldsets to seeder 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 05:04:30 +01:00
snipe 436192b836 Fixed seeder 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 02:56:34 +01:00
snipe 60e0e899bc Added show_in_requestable_list to factory 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 02:35:33 +01:00
snipe 129e9b90dc
Merge pull request #13585 from spencerrlongg/eol_2 
Standardize Asset EOL Date
 2023-10-02 16:09:22 +01:00
Marcus Moore 90e75a3e2c Add unique() to some factory properties 2023-09-19 17:02:18 -07:00
spencerrlongg 30dade1fba cleanup 2023-09-11 17:35:12 -05:00
spencerrlongg b73f20cadf immutable when things are looping, just in case 2023-09-11 17:22:46 -05:00
slong753 27bea2abb9 just some more wip on the importer 2023-09-11 17:21:51 -05:00
slong753 1b18cd7fe6 added asset_eol_date and explicit to factory 2023-09-11 17:21:51 -05:00
Marcus Moore 5b86c02366
Set permissions to empty object in user factory 2023-08-10 16:55:44 -07:00
Marcus Moore 41479b1ec7
Allow permissions in the user factory to be chained 2023-08-10 16:35:10 -07:00
Marcus Moore 1405e17251
Add simple test around custom asset report response 2023-08-08 17:10:36 -07:00
Marcus Moore 346ace9444
Allow users that have permission to edit their own location to see locations in select list 2023-07-13 17:37:46 -07:00
Marcus Moore ab5fed09db
Remove scopeCompanyables call from AssetsController@requestable 2023-06-22 12:36:43 -07:00
Marcus Moore 27d4d107bb
Scaffold test before removing scopeCompanyables call from DepartmentsController 2023-06-07 16:10:29 -07:00
Marcus Moore 4fb86ad2fb
Get name as a string and not an array 2023-06-06 16:31:26 -07:00
Marcus Moore 42a4941ad2
Ensure consumable name is valid in factory 2023-06-06 16:31:26 -07:00
snipe d648e9a01c Added Google test user 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 09:13:34 -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 6cd3cfe1ea Added new field to factory 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 20:57:03 -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 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
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 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
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 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 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 2f0f9586b1
Remove default category relationship from license factory 2023-03-16 13:46:30 -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
Marcus Moore 099ec3f550
Remove creation of category within category factory state 2023-03-13 16:45:43 -07: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 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
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 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