pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,434 Commits 28 Branches 75 Tags 1.3 GiB
Commit Graph

388 Commits

Author SHA1 Message Date
Andrew Rabert b4fdfb562d Merge pull request #700 from jellyfin/dev 
Dev sync
 2019-01-24 23:03:54 -05:00
Thomas Büttner 6a3ed5d519 Added macOS to the docker sudo exception 2019-01-24 16:24:00 +01:00
Thomas Büttner f2d0d1f646 Make the docker group check BSD compatible 2019-01-24 15:24:04 +01:00
Phallacy d6a729c119 parameterized ffmpeg and nssm stuff 2019-01-24 01:56:56 -08:00
Phallacy 4e7675e78f Updated Packaging Windows from Linux for parity 2019-01-24 01:42:34 -08:00
Thomas Büttner cc3b1e5cc8 Fix package build for fedora 2019-01-23 21:14:10 +01:00
Phallacy a30687a15a Quick fix to erroring build scripts and pulling the supported ffmpeg 2019-01-23 00:41:38 -08:00
Joshua Boniface 411139cd78 Update changelogs to add #666 2019-01-21 23:56:02 -05:00
Joshua Boniface 8d298e0e36 Update changelogs to remove #639, add #661, #54 2019-01-21 21:24:28 -05:00
Joshua Boniface e6b95db132 Add jellyfin-web#53 to changelogs 2019-01-21 16:34:53 -05:00
Joshua M. Boniface 571afa4fe2 Merge pull request #655 from joshuaboniface/local-web-branch 
Support trying local branches in submodule
 2019-01-21 13:28:40 -05:00
Joshua Boniface 42f2799d66 Add jellyfin-web#52 to changelogs 2019-01-21 13:25:26 -05:00
Joshua Boniface 384f867228 Update changelogs to include this PR 2019-01-21 12:57:46 -05:00
Joshua Boniface ff4cbfc6df Fix inconsistencies in changelogs 2019-01-21 00:02:56 -05:00
Joshua Boniface 73038ee3f7 Bump version to 10.1.0 2019-01-20 23:39:55 -05:00
Joshua Boniface 3320d4feeb Move dotnet to a per-platform dependency 2019-01-20 12:34:52 -05:00
Joshua Boniface daaa007fea Update YUM spec version 2019-01-19 18:57:14 -05:00
Joshua Boniface 0addc9ef46 Add mention of dependencies file per platform 2019-01-19 18:48:48 -05:00
Joshua Boniface 9f8b716f40 Add dependencies.txt entries for Docker builds 2019-01-19 18:45:29 -05:00
Joshua Boniface f952988fb3 Add new centralized build script and README 2019-01-19 18:10:54 -05:00
Joshua Boniface d42ef36bf9 Correct invalid changelog entry 2019-01-19 16:44:55 -05:00
Erwin de Haan c5430f86b0 Fixed csproj and xml identation. 2019-01-19 15:01:16 +01:00
Erwin de Haan d116efe1f7 Merge branch 'dev' into reformat 2019-01-18 17:04:01 +01:00
Joshua Boniface b30d702782 Merge branch 'master' into dev 2019-01-15 22:29:22 -05:00
Erwin de Haan 49b61f238e Merge branch 'dev' into reformat 
# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
#	Emby.Server.Implementations/LiveTv/LiveTvManager.cs
#	Emby.Server.Implementations/Security/MBLicenseFile.cs
#	Emby.Server.Implementations/Security/PluginSecurityManager.cs
#	Emby.Server.Implementations/Security/RegRecord.cs
#	MediaBrowser.Api/PluginService.cs
#	MediaBrowser.Api/System/SystemService.cs
#	MediaBrowser.Common/Security/IRequiresRegistration.cs
#	MediaBrowser.Common/Security/ISecurityManager.cs
#	MediaBrowser.Common/Security/PaymentRequiredException.cs
#	MediaBrowser.Model/Entities/MBRegistrationRecord.cs
#	MediaBrowser.Model/Entities/PluginSecurityInfo.cs
#	deployment/win-generic/build-jellyfin.ps1
 2019-01-15 17:34:39 +01:00
Erwin de Haan 9b224d7080 Merged the two ARM platforms. To be split apart when a binary ffmpeg is required. 2019-01-13 23:43:12 +01:00
Erwin de Haan ca320ba7ac Sudo fix for debian and fedora. 2019-01-13 23:34:40 +01:00
Erwin de Haan d7b7be395b Moved ARM dockerfiles back to root. 2019-01-13 23:24:43 +01:00
Erwin de Haan 672013c23d Add TODO for netcore version upgrade. 2019-01-12 16:34:13 +01:00
Erwin de Haan b73d081bd2 Updated docker build script. 2019-01-12 15:56:06 +01:00
Erwin de Haan ba671569b4 Moved main docker file. 2019-01-12 15:54:52 +01:00
Erwin de Haan 2c65fe53f2 Enabled update-version in anticipation of the versioning PR. 2019-01-12 03:09:38 +01:00
Erwin de Haan 2c62f8dbd5 Renamed main script to be more correct for what it does. 2019-01-12 03:07:16 +01:00
Erwin de Haan 4b00b0cc87 Fixed fedora rpm build unexpected dependency on liblttng-ust. Fixed the docker builds and added manifest generation. 2019-01-12 03:04:36 +01:00
Erwin de Haan 74507099ad Added git submodules command. Converted RPM to build from local tree. Added all the execution bits to the build scripts. 2019-01-12 01:49:46 +01:00
Erwin de Haan 0bb08b3f8d Added debian bin folder. 2019-01-11 23:35:14 +01:00
Erwin de Haan 21098eb861 Moved rpm package and edited the package slightly, to build the project correctly. 2019-01-11 23:22:50 +01:00
Erwin de Haan 399a079dd4 Build scripts and build system consolidation. 
Squashed commit.
 2019-01-10 19:45:30 +01:00