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
12525 commits 101 branches 268 tags 288 MiB
Commit graph

12525 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Godfrey M ada1a593a4 add google placeholder 2024-01-24 11:29:32 -08:00
snipe 2c7bbfa637 Added additional sort/order hidden fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 19:09:20 +00:00
snipe ba680126bc Properly sort the results based on non-asset fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 19:09:06 +00:00
snipe dd3b2da670 Updated variable names for clarity, remove the concat of order and sort 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 19:08:47 +00:00
Godfrey M 00f07ac2ce add translations, brush up code 2024-01-24 10:38:06 -08:00
snipe 165f9545ac
Merge pull request #13924 from snipe/bug/sc-20167 
Set qty mutators
 2024-01-24 18:21:06 +00:00
snipe fff21416be
Merge pull request #14051 from akemidx/email_in_license_table 
Email in License Seat Table
 2024-01-24 15:37:43 +00:00
snipe dc84e0f3ae
Merge pull request #14161 from snipe/localizations/updated_with_new_strings 
Updated language strings
 2024-01-24 15:31:09 +00:00
snipe 8ca4c51186 Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 15:29:39 +00:00
snipe f247661f07
Merge pull request #14159 from snipe/fixes/not_array_typo 
Fixed english and attribute placeholder
 2024-01-24 14:59:57 +00:00
snipe f73a55f9ab Fixed english and attribute placeholder 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 14:58:06 +00:00
snipe 7668a6767d
Merge pull request #14102 from Godmartinz/seat-id-is-zero 
Fixed license seats id turning to zero when sorting by department
 2024-01-24 14:49:33 +00:00
snipe 684264dac7
Merge pull request #14158 from snipe/fixes/moved_url_string_again 
Moved URL string to general
 2024-01-24 14:48:26 +00:00
snipe e6f94cfebf Missed one 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 14:47:54 +00:00
snipe c54eb22754 Moved URL string to general 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 14:46:52 +00:00
snipe 661cc2b460
Merge pull request #14131 from Godmartinz/label_engine_translations 
Adds translations for Label example
 2024-01-24 13:36:40 +00:00
snipe 49dc1dd37a
Merge pull request #14132 from marcusmoore/chore/sc-24501 
Improved radio button values in custom report form
 2024-01-24 13:22:48 +00:00
snipe bfc9be6b97
Merge pull request #14149 from snipe/dependabot/github_actions/develop/actions/cache-4 
Bump actions/cache from 3 to 4
 2024-01-24 13:22:08 +00:00
snipe 1b7885677a
Merge pull request #14155 from uberbrady/ldap_location_fixes 
Fix for LDAP syncing with base_dn and location_id and location [FD-39651]
 2024-01-24 13:21:46 +00:00
Brady Wetherington 3bc1b9038d Fix for LDAP syncing with base_dn and location_id and location 2024-01-24 11:54:29 +00:00
Godfrey M 49021d277c if not location add default location 2024-01-23 13:33:57 -08:00
Godfrey M f270672a3d added a location check, to prevent notif blowing up 2024-01-23 13:05:39 -08:00
Godfrey Martinez b797795d37
Merge pull request #11 from Godmartinz/license_checkable 
adds consumable checkout  ms notification
 2024-01-23 11:22:02 -08:00