Commit Graph

2141 Commits

Author SHA1 Message Date
Patrick Barron
c464f700db Remove redundant qualifiers 2020-05-20 13:07:53 -04:00
Patrick Barron
7d9d54d2ec Fix profile images. 2020-05-20 12:09:52 -04:00
Patrick Barron
3eeb6576d8 Migrate User DB to EF Core 2020-05-20 10:04:00 -04:00
Patrick Barron
aca7e221d8 Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
#	Emby.Server.Implementations/ApplicationHost.cs
#	Emby.Server.Implementations/Devices/DeviceManager.cs
#	Jellyfin.Server/Jellyfin.Server.csproj
#	Jellyfin.Server/Migrations/MigrationRunner.cs
#	MediaBrowser.Controller/Devices/IDeviceManager.cs
2020-05-15 17:20:07 -04:00
Patrick Barron
87c63e668c
Merge branch 'master' into activitydb-efcore 2020-05-14 21:16:43 +00:00
Patrick Barron
b94afc597c Address review comments 2020-05-14 17:13:45 -04:00
Mark Monteiro
2e09311a93
Merge branch 'master' into websocket 2020-05-14 11:08:08 -04:00
Patrick Barron
a8f0d0aa0d
Merge branch 'master' into activitydb-efcore 2020-05-13 19:06:04 +00:00
Patrick Barron
c1360a1dc3 Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Entities/User.cs
#	Jellyfin.Data/ISavingChanges.cs
#	Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
#	Jellyfin.Server.Implementations/JellyfinDb.cs
#	Jellyfin.Server/Migrations/MigrationRunner.cs
#	MediaBrowser.Model/Notifications/NotificationOptions.cs
#	MediaBrowser.sln
2020-05-12 22:22:20 -04:00
Patrick Barron
9ad839c776 Initial migration code 2020-05-12 22:10:35 -04:00
Patrick Barron
6379391f87
Merge branch 'master' into activitydb-efcore 2020-05-12 16:08:28 +00:00
Mark Monteiro
dc5165b97f Merge branch 'master' into simplify-https-config 2020-05-10 14:43:57 -04:00
artiume
3e14b1b50f
Remove ogg video mimetype 2020-05-07 15:58:20 -04:00
Bond-009
62da4d0e5c
Merge pull request #2492 from Polpetta/fix-api-private-data-leak
Fix emby/user/public API leaking sensitive data
2020-05-07 14:52:10 +02:00
Davide Polonio
5c6339d8fd
Fix typo in PublicUserDto
Co-authored-by: Vasily <JustAMan@users.noreply.github.com>
2020-05-07 09:14:00 +02:00
Davide Polonio
57cf19f058 Fix variable declaration and follow sonarcloud suggestions 2020-05-06 17:25:41 +02:00
dkanada
cd07bc23f8
Merge pull request #3050 from Artiume/patch-1
Update MimeTypes.cs
2020-05-06 21:56:45 +09:00
artiume
1388464329
Update MimeTypes.cs 2020-05-06 08:23:56 -04:00
artiume
1058c80a41
Update MediaBrowser.Model/Net/MimeTypes.cs 2020-05-06 07:45:40 -04:00
artiume
0aff46631f
Update MediaBrowser.Model/Net/MimeTypes.cs
Co-authored-by: dkanada <dkanada@users.noreply.github.com>
2020-05-06 07:38:19 -04:00
Mark Monteiro
432aae0fcc Add missing comma 2020-05-05 11:17:03 -04:00
artiume
183514ebe2
add azw3 2020-05-05 07:25:32 -04:00
artiume
25651362bf
Update MimeTypes.cs 2020-05-04 12:13:50 -04:00
artiume
675cbd8a16
Update MimeTypes.cs 2020-05-03 18:23:25 -04:00
Patrick Barron
032de931b1 Migrate activity db to EF Core 2020-05-02 18:32:22 -04:00
Bond_009
15634a1913 Merge branch 'master' into websocket 2020-05-02 00:54:04 +02:00
Bond_009
7659a2ab32 Remove ListHelper extensions 2020-05-01 16:48:33 +02:00
Bond-009
690fb65cd8
Merge pull request #2985 from sparky8251/prometheus
Add Prometheus exporters
2020-04-29 11:36:05 +02:00
Vasily
5922c35d69
Merge pull request #2920 from Bond-009/tests2
Add some simple tests
2020-04-29 12:17:01 +03:00
Mark Monteiro
57b5ec1d51 Remove unnecessary properties from SystemInfo response object
These properties do not provide any useful information to the client. The client would already have to have all this information in order to connect to the endpoint to retrieve it
2020-04-26 12:07:54 -04:00
Mark Monteiro
93649ad77b Merge remote-tracking branch 'upstream/master' into simplify-https-config 2020-04-26 11:44:42 -04:00
sparky8251
68c7a914c3 Added option to disable metrics collection and defaulted it to off 2020-04-26 11:28:17 -04:00
Bond-009
c0b3c11b2e
Merge pull request #2846 from jellyfin/azure
Remove requirement to build web during server builds
2020-04-22 00:17:44 +02:00
Mark Monteiro
c5f163293f Add <ProjectGuid> properties to all project files
This is required for SonarCloud analysis to run
2020-04-21 16:21:09 -04:00
Vasily
07143bcb68
Merge pull request #2466 from dkanada/plugin
Update plugin classes for nightly builds
2020-04-21 01:45:52 +03:00
Bond_009
7f4a229cd2 Add some simple tests 2020-04-20 10:18:12 +02:00
dkanada
e6ef680775 add code suggestions 2020-04-20 14:27:46 +09:00
dkanada
eda208e258
Merge pull request #2829 from Bond-009/warn19
Fix some warnings
2020-04-19 12:04:02 +09:00
randrey
2e10d385f0 Add mime type for .mpegts files. 2020-04-17 23:11:52 -07:00
randrey
156998dd83 Add mime types for ape and wv files. 2020-04-17 22:25:54 -07:00
Mark Monteiro
bcf1ef319a Update documentation for EnableUPnP 2020-04-17 00:27:18 -04:00
Mark Monteiro
c78413cf7c Disable UPnP by default 2020-04-16 22:41:19 -04:00
dkanada
cb2523e2ef merge branch master into plugin 2020-04-13 14:38:19 +09:00
Bond-009
3d611743ed
Merge pull request #2680 from mark-monteiro/remove-common-process
Remove CommonProcess and ProcessFactory
2020-04-11 20:30:20 +02:00
dkanada
bd55bdb4e3 merge branch master into plugin 2020-04-11 20:10:16 +09:00
dkanada
cbe1fe2c8f update description and overview for plugins 2020-04-11 20:00:32 +09:00
dkanada
2da5df6c25 add new property for version changelogs 2020-04-11 19:56:42 +09:00
dkanada
abb7ed9c35 rename target abi property 2020-04-11 19:54:33 +09:00
dkanada
78abbcc251 standardize plugin version and guid properties 2020-04-11 19:52:40 +09:00
dkanada
8e9aeb84b1 remove release channel from plugin classes 2020-04-11 19:33:36 +09:00