809 Commits

Author SHA1 Message Date
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
9925742918 Implement more review suggestions 2020-05-13 17:55:31 -04:00
Patrick Barron
a8f0d0aa0d
Merge branch 'master' into activitydb-efcore 2020-05-13 19:06:04 +00:00
Patrick Barron
511d20a100 Apply review suggestions 2020-05-13 15:03:35 -04:00
Vasily
f08830ea00
Merge pull request #2774 from mark-monteiro/simplify-https-config
Simplify HTTPS Properties
2020-05-13 20:36:54 +03:00
Patrick Barron
b7621d762c 2nd half of changes 2020-05-13 00:00:57 -04: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
bac4bf96a0 Fix build errors 2020-05-12 12:50:17 -04:00
Patrick Barron
6379391f87
Merge branch 'master' into activitydb-efcore 2020-05-12 16:08:28 +00:00
Bond-009
dabd67d127
Merge pull request #2900 from mark-monteiro/migration-dependency-injection
Use dependency injection to construct migration routines
2020-05-11 10:15:35 +02:00
Mark Monteiro
a10aec6956 Fix merge 2020-05-10 18:17:12 -04:00
Mark Monteiro
dc5165b97f Merge branch 'master' into simplify-https-config 2020-05-10 14:43:57 -04:00
crobibero
2b1b9a64b6 Add OperationId to SwaggerGen 2020-05-08 08:40:37 -06:00
dkanada
176159d0a8
Merge pull request #2969 from BaronGreenback/my-feature
http in development mode crashed -
2020-05-07 02:24:42 +09:00
BaronGreenback
ba2134de13 Made changes to message and exception class 2020-05-06 16:04:07 +01:00
Mark Monteiro
1c06111497 Merge remote-tracking branch 'upstream/master' into integration-tests 2020-05-03 01:04:19 -04:00
Patrick Barron
032de931b1 Migrate activity db to EF Core 2020-05-02 18:32:22 -04:00
Neil Burrows
b737301c70 Auto discover published URL override 2020-05-02 17:56:09 +01:00
Bond_009
15634a1913 Merge branch 'master' into websocket 2020-05-02 00:54:04 +02:00
crobibero
806ae1bc07 Remove versioned API 2020-04-29 08:04:05 -06:00
Cody Robibero
d491b1b45f
Merge branch 'api-migration' into redoc 2020-04-29 07:38:18 -06:00
dkanada
2cb0f6f126
Merge pull request #2952 from crobibero/api-exception-middleware
Add Exception Middleware
2020-04-29 22:36:41 +09:00
Bond-009
690fb65cd8
Merge pull request #2985 from sparky8251/prometheus
Add Prometheus exporters
2020-04-29 11:36:05 +02:00
sparky8251
e3a42a8fe9 Address reviews 2020-04-27 08:42:46 -04:00
crobibero
068368df63 Order actions by route, then http method 2020-04-26 23:28:32 -06:00
Mark Monteiro
679f97d5e9 Merge remote-tracking branch 'upstream/master' into simplify-https-config
Also reverts conflicting changes made in https://github.com/jellyfin/jellyfin/pull/2798
2020-04-26 17:37:30 -04:00
Joshua M. Boniface
f502c89331
Merge pull request #2798 from JustAMan/fix-livetv-again
Make localhost LiveTV restreams always use plain HTTP port
2020-04-26 15:13:27 -04:00
BaronGreenback
a0a5512069 2969 - re-issed code to address when developer doesn't have certificate installed. 2020-04-26 19:35:36 +01: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
sparky8251
997b71bbef Metrics endpoint now respects baseurl 2020-04-26 11:52:01 -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
sparky8251
233337256f Add prometheus exporters 2020-04-25 21:36:03 -04:00
crobibero
890e659cd3 Fix autolaunch & redirect of swagger. 2020-04-25 15:12:18 -06:00
crobibero
0765ef8bda Apply suggestions, fix warning 2020-04-23 21:41:10 -06:00
crobibero
b8508a57d8 oop 2020-04-23 21:38:40 -06:00
crobibero
be50fae38a Address comments 2020-04-23 21:24:40 -06:00
crobibero
3c34d95608 Address comments 2020-04-23 21:23:29 -06:00
Mark Monteiro
cd98938190 Merge remote-tracking branch 'upstream/master' into integration-tests 2020-04-23 19:32:40 -04:00
Admin
d1684b1053 http in development mode crashed - 2020-04-23 18:30:48 +01:00
crobibero
c6eebca335 Apply suggestions and add URL to log message 2020-04-23 07:29:28 -06:00
Bond-009
d744d7d234 Merge branch 'master' into register-services-correctly 2020-04-22 13:05:03 -04:00
crobibero
041d674eb6 Fix swagger ui Document Title 2020-04-21 16:19:26 -06: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
crobibero
2542a27bd5 Fix documentation endpoint for use with baseUrl 2020-04-21 16:15:31 -06: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
crobibero
3ef8448a51 Return to previous exception handle implementation 2020-04-21 09:09:05 -06:00