lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
14322 commits 1 branch 0 tags 220 MiB
Commit graph

14322 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe
abd79219dd Use form request to check for valid category 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 15:26:24 +01:00
snipe
2b5463475c Added test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 15:25:26 +01:00
snipe
a7a1a377da Added form request for consumables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 15:25:07 +01:00
snipe
a6b2f5df1d Added tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 15:24:56 +01:00
snipe
da2b64c96d Added string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 15:24:08 +01:00
snipe
9e9b07f10f Removed duplicate status check 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 15:23:59 +01:00
snipe
82743abadc Cleans up the consumables index controller 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 14:15:18 +01:00
snipe
498a443230 Derp 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 12:01:06 +01:00
snipe
34b49ef079 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 11:59:47 +01:00
snipe
5364838fc0 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2024-07-11 10:08:10 +01:00
snipe
8be44f9cf2 Check for time until depreciated 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 10:07:58 +01:00
snipe
68136ea217
Merge pull request #15052 from snipe/jerm/handle-windows-ca-jank-in-upgrade-script 
upgrade.php: If we're on windows, make sure we can load intermediate certificates
 2024-07-11 09:11:37 +01:00
snipe
ec063b4af5 Updated PHP min version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-10 17:07:44 +01:00
snipe
bfa42ff84a
Merge pull request #15051 from snipe/jerm/add-upgrade-script-debugging 
upgrade.php: More helpful output when we can't read .upgrade_requirements.json
 2024-07-10 16:51:30 +01:00
snipe
22aca1af53 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-10 16:12:20 +01:00
snipe
71a5d07698 Fixes #15056 - only try to load avatars if one exists or default is set 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-10 08:56:14 +01:00
snipe
fb10c1439a
Merge pull request #15057 from spencerrlongg/bug/sc-23212-2 
Fixes Potential Exception
 2024-07-10 08:27:59 +01:00
snipe
c58c592fb0
Merge pull request #15059 from Godmartinz/export_options 
Fixed missing print user assigned filter
 2024-07-10 08:25:24 +01:00
spencerrlongg
6932a63217 make some naming a little clearer 2024-07-09 16:32:44 -05:00
snipe
1a1ccd6bdc Type constrains one more time - who thought this was a good idea? 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-09 19:50:58 +01:00
Godfrey M
624632d0ca removed push and endpush 2024-07-09 11:41:31 -07:00
spencerrlongg
66255291da test working 2024-07-09 11:13:06 -05:00
spencerrlongg
33b2c7b78a push so i can do something else 2024-07-09 10:35:16 -05:00
snipe
34e1ff88db Added StreamedResponse 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-09 13:41:50 +01:00
snipe
f4ffbcf76e Fixed wonky layout on accessory files 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-09 13:38:50 +01:00
snipe
8a547dab20 Fixed type constraint 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-09 13:35:57 +01:00
snipe
14fa5d778d
Merge pull request #15055 from snipe/more_translations 
Fixed API key missing translations
 2024-07-09 13:19:46 +01:00
snipe
5597992d63 Fixed API key missing translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-09 13:17:46 +01:00
snipe
595408d21f On more binaryfile response 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-09 11:54:07 +01:00
snipe
491a0f3959 One more typehint 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-09 11:47:53 +01:00
Jeremy Price
c8fe002688 upgrade.php: If we're on windows, make sure we can load intermediate certificates 
According to https://github.com/curl/curl/issues/12155 and 2d6333101a

Some corporate Windows proxy (mis)configurations don't pass along
intermediate certificates in their TLS handshakes, breaking lots of
things that don't work around it.

This creates a problem in our curl calls when checking for
.upgrade_requirements.json, and seems to be the source of errors for a
few of our users: https://github.com/snipe/snipe-it/issues/14826#issuecomment-2197611342

In this change, we detect when running on windows environments and load
the curl option that works around this.
 2024-07-08 22:13:14 -07:00
Jeremy Price
25fabcc1be More helpful output when we can't read .upgrade_requirements.json 
Handle json decode errors and display the raw output in such cases, to
better understand what's happening and help debugging
 2024-07-08 22:12:09 -07:00
snipe
09cc9b92d1 Fixed #15050 - erroneous deleted remark 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 22:13:07 +01:00
snipe
bf060d43a7 Fixed typehint on assets controller 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 22:02:11 +01:00
snipe
9b838cedd1 Fixed typehint on asset model files 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 22:00:45 +01:00
snipe
abf194fbcf Added default avatar into repo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 21:38:25 +01:00
snipe
211f98e971 Revert 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 21:38:03 +01:00
snipe
7f1931af9c Grr 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 21:37:17 +01:00
snipe
7dcb45d7f3 Skip default.png as default 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 21:33:56 +01:00
spencerrlongg
8650923b01 new branch cuz test merge 2024-07-08 12:55:59 -05:00
snipe
9c304f238a
Merge pull request #15029 from snipe/fixes/small_docblock_fixes 
General cleanup - Docblock fixes, adding type hinting, added tests, added asset model form validator
 2024-07-08 17:43:50 +01:00
snipe
202f5077de Removed return 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 17:41:20 +01:00
snipe
4c19b4d831 Added aria-hidden="true" to error icon for accessibility 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 17:39:38 +01:00
snipe
f3bf74a540 Updated language files 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 15:51:19 +01:00
snipe
de6a230838 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 15:35:35 +01:00
snipe
cf92dde1ca
Merge pull request #15046 from snipe/localize_bootstrap_table 
Added localization for bootstrap-tables
 2024-07-08 15:20:39 +01:00
snipe
86c0a3ecad Added localization for bootstrap-tables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 15:12:37 +01:00
snipe
3b3a7e2757 Added more PHP in pgsql tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 14:58:26 +01:00
snipe
c72b36b84a Upgraded acorn from 8.11.3 to 8.12.0 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 14:40:26 +01:00
snipe
ee1afc63f9
Merge pull request #15045 from snipe/snyk/upgrade-jquery_validation 
Snyk - Updated jquery validation
 2024-07-08 14:38:14 +01:00