DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-19 23:37:38 -07:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
14602 commits 90 branches 265 tags 290 MiB
Commit graph

689 commits

Author SHA1 Message Date
snipe 2537d0fdaf Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-13 12:34:46 +01:00
snipe b2aed7feea Removed temp column 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-13 12:30:26 +01:00
snipe ea960c39bb Check if the eol_explicit column exists yet, add it if not 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-13 12:19:32 +01:00
snipe 0b39591d88 Add the eol_explicit column earlier to accomodate the observer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-13 12:18:58 +01:00
spencerrlongg f3bd23da3d rm whitespace 2023-10-12 14:53:17 -05:00
spencerrlongg 9b53b0fedc resolve issue with migrations with table prefixes 2023-10-12 14:50:12 -05:00
spencerrlongg c07c0c0f74 cleanup 2023-10-04 16:55:35 -05:00
spencerrlongg cc82e86eeb one more check 2023-10-04 16:54:56 -05:00
spencerrlongg 8c9961aba8 refactor 2023-10-04 15:40:42 -05:00
spencerrlongg 46af40bd02 ????? 2023-10-04 15:20:16 -05:00
spencerrlongg 6cda9056b8 oops 2023-10-04 14:56:18 -05:00
spencerrlongg 101bd9c404 kill transaction, try update array 2023-10-04 14:47:14 -05:00
spencerrlongg ad6b502005 comments 2023-10-04 14:37:18 -05:00
spencerrlongg cb10c7af27 oops 2023-10-04 14:33:35 -05:00
spencerrlongg 99d409c0a5 transaction 2023-10-04 14:32:28 -05: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 2d59517c35 rm !empty 2023-09-19 18:40:23 -05:00
spencerrlongg 3cb906a05f pushing to switch branches and test 2023-09-19 18:23:06 -05:00
spencerrlongg afe9d43139 chunk by id? 2023-09-14 16:00:35 -05:00
spencerrlongg aac627592b move logic inside of try 2023-09-14 15:43:00 -05:00
spencerrlongg f35f9f922e safety & catch & log 2023-09-14 15:32:17 -05:00
spencerrlongg 44441ec703 up chunk size 2023-09-14 14:25:02 -05:00
spencerrlongg 7c9a4ac161 immutable 2023-09-13 18:15:13 -05:00
spencerrlongg 64a9859efd cleanup 2023-09-13 17:58:33 -05:00
spencerrlongg ef64843d2f chunk migration, needs to be tested 2023-09-13 17:41:45 -05:00
Godfrey M f283a5f755 changed the down method change 2023-09-13 13:24:26 -07:00
Godfrey M 0c504fed49 fixed nullability of on Asset Models 2023-09-13 13:13:41 -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
spencerrlongg c66804bcee a little cleanup 2023-09-11 17:22:46 -05:00
spencerrlongg e1af69f6ae typo 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
slong753 78c400e948 fix conflicts 2023-09-11 17:21:50 -05:00
slong753 774f21bb7f some more cleanup 2023-09-11 17:17:59 -05:00
slong753 20367eecc9 fix conflicts 2023-09-11 17:17:59 -05:00
slong753 41b65bd9a2 small changes 2023-09-11 17:15:25 -05:00
slong753 0e60184e95 i think this migration makes sense 2023-09-11 17:15:25 -05:00
slong753 dc39d2c567 notes 2023-09-11 17:10:41 -05:00
slong753 321e7c93ec carbon thing 2023-09-11 16:51:40 -05:00
slong753 8456b3ec0c wip stuff 2023-09-11 16:51:40 -05:00
Godfrey Martinez a26b96185b
Merge branch 'develop' into asset-model-notifs 2023-09-11 09:37:22 -07:00
snipe a62e2f092b
Merge pull request #13498 from marcusmoore/feature/add-checkin-date-range-filter-to-custom-asset-report 
Added last check in column and filter to custom asset report
 2023-09-05 13:22:15 +01:00
Godfrey M 8ebb9afedd adds min_amt to asset model edit, index, and table 2023-08-24 10:30:07 -07:00
snipe ea37325806 Remove trans() from default values 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-23 08:19:05 +01:00
snipe 749002b768 Added migration to add name order to settings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:09:48 +01:00
Marcus Moore 8b2716d2b7
Fix update statement 2023-08-17 18:33:01 -07:00
Marcus Moore 56fb45f1ea
WIP: Add last_checkin to assets table 2023-08-17 18:01:26 -07:00
snipe e41368daac
Merge pull request #12050 from cram42/develop 
New Label Engine
 2023-08-15 17:58:57 +01:00
snipe c56f664811
Merge pull request #13442 from Robert-Azelis/Robert-Azelis-patch-add_email_to_companies 
Add email to companies
 2023-08-15 13:26:20 +01:00
Robert-Azelis 1e43d88e06
Create 2023_08_13_172600_add_email_to_companies.php 2023-08-13 17:25:33 +02: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
Godfrey M 7560afb8c4 changes webhook_endpoint var to a text 2023-08-01 10:45:39 -07:00
Grant Le Roux b1464e028c
Merge branch 'develop' into develop 2023-07-31 07:57:29 +08:00
snipe 18e2ec4dad
Merge pull request #13310 from marcusmoore/bug/sc-23478 
Fixed the inability to load location select when editing profile
 2023-07-18 13:26:30 +01:00
snipe 3078cab7ee Added ability to show/hide custom fields in list views by default 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-14 09:09:43 +01: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
snipe 14c61e4c17 Added phone, fax to departments, locations, companies 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-10 19:44:21 +01:00
snipe c85a33be6a Change settings table saml_idp_metadata to MEDIUMTEXT 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-05 17:28:08 +01: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
Marcus Moore 50234bc9a5
Formatting 2023-05-22 17:40:06 -07:00
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