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
Mark Monteiro
757643e326
Merge remote-tracking branch 'upstream/master' into no-more-doppelgangers
2020-05-15 15:23:44 -04:00
Mark Monteiro
6e68702799
Do not run DELETE command if no extras are detected
...
Also log a message if no extras were detected
Also log the path used for the database backup
Also add some comments to explain the migration
2020-05-15 15:12:26 -04:00
Vasily
43dc604e87
Fixed compilation, added backing db before removing extras
2020-05-15 21:49:45 +03:00
Patrick Barron
79dee27299
Fixed indentation
2020-05-15 14:33:36 -04:00
Vasily
034fe97eeb
Apply suggestions from code review
...
Co-authored-by: Mark Monteiro <marknr.monteiro@protonmail.com>
2020-05-15 21:32:56 +03:00
Patrick Barron
a7c2e524a9
Apply more review suggestions
2020-05-15 14:09:15 -04:00
Patrick Barron
a5dee36808
Apply more review suggestions
2020-05-15 12:51:18 -04:00
Vasily
7c57134535
Implement a cleanup migration
2020-05-15 02:30:28 +03: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
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
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
Bond_009
15634a1913
Merge branch 'master' into websocket
2020-05-02 00:54:04 +02: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
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
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
Bond-009
d744d7d234
Merge branch 'master' into register-services-correctly
2020-04-22 13:05:03 -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
Mark Monteiro
f815059698
Merge remote-tracking branch 'upstream/master' into register-services-correctly
2020-04-20 20:11:33 -04:00
Mark Monteiro
51b610b999
Expose some methods in Program.cs so they can be used to initialize the application for integration tests
2020-04-20 14:58:00 -04:00
Mark Monteiro
ecf49caf0d
Add back warning message when Skia encoder cannot be used
2020-04-17 10:25:49 -04:00
Mark Monteiro
1666f3ca14
Use dependency injection to construct migration routines
2020-04-16 23:40:32 -04:00
ZadenRB
bb288e16cc
Document JSON options change
2020-04-15 17:02:43 -06:00
ZadenRB
72862d7b46
Lowercase actual parameters in code and remove whitespace to comply with StyleCopAnalyzers
2020-04-15 00:24:15 -06:00
