Commit Graph

13773 Commits

Author SHA1 Message Date
Vasily
bca7a26ffd
Merge branch 'master' into update_tvdb 2019-02-20 14:46:07 +03:00
Vasily
60df855b26
Merge pull request #930 from fruhnow/AuthorizationCheck
checking user-permission in GetQueryResult
2019-02-20 14:42:35 +03:00
Vasily
44ed037e73
Merge pull request #950 from cvium/replace_priority_queue
Replace OptimizedPriorityQueue source with NuGet reference
2019-02-20 14:39:52 +03:00
Vasily
50ce7572b4
Merge pull request #851 from Bond-009/appdata
Simplify code to get data dir
2019-02-20 14:31:01 +03:00
Vasily
74695428fe
Merge pull request #914 from Bond-009/httppostedfile
Separate HttpPostedFile into it's own file
2019-02-20 13:33:42 +03:00
Claus Vium
139807719c Add missing base64 conversion 2019-02-20 11:09:10 +01:00
Claus Vium
1e2050f106 Rename functions to match functionality 2019-02-20 11:09:10 +01:00
Claus Vium
a23f04623e Remove IEncryptionManager 2019-02-20 11:09:06 +01:00
Claus Vium
1f30a50f4a Address review comments 2019-02-20 11:03:04 +01:00
Phallacy
098de6b050 made newlines into linux newlines 2019-02-20 01:17:30 -08:00
Phallacy
a0d31a49a0 merging with master to clear merge conflict 2019-02-20 00:46:13 -08:00
Phallacy
6bbb968b57 minor changes and return to netstandard 2019-02-20 00:00:26 -08:00
Joshua M. Boniface
6c6e9ca9f2
Merge pull request #889 from Bond-009/xmlex
Fix uncaught xml error
2019-02-19 21:31:16 -05:00
Joshua M. Boniface
89d4ce309d
Merge pull request #848 from Bond-009/perf
Minor changes to reduce allocations
2019-02-19 21:24:51 -05:00
Joshua M. Boniface
b43317c5e1
Merge pull request #830 from Bond-009/update
Removed remaining self-update code
2019-02-19 21:21:36 -05:00
Torsten
5917e91447 Merge https://github.com/jellyfin/jellyfin into populate-extras 2019-02-19 23:21:40 +01:00
Torsten
9753a76905 Populate video extras again 2019-02-19 22:41:25 +01:00
Bond-009
d978ae1996
Merge pull request #948 from cvium/revert_movie_matching
Revert movie matching
2019-02-19 16:31:01 -05:00
Claus Vium
6016a27736 Check for whitespace 2019-02-19 22:30:21 +01:00
Vasily
24b76dbed8
Merge pull request #936 from EraYaN/fix-drone-abi-tests
Fixed the assemblynames for compatibility check in drone.
2019-02-20 00:22:09 +03:00
Claus Vium
dab25a0eeb Remove OptimizedPriorityQueue source and grab it from nuget 2019-02-19 21:17:30 +01:00
Claus Vium
566646ad8b Remove limit comment 2019-02-19 19:44:22 +01:00
Claus Vium
6c1ca6f737 Remove arbitrary limit and minor style fixes 2019-02-19 19:33:41 +01:00
Claus Vium
aa0c20afd5 Revert "Change multi version logic for movies"
This reverts commit a4055779f6.
2019-02-19 17:39:47 +01:00
Claus Vium
46acff4113 Revert "Remove unnecessary ToList"
This reverts commit 42abb5a993.
2019-02-19 17:39:30 +01:00
Claus Vium
de5c0bab70 Revert "Add Year to the new VideoInfo"
This reverts commit 05ad2e9b3f.
2019-02-19 17:39:10 +01:00
Claus Vium
5181427234 Revert "Merge pull request #924 from cvium/fix_movie_matching"
This reverts commit f274d024ce, reversing
changes made to 4b4399fba6.
2019-02-19 17:34:43 +01:00
Claus Vium
c79324154f Revert "Merge pull request #933 from cvium/fix_movie_matching_again"
This reverts commit 77d4fec6eb, reversing
changes made to f274d024ce.
2019-02-19 17:10:11 +01:00
Felix Ruhnow
53beebc774 switching logging to serilog convention according to pr comments 2019-02-19 12:17:28 +01:00
Felix Ruhnow
ba003e06ef adressing pr comments 2019-02-19 12:09:39 +01:00
Felix Ruhnow
1d631540ac adressing pr comments 2019-02-19 12:06:50 +01:00
Joshua Boniface
3ed9d32f68 Rename Windows scripts folder 2019-02-18 22:07:53 -05:00
Joshua Boniface
3ecfd1fdd1 Rename framework to portable 2019-02-18 22:07:12 -05:00
Joshua Boniface
24574d4964 Rename MacOS build 2019-02-18 22:06:44 -05:00
Joshua Boniface
512ab8c6aa Remove unneeded Linux builds 2019-02-18 22:06:06 -05:00
Erwin de Haan
029bafdf9c Changed build name template and limited number of parallel jobs. 2019-02-19 03:16:17 +01:00
Erwin de Haan
0849c4a447 Switched to dotnet based execution again because of permissions. 2019-02-19 03:12:53 +01:00
Erwin de Haan
5238ba5d8f Fix tool extraction search pattern. 2019-02-19 03:07:44 +01:00
Erwin de Haan
6b1a64652f Fix path for naming, and add extra CopyFIle Task. 2019-02-19 02:59:56 +01:00
Erwin de Haan
9961c8c459 No full publish of artifacts. 2019-02-19 02:55:10 +01:00
Erwin de Haan
18418b6892 Fixed secondary Artifact paths and Debug config. 2019-02-19 02:50:25 +01:00
Erwin de Haan
d4bc7b5a5a Fix NuGet task name. 2019-02-19 02:42:42 +01:00
Erwin de Haan
e2d0f67077 Fix the conditions. 2019-02-19 02:32:36 +01:00
Erwin de Haan
5ef63e738d Added final stage and removed triggers. 2019-02-19 02:28:16 +01:00
Erwin de Haan
7bbcb455c0 Added compat checking to YAML 2019-02-19 02:17:57 +01:00
Erwin de Haan
2ad54cd09d Fixed the assemblynames from drone since, the namespaces do not line up (yet). 2019-02-19 01:18:49 +01:00
Erwin de Haan
7c9803e135 Update azure-pipelines.yml for Azure Pipelines 2019-02-18 23:47:31 +01:00
Erwin de Haan
480999e8e6 Update azure-pipelines.yml for Azure Pipelines 2019-02-18 23:42:24 +01:00
Erwin de Haan
ef17ec700b Update azure-pipelines.yml 2019-02-18 23:24:39 +01:00
Erwin de Haan
4b34b0cfea Merge branch 'azure-pipelines' of https://github.com/EraYaN/jellyfin into azure-pipelines 2019-02-18 23:03:14 +01:00