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

9707 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
snipe 1e6a3b8c45 Add @floschoepfer as a contributor 2023-03-10 14:24:56 -08:00
snipe d1d89f872a
Merge pull request #12638 from snipe/fixes/dashboard_category_count_with_show_archived 
Fixed #12635 - dashboard category should not show archived
 2023-03-10 14:19:40 -08:00
snipe 58d2e658d2
Merge pull request #12648 from floschoepfer/patch-1 
Fixed #12647: fix translation and adds icon on property reassignable
 2023-03-10 14:13:48 -08:00
Florian 86205bc996
fix translation and adds icon on property reassignable 
Fixing #12647
 2023-03-10 10:36:42 +01:00
snipe 65c2f27644
Merge pull request #12640 from marcusmoore/fix/test-suite 
Fixes unit and feature test suite
 2023-03-09 11:57:39 -08:00
snipe dccd6fd4b1 Duplicate withCount 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 13:06:14 -08:00
snipe 7f8bdbd252 Added showableAssets() relationship to Category model 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 13:01:38 -08:00
snipe 00896a8615 Updated comment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 12:51:53 -08:00
Marcus Moore 44b48a954a
Remove unneed section of testing docs 2023-03-08 12:15:37 -08:00
Marcus Moore 0be882dc35
Merge branch 'develop' into fix/test-suite 2023-03-08 12:13:53 -08:00
Marcus Moore 5fb18af245
Update testing documentation 2023-03-08 11:58:36 -08:00
Marcus Moore 697824007a
Move DB_CONNECTION back to .env.testing.example 2023-03-08 11:58:29 -08:00
Godfrey M 15c19a7ab7 silenced Discord option and validation, more translations 2023-03-08 10:35:45 -08:00
snipe e66b19aca0 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 19:44:06 -08:00
snipe fd96ff0160 Add @kenchan0130 as a contributor 2023-03-07 19:42:52 -08:00
snipe 1ccedf6426
Merge pull request #12617 from kenchan0130/patch-12249 
Fixed #12249: fix csv importer for serial_number field
 2023-03-07 19:42:23 -08:00
snipe 8adeee41e6
Merge pull request #12633 from snipe/bug/sc-20332 
Fixed 500 when admin erroneously tries to upload a tiff as logo, cleaned up logo upload layout
 2023-03-07 19:41:10 -08:00
snipe 19d19a4c42 Updated language string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 19:18:32 -08:00
snipe 383b5b43bb Added a few more jquery options for prevoew flexibility 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 18:54:38 -08:00
snipe 379c5f6790 Reworked the layout for logo upoloads 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 18:54:09 -08:00