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
snipe 7c5d29ccd9 Move Google Login prompt higher, made it bigger 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-05 14:56:34 +00:00
snipe 93712ec417
Merge pull request #14103 from snipe/bug/user_api_limit_offset_order 
Moved limit and offset in user API to after additional qualifiers
 2024-01-05 12:02:18 +00:00
snipe f8a21bdb2d Moved limit and offset to after additional qualifiers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-05 11:59:31 +00:00
snipe 98ef687e9c
Merge pull request #14090 from marcusmoore/chore/sc-24386 
Run sqlite tests in GitHub action
 2024-01-04 22:41:37 +00:00
snipe 432f05586e
Merge pull request #14100 from Godmartinz/fix-license-seat-department-link 
fixed `departmentNameLinkFormatter` url
 2024-01-04 22:40:24 +00:00
snipe dbcf7e3fd1
Merge pull request #14101 from marcusmoore/bug/sc-24398 
Fixes creating invalid query with null values
 2024-01-04 22:36:46 +00:00
Godfrey M 43737263d4 removed that clause 2024-01-04 14:32:03 -08:00
Godfrey M 07eeaea3bf adds an additional clause 2024-01-04 14:30:59 -08:00
Godfrey M 249ff868e5 removes empty seats when sorting by department 2024-01-04 14:26:07 -08:00
Marcus Moore 742e183b02
Add guard against adding null values to query 
Since $request->filled(null) returns true
 2024-01-04 14:04:00 -08:00
Godfrey M a110b5fcca ugh 2024-01-04 12:37:53 -08:00
Godfrey M 1f1e58eb1e remove unintentional change 2024-01-04 12:36:57 -08:00
Godfrey M 32b34ca9b9 departmentNameLinkFormatter had a bad url 2024-01-04 12:33:33 -08:00
snipe 0c6611d6bd
Merge pull request #14097 from spencerrlongg/hotfix/migration_model_issue 
Use Query Builder instead of Model for Update to Skip Observer
 2024-01-04 00:36:30 +00:00
spencerrlongg 0d853f931d use query builder instead of model for update to skip observer 2024-01-03 18:32:13 -06:00
snipe 42d35174b2 Updated hash 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-03 23:25:56 +00:00
snipe 00718d7a4b
Merge pull request #14096 from snipe/security/snyk_14075 
Upgrade jspdf-autotable from 3.5.31 to 3.8.0
 2024-01-03 23:23:10 +00:00
snipe ab32c42ac8 Upgrade jspdf-autotable from 3.5.31 to 3.8.0 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-03 23:21:27 +00:00
snipe bbdc8383e1 Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-03 23:17:44 +00:00
snipe e711d68de1
Merge pull request #14095 from snipe/security/snyk_14066_Upgrade_fortawesome/fontawesome-free 
Upgrade @fortawesome/fontawesome-free from 6.4.0 to 6.5.0
 2024-01-03 23:16:39 +00:00
snipe b29df4a610 Upgrade @fortawesome/fontawesome-free from 6.4.0 to 6.5.0 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-03 23:15:49 +00:00
snipe 93273d301a
Merge pull request #14094 from snipe/localizations/updated_strings 
Updated language strings
 2024-01-03 23:13:15 +00:00
snipe 50eb257cec Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-03 23:12:29 +00:00
snipe b23ce6cfc6
Merge pull request #14093 from marcusmoore/bug/sc-24389 
Fixes language source directory for crowdin
 2024-01-03 22:11:20 +00:00
Marcus Moore 08c16b4435
Fix language source directory 2024-01-03 14:02:36 -08:00
snipe 0d697629aa
Merge pull request #14092 from marcusmoore/chore/sc-24383 
Syncs readme to DockerHub description
 2024-01-03 21:36:34 +00:00
Marcus Moore 1f7e7b20e9
Sync readme to dockerhub 2024-01-03 13:26:49 -08:00
Marcus Moore 4894f524a0
Update action name 2024-01-03 12:30:10 -08:00
Marcus Moore f819e1469a
Run sqlite tests in GitHub action 2024-01-03 12:27:13 -08:00
snipe cce9540316
Merge pull request #13964 from spencerrlongg/refactor/store_asset_form_request 
Tests For API Asset Store + Refactor For Auto Increment & Form Requests
 2024-01-03 19:26:11 +00:00
Joël Pittet 771e3ad0ad Fixes CVE-2023-51651 aws/aws-sdk-php with depdendencies 2024-01-02 17:31:10 -08:00
Joël Pittet 7ce37d0ffb Fixes CVE-2023-51651 aws/aws-sdk-php 2024-01-02 17:22:22 -08:00
spencerrlongg 901b1b83d0 rm code, was probably fixed through rules at some point 2024-01-02 18:27:17 -06:00
spencerrlongg 9e84521098 fix auto-increment settings for test settings 2024-01-02 18:10:59 -06:00
Spencer Long 8546407083
Merge branch 'develop' into refactor/store_asset_form_request 2024-01-02 18:05:15 -06:00
spencerrlongg 7c30261ec8 add marcus' migration changes to branch 2024-01-02 17:28:41 -06:00
snipe 8bc5f08da5 Fixed a few more small localization issues 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 20:14:49 +00:00
snipe 38bd530fae Update en defaults for controllers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 19:44:20 +00:00
snipe 02d35449d2 Updated seeder with en to en-US 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 19:41:48 +00:00
snipe eead7b49e3 Fixed language code 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 19:07:11 +00:00
snipe a31bef7b9e
Merge pull request #14072 from snipe/fixes/also_update_settings_console_command 
Update ResetSettings command to en-US vs en
 2023-12-24 18:33:23 +00:00
snipe ed9473c8ff Update ResetSettings command to en-US vs en 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 18:32:21 +00:00
snipe 780269850a
Merge pull request #14064 from snipe/bug/set_fallback_locale_to_new_locale_code 
Bug/set fallback locale to new locale code
 2023-12-20 01:04:43 +00:00
snipe 2a4eff2e90 Remove env var option for config on fallback 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-20 01:03:11 +00:00
snipe a0553f4c33 Update fallback locale to new locale code 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-20 01:01:59 +00:00
snipe 4ee5ba4496
Merge pull request #14059 from snipe/localizations/new_strings_pre-6.3.0 
Normalize language codes, updated strings
 2023-12-20 00:02:47 +00:00
snipe 97ba023152 Moved return 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 20:47:06 +00:00
snipe a5947b8109 Added warning in middleware 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 20:34:45 +00:00
snipe 4a0d4f5862 Moved static var up above 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 20:27:11 +00:00
snipe 5e0128c9dc Include trashed per @marcusmoore 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 20:23:19 +00:00