DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 06:59:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
9730 commits 101 branches 268 tags 288 MiB
Commit graph

9730 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 0dfb51f642 User merge blade 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 18:18:32 -07:00
snipe 853e809ff8 Added route 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 18:18:26 -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
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
snipe e9601bcf13 Handle already-deleted license files more gracefully 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-15 13:05:51 -07: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
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
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
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
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
akemidx 9c5ee060d3 WIP string/int error 2023-03-14 15:01:56 -04:00
snipe dfd9fcc5e0
Merge pull request #12599 from inietov/fixes/unknown_column_0_in_field_list 
Fixed Column not found: 1054 Unknown column '0' in 'field list' [sc-20004]
 2023-03-14 09:51:42 -07:00
snipe b83980299a
Merge pull request #12667 from snipe/fixes/small_livewire_ui_fixed 
Small UI tweaks
 2023-03-14 09:47:45 -07:00
snipe 5a709a83e7 Small UI tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-14 09:38:30 -07:00
Ivan Nieto Vivanco 66bb897ac4 Fix format to purchase date 2023-03-14 02:55:20 -06:00
Ivan Nieto Vivanco 67471a3a77 Evaluate if the collection is empty before access the array index 2023-03-13 21:44:06 -06:00
snipe 7acf449ed3
Merge pull request #12665 from snipe/fixes/fixed_migration_for_smaller_chunking 
Removed loading and reduced chunking to 10
 2023-03-13 17:23:19 -07:00
Godfrey M 955d8313b2 the final lowercase 2023-03-13 17:14:02 -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
snipe a2667a7520
Merge pull request #12663 from Godmartinz/webhook_tweaks 
fixes webhook variables to lowercase
 2023-03-13 16:55:32 -07:00
Godfrey M 1bd37b49e9 adds translations for webhook names 2023-03-13 16:13:02 -07:00
Ivan Nieto Vivanco d224f3177e Delete a rule that was breaking validation 2023-03-13 16:43:10 -06:00
Godfrey M 6474249ea8 uppercased names 2023-03-13 15:29:53 -07:00
Godfrey M 7612c5d852 lowercases variables 2023-03-13 15:26:51 -07:00
Ivan Nieto Vivanco e7b3daa80c Adjust validator to only receive valid groups id's 2023-03-13 16:10:08 -06:00
snipe 477bd27cba
Merge pull request #12570 from Godmartinz/generalize_webhooks 
Adds General option to the webhooks settings
 2023-03-13 14:54:51 -07:00
Ivan Nieto Vivanco e4204a6dd1 Adds validator to PATCH request in the API UsersController 2023-03-13 15:49:05 -06:00
Godfrey M 11bf3f5285 aligned inputs 2023-03-13 14:06:05 -07:00
snipe cacb000693
Merge pull request #12660 from snipe/upgrades/bump_codacy 
Bumped codacy workflow
 2023-03-13 11:13:46 -07:00
snipe 4f772468e6 Bumped codacy workflow 
Relates to #12657 but for develop

Signed-off-by: snipe <snipe@snipe.net>
 2023-03-13 11:10:41 -07:00
Godfrey M 542332ea0c removes discord from rules 2023-03-13 10:54:18 -07:00
Godfrey M b6d105c4f4 removes help text from general integrations 2023-03-13 10:49:41 -07:00
Godfrey M 27a2ed5c79 Merge branch 'develop' into generalize_webhooks 2023-03-13 10:41:08 -07:00
snipe 8a977c66f0
Merge pull request #12659 from Godmartinz/update_notification_name 
fixes alerts to notifications in notification settings
 2023-03-13 09:57:43 -07:00
Godfrey M 82504c9764 updates alerts to notifications in notification settings 2023-03-13 09:51:25 -07:00