DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-16 10:34:08 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
12548 commits 96 branches 267 tags 295 MiB
Commit graph

12548 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M 9dc428b720 ran composer update on the package since the version was explicitized 2024-01-31 17:30:56 -08:00
Godfrey M 8a5b469ff8 adds # to webhook channel trigger 2024-01-31 12:54:30 -08:00
Godfrey M ed06f32a7a adds # to webhook channel trigger 2024-01-31 12:53:56 -08:00
Godfrey M a876703f8f spacing 2024-01-31 10:48:48 -08:00
Godfrey M 01bb8d8c9a spacing 2024-01-31 10:48:23 -08:00
Godfrey M f452204d62 applies a conditional to have the the integration test button function properly 2024-01-31 10:47:25 -08:00
Godfrey M 0eabb147b2 adds google notif to consumable check out 2024-01-30 13:19:28 -08:00
Marcus Moore 2e0e39ccc8
Ensure notification is sent when consumable is checked out via api 2024-01-30 13:19:20 -08:00
Godfrey M 2406d2cfdb adds google notifs to license seats check in and out 2024-01-30 13:14:24 -08:00
Godfrey M e074ca0bf9 adds google notifs to accessories check in and out 2024-01-30 12:57:45 -08:00
Marcus Moore 13c37e708f
Implement tests around consumable checkout 2024-01-30 12:43:20 -08:00
Marcus Moore 3f76d65b95
Improve test method name 2024-01-30 12:43:07 -08:00
Godfrey M 87bce0c097 adds google notifs for asset check in and out 2024-01-30 12:38:17 -08:00
Marcus Moore 6d41c8cf67
Merge branch 'develop' into bug/sc-24685 2024-01-30 11:44:36 -08:00
snipe 77fa213ccd
Merge pull request #14181 from marcusmoore/bug/sc-24671 
Fixed accessory checkout via API not sending notification and not adhering to qty limit
 2024-01-30 14:24:42 +00:00
Marcus Moore de2aa903c5
Scaffold tests 2024-01-29 17:56:55 -08:00
Marcus Moore 42ec2548c9
Fire event when accessory checked out via API 
Brings behavior in line with GUI controller
 2024-01-29 17:03:19 -08:00
Marcus Moore a2cba67f4e
Improve assertion 2024-01-29 16:59:57 -08:00
Marcus Moore 7d45cfff2c
Ensure accessory available when checking out via api 2024-01-29 16:49:09 -08:00
Marcus Moore f1ab8253f0
Implement tests included two currently failing tests 2024-01-29 16:48:40 -08:00
Marcus Moore e5d3df7d24
Scaffold accessory checkout tests for api 2024-01-29 15:59:23 -08:00
Marcus Moore 987676df08
Implement additional tests 2024-01-29 15:56:18 -08:00
Marcus Moore f16f62f76c
Scaffold and implement some tests around accessory checkout 2024-01-29 14:21:30 -08:00
Godfrey M dfa33f651a webhook test works 2024-01-29 12:58:09 -08:00
Godfrey M 30c2927987 merged develope 2024-01-29 11:21:00 -08:00
Godfrey M e8159d97fa changes 2024-01-29 11:12:25 -08:00
snipe 3da7876631 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-27 15:08:52 +00:00
snipe c0241a8421
Merge pull request #14175 from uberbrady/rebased_snipe_translator 
Fixed #14173: Use new SnipeTranslator to handle pluralized localizations
 2024-01-26 15:54:11 +00:00
Brady Wetherington 401e1842ee Fixed pluralization bug due to dashed-locale names instead of underscored 
Our locale directories are named things like 'en-US'. But the pluralization
code used by Laravel (through Symfony) requires locale names to be
in the format en_US. This change introduces a new Translator,
SnipeTranslator, which is a tiny set of changes against the built-in
one. It additionally adds a SnipeTranslationServiceProvider, which
loads up the new Translator.
 2024-01-26 15:40:55 +00:00
snipe ad2e0cc7f3 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-26 15:17:59 +00:00
snipe b39d11cc06
Merge pull request #14171 from snipe/fixes/fd-39934 
Removed attribute assigning blank EOL as 0
 2024-01-25 21:41:18 +00:00
snipe d6c61e1429 Removed attribute assigning blank EOL as 0 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-25 21:34:20 +00:00
snipe 85a158eaef
Merge pull request #14170 from uberbrady/saml_nonce_storage 
Enforce SAML assertion ID uniqueness and notValidOnOrAfter attribute [FD-37019]
 2024-01-25 20:14:40 +00:00
Brady Wetherington d3815ddce7 Remove commented-out timestamps on the saml_nonces table 2024-01-25 20:13:49 +00:00
Brady Wetherington b39b575fec Add table-check; add command-description for Artisan command 2024-01-25 20:07:18 +00:00
Brady Wetherington 81b8243e1d Enforce SAML assertion ID uniqueness and notValidOnOrAfter attribute 2024-01-25 19:53:24 +00:00
Jeremy Price 43c8e98ec7 Set v6 upgrade requirements in .upgrade_requirements.json -- REVERT FOR v7 
This was originally created on the v7 branch, and had v7 requirements,
but we're backporting it so that people have it in-hand before v7 launches.
Since v7 hasn't launched yet, and people can use it for upgrading to new
v6's potentially, we'll make it v6 happy for now.
 2024-01-25 10:12:08 -08:00
snipe 9d1abb0aa7 Merge pull request #14127 from snipe/jerm/upgrade-deps-file 
Add php version requirements file for future-proofing upgrades
 2024-01-25 10:09:35 -08:00
snipe 4e59b83885 Merge pull request #14128 from snipe/jerm/upgrade-dot-php 
Add remote requirements checking to upgrade.php
 2024-01-25 10:09:03 -08:00
snipe ab926f2e33
Merge pull request #14153 from Godmartinz/ms_teams_webhook 
Added support for Microsoft Teams Notifications
 2024-01-25 08:27:17 +00:00
snipe 45b253a57d
Merge pull request #14164 from marcusmoore/bug/sc-20686 
Avoid unnecessarily hydrating models on asset show page
 2024-01-25 00:20:30 +00:00
Marcus Moore f5dafc477a
Avoid unnecessary model hydration on asset model show page 2024-01-24 16:14:51 -08:00
Godfrey M 6e9a46e582 working on Chat integration test 2024-01-24 15:50:36 -08:00
Godfrey M c65b32bcdb removed translation fixed via method 2024-01-24 14:49:42 -08:00
Godfrey M 1d3124f89f adding a test variable for test methods 2024-01-24 14:38:45 -08:00
snipe 57a8630e99
Merge pull request #14162 from snipe/bug/sc-24511 
Fixed #14114 - correctly sort related fields for labels
 2024-01-24 21:37:20 +00:00
snipe 105d4899f5 Removed debug line 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 20:33:13 +00:00
snipe 5909654fd4
Merge pull request #14163 from Godmartinz/ldap_test_table_fix 
Added overflow scroll to ldap test table
 2024-01-24 20:18:08 +00:00
Godfrey M e175cdbfd7 adds table overflow scroll 2024-01-24 12:13:40 -08:00
snipe 5f8e63717d
Merge pull request #14058 from Godmartinz/ldap_test_table_fix 
Fixed Ldap sync test table and table data from overflowing
 2024-01-24 19:31:04 +00:00