Commit Graph

18591 Commits

Author SHA1 Message Date
Greenback
e2769671a7 removed github merge introduced spaces. 2020-11-04 20:38:47 +00:00
Greenback
3e62557959 amended testing unit. 2020-11-04 20:30:06 +00:00
BaronGreenback
ec245dce90
Merge branch 'master' into NetworkPR2 2020-11-04 20:17:41 +00:00
dkanada
ad262fe8a6
Merge pull request #4416 from jellyfin/dkanada-patch-1
Disable compatibility checks until they work again
2020-11-04 14:32:00 +09:00
dkanada
d9ea1ac12d
disable two more tasks to fix the failures 2020-11-04 13:49:49 +09:00
dkanada
25f93a9af4
disable compatibility checks until they work again 2020-11-03 23:18:30 +09:00
Bond-009
8fc16043c7
Merge pull request #4405 from nyanmisaka/aac-directstream
Fix AAC direct streaming
2020-11-03 10:59:43 +01:00
Bond-009
13c70c415a
Merge pull request #4409 from crobibero/fix-separators
Fix API separators
2020-11-03 10:58:03 +01:00
Bond-009
53b2a2ee22
Merge pull request #4213 from cvium/progressivefilestream
Add ProgressiveFileStream
2020-11-03 09:47:17 +01:00
Anthony Lavado
b1b43b8ad9
Merge pull request #4068 from barronpm/event-fixes
Fix Plugin Events and Clean Up InstallationManager.cs
2020-11-02 11:11:17 -05:00
Anthony Lavado
6205fb4b6a
Merge pull request #4341 from Bond-009/minor6
Minor improvements
2020-11-02 11:10:39 -05:00
Anthony Lavado
f23836c6a4
Merge pull request #4403 from Bond-009/http2
Http1AndHttp2 is the default, no need to explicitly enable it
2020-11-02 11:10:28 -05:00
Bond-009
51dc92c3a9
Merge pull request #4326 from crobibero/purge-activity-log
Automatically clean activity log database
2020-11-02 16:52:49 +01:00
Bond-009
95918d161e
Merge pull request #4328 from crobibero/trigger-warning
Remove CommaDelimitedArrayModelBinderProvider
2020-11-02 16:52:05 +01:00
Bond-009
ea1a462a9d
Merge pull request #4413 from cvium/fix_collection_endpoints
Rename itemIds to ids
2020-11-02 16:50:54 +01:00
cvium
af56d5c2dc Rename itemIds to ids 2020-11-02 11:53:23 +01:00
Cody Robibero
de36c8433e
Update Emby.Server.Implementations/Localization/Core/en-US.json
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
2020-11-02 03:52:14 -07:00
crobibero
dd3507bbbf Fix OfficialRatings separator 2020-11-01 18:54:00 -07:00
crobibero
c1ec46e92b Fix Tags separator 2020-11-01 18:53:27 -07:00
crobibero
826c24142e Fix Genres separator 2020-11-01 18:53:02 -07:00
crobibero
ceecc80bb3 Allow configuration of ActivityLogRetention 2020-11-01 18:32:41 -07:00
Bond-009
5b1eb8b6e2
Merge pull request #4408 from crobibero/dep-dep-dep
Dependency catch up
2020-11-01 21:46:21 +01:00
crobibero
e41e832495 Dependency catch up 2020-11-01 10:52:32 -07:00
nyanmisaka
599e20ab9b fix music directplay on Gelli 2020-11-01 18:45:42 +08:00
nyanmisaka
e5237384d5 fix the route of audio containers 2020-11-01 04:20:25 +08:00
Joshua M. Boniface
6b3459f01b
Merge pull request #4406 from joshuaboniface/remove-jfffmpeg-dep
Remove jellyfin-ffmpeg dep from server package
2020-10-31 16:13:45 -04:00
Joshua M. Boniface
0bcf4c02b4 Remove jellyfin-ffmpeg dep from server package
Being added to the metapackage instead.
2020-10-31 15:50:56 -04:00
Greenback
f06e4826c7 Fixed testing units 2020-10-31 19:16:28 +00:00
Greenback
83af636c61 Updated with new NetManager 2020-10-31 18:21:46 +00:00
nyanmisaka
d34be6faf4 fix aac directstreaming 2020-11-01 00:33:38 +08:00
Bond-009
26078e4df9
Merge pull request #4375 from crobibero/auth-dict-fix
Fix setting duplicate keys from auth header
2020-10-31 16:14:53 +01:00
Bond_009
7f8a73d8e9 Http1AndHttp2 is the default, no need to explicitly enable it 2020-10-31 12:54:28 +01:00
Greenback
c25ec72864 Updated libraries. 2020-10-30 14:48:33 +00:00
Greenback
ec57eeff2b Updated to latest version of code. 2020-10-30 14:06:11 +00:00
Greenback
6dc2936d9c Merge remote-tracking branch 'upstream/master' into NetworkPR2 2020-10-30 13:54:46 +00:00
Greenback
face3f8c65 Updating to latest network code. 2020-10-30 13:54:37 +00:00
Greenback
c54eb2d2df Merge remote-tracking branch 'origin/master' into NetworkPR2 2020-10-30 13:54:02 +00:00
Bond-009
4f320308f3
Merge pull request #4395 from barronpm/users-async
Convert some code in UserManager to async
2020-10-30 13:19:59 +01:00
Patrick Barron
72263613d0 Convert some code in UserManager to async 2020-10-29 20:30:33 -04:00
Bond-009
e37805e82e
Merge pull request #4378 from barronpm/fix-nullref
Fix possible null reference exception
2020-10-30 00:34:28 +01:00
Patrick Barron
d887e42405 Fix possible NullReferenceException 2020-10-29 19:16:39 -04:00
Oatavandi
2c6b31fc7b Translated using Weblate (Tamil)
Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ta/
2020-10-29 14:56:55 -04:00
Bond-009
9bf2f4d8e0
Merge pull request #4377 from barronpm/user-caching
Add caching to users
2020-10-29 17:34:15 +01:00
dkanada
43bc850efb
Merge pull request #4346 from jellyfin/dependabot/nuget/prometheus-net-4.0.0
Bump prometheus-net from 3.6.0 to 4.0.0
2020-10-29 14:59:20 +09:00
dkanada
ec5fadc64e
Merge pull request #4347 from jellyfin/dependabot/nuget/Moq-4.14.7
Bump Moq from 4.14.6 to 4.14.7
2020-10-29 14:59:01 +09:00
dkanada
f2eda53a8b
Merge pull request #4388 from crobibero/sneaky-sneaky
Add missing slashes in ffmpeg argument.
2020-10-29 14:58:09 +09:00
Cody Robibero
96071ef30d
Move slash to correct location for quoting 2020-10-28 20:26:33 -06:00
crobibero
c0383ba07d Add missing slashes in ffmpeg argument. 2020-10-28 20:23:39 -06:00
Bond-009
9e9431d829
Merge pull request #4384 from nyanmisaka/ios-hls-bitrate
Fix HLS music playback on iOS
2020-10-28 16:29:34 +01:00
Bond-009
6d11a95ad5
Merge pull request #4305 from crobibero/query-image-type
Convert image type string to enum.
2020-10-28 15:40:56 +01:00