DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-17 02:54:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
10355 commits 96 branches 267 tags 296 MiB
Commit graph

10355 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe ffb87a0a87
Merge pull request #12684 from snipe/features/added_console_command_to_normalize_names 
Added console command to normalize capitalization on names
 2023-03-16 16:24:33 -07:00
snipe 8f04342fc2 Added console command to normalize capitalization on names 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 16:23:52 -07:00
snipe d6434fa55a
Merge pull request #12683 from snipe/fixes/additional_sort 
Fixes/additional sort
 2023-03-16 16:08:51 -07:00
snipe b374834999 Added extra order by switch for first_name and last_name 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 16:07:51 -07:00
snipe 5e4455f042 Deleted duplicate statement 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 16:07:36 -07:00
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
snipe b64d7e38f2
Merge pull request #12679 from snipe/bug/sc-20451 
Handle already-deleted license files more gracefully
 2023-03-15 16:26:15 -07:00
Godfrey M 371e142bae removes unnecessary function 2023-03-15 15:57:45 -07:00
Marcus Moore b944945377
Remove hard-coded company_id in factories and update seeders 2023-03-15 14:12:34 -07:00
akemidx a8e2f72e25 accessory cloning, WITHOUT copying over the image. 2023-03-15 16:55:24 -04:00
snipe e9601bcf13 Handle already-deleted license files more gracefully 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-15 13:05:51 -07:00
akemidx 0909d94c8f actually added the icons haha 2023-03-15 15:07:07 -04:00
akemidx 68094b23b9 moved dell and levono icons to local machine 2023-03-15 15:02:33 -04:00
snipe fdacd5d5b5
Merge pull request #12636 from akemidx/feature/sc-20330/date-on-all-assigned-pdf 
Datestamp on "Print All Assigned" generated form
 2023-03-15 11:31:52 -07:00
akemidx f38f6f57ae fixed localization and formatting. simplified code to remove php snippet 2023-03-15 14:00:29 -04:00
akemidx a3353b8496 committing 2023-03-15 13:48:22 -04:00
snipe 08e09a3215
Merge pull request #12675 from snipe/security/webpack_upgrade 
Updated webpack
 2023-03-14 19:55:42 -07:00
snipe 039a5dde7d Updated webpack 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-14 19:54:58 -07:00
snipe 1968aebf78
Merge pull request #12674 from snipe/fixes/translation_variable_for_slack 
Fixed missing variable in Slack hook test
 2023-03-14 19:03:42 -07:00
snipe a0617edaf0 Fixed missing variable in Slack hook test 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-14 19:02:38 -07:00
Marcus Moore fb789eb048
Remove hard-coded depreciation_id in factories 2023-03-14 17:51:20 -07:00
snipe 4c66267f3b
Merge pull request #12668 from inietov/fixes/undefined_array_key_0 
Fixed ErrorException: Undefined array key 0 [sc-20424]
 2023-03-14 17:10:04 -07:00
Marcus Moore f7577bff52
Merge branch 'develop' into fixes/purify-factories 2023-03-14 17:09:30 -07:00
snipe 322fd76353
Merge pull request #12664 from Godmartinz/The_final_lowercase 
The final lowercase in webhooks
 2023-03-14 17:09:20 -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
snipe a991bdd136
Merge pull request #12672 from inietov/fixes/consumable_factory_seeder 
Fixed Consumable Factory Seeder
 2023-03-14 17:04:33 -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
snipe f0d05a7461 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2023-03-14 14:34:11 -07:00
snipe 88624ff2c0 Add @marcusmoore as a contributor 2023-03-14 14:34:03 -07:00
snipe f71ee699f4 Add @spencerrlongg as a contributor 2023-03-14 14:33:31 -07:00
snipe ce83d3aec1
Merge pull request #12670 from spencerrlongg/bug/sc-20437 
Catch Duplicate Headers in Asset History Import
 2023-03-14 14:32:34 -07:00
slong753 60b70a4074 catch and redirect back with error 2023-03-14 16:07:09 -05: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
akemidx d50a5d1880 dell and lenovo icons/links added 2023-03-14 16:04:03 -04:00
Marcus Moore a2efe3fa67
Remove hard-coded category_id in factories 2023-03-14 12:50:02 -07:00