DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-30 07:59:50 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
14373 commits 102 branches 268 tags 288 MiB
Commit graph

14373 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 ea881ff95e Merge remote-tracking branch 'origin/develop' 2024-07-09 13:42:03 +01:00
snipe 34e1ff88db Added StreamedResponse 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-09 13:41:50 +01:00
snipe c1916d6fe4 Merge remote-tracking branch 'origin/develop' 2024-07-09 13:39:07 +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 da9932d147 Merge remote-tracking branch 'origin/develop' 2024-07-09 13:36:06 +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 da42127a7c Merge remote-tracking branch 'origin/develop' 2024-07-09 11:54:17 +01:00
snipe 595408d21f On more binaryfile response 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-09 11:54:07 +01:00
snipe 090410edb5 Merge remote-tracking branch 'origin/develop' 2024-07-09 11:48:30 +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 43d4bc8dc4 Merge remote-tracking branch 'origin/develop' 2024-07-08 22:13:19 +01:00
snipe 09cc9b92d1 Fixed #15050 - erroneous deleted remark 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 22:13:07 +01:00
snipe ebcc48ec80 Merge remote-tracking branch 'origin/develop' 2024-07-08 22:02:25 +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 5ca62f3ef8 Merge remote-tracking branch 'origin/develop' 2024-07-08 21:39:31 +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 3ae16ff8ca Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	public/js/build/vendor.js
#	public/js/dist/all.js
#	public/mix-manifest.json
 2024-07-08 15:53:42 +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 2e2f59b290 Updated production assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 15:29:36 +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
snipe 8438652e7d Updated jquery validation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 14:30:06 +01:00
snipe c16db436d3 Merge remote-tracking branch 'origin/develop' 2024-07-08 13:21:38 +01:00
snipe ac9df2fc08
Merge pull request #15043 from snipe/fixes/custom_fields_on_audit 
Fixed #15037 - Removed custom fieldsets on auditing - it’s not used (yet)
 2024-07-08 13:20:59 +01:00
snipe eba24b9242 Removed custom fieldsets on auditing - it’s not used 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 13:19:05 +01:00
snipe 8c6ecd35ec Added more basic tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-05 11:56:24 +01:00
snipe e98823f7fa Added 403 to sad panda page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-05 11:54:49 +01:00
snipe a8ddb2f44a Added non-circular tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-05 11:29:30 +01:00
snipe f32bf35c22 Fixed another rename :-/ 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-05 10:50:03 +01:00
snipe 978a0272a5 Sigh. Renamed again 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-05 08:37:31 +01:00
snipe 283f24b213 Derp. Renamed file 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-05 08:34:17 +01:00