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

9936 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marcus Moore 6e6a021928
Add temporary command to display model counts 2023-03-13 16:44:47 -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
Godfrey M 576b8f8c48 adds translations to edit and index of categories 2023-03-13 13:33:03 -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
akemidx 4533982345 added time of day 2023-03-09 15:11:07 -05: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 88eb73d160 Use Carbon’s diffForHumans() method instead of our own home-grown stuff 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 16:47:54 -08:00
snipe f4bd307421 Added comments, removed gthe AgeFormat() helper method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 16:47:27 -08:00
snipe 059ead5af5 Added comments (not related to this, sorry) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 16:47:08 -08:00
snipe 02dd0669dc Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 16:36:08 -08:00
snipe b3b9efbaff New helper method to return icon type 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 16:34:04 -08:00
snipe a6f4e53e2b Added translation strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 16:33:49 -08:00
snipe fe470b32fc Added icon and import type to header, more translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 16:33:40 -08:00
snipe 474e32ea2a Added translations and formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 16:33:02 -08:00
snipe b9e4b2a0ba Added some translations, date formatting, and filesize human reporting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 16:32:45 -08:00
Brady Wetherington 087fe19ae7 Merge branch 'livewire_importer_2_squashed_and_rebased' of github.com:uberbrady/snipe-it into livewire_importer_2_squashed_and_rebased 2023-03-08 13:57:21 -08:00
Brady Wetherington 22d7d2a04e Aliases could get selected when they weren't for an import_type 2023-03-08 13:56:29 -08:00
snipe b8887bd3e3 Translated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 13:47:56 -08:00
snipe 65c2d75c04 Added aliases 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 13:47:38 -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
akemidx 2a4d30a748 forgot to add datestamp to title of page 2023-03-08 15:09:33 -05: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
akemidx cd9f2f7fb7 datestamp for print all assigned form generation 2023-03-08 14:56:14 -05:00
Godfrey M 15c19a7ab7 silenced Discord option and validation, more translations 2023-03-08 10:35:45 -08:00
snipe ac0b22d696 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 00:33:04 -08:00
snipe 1ed7cd27b4 Lots of HTML/CSS tweaks for better UI 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 00:32:30 -08:00
snipe e143e0c5ee Make the <tr> reflect that it’s active 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 00:32:16 -08:00
snipe 42601fecbf Merge branch 'livewire_importer_2_squashed_and_rebased' of https://github.com/uberbrady/snipe-it into uberbrady-livewire_importer_2_squashed_and_rebased 2023-03-07 21:42:32 -08:00