Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-30 03:22:41 -04:00
Code Issues Packages Projects Releases Wiki Activity
9,510 Commits 20 Branches 107 Tags
f8a248ffd805b810e90bc5ec0619e53f49ebcae5
Commit Graph

9510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luke Pulverenti f8a248ffd8 fix merge conflict 2016-10-17 12:32:48 -04:00
Luke Pulverenti 734d215940 3.0.8100 2016-10-13 17:20:36 -04:00
Luke 3f438cdf7b Merge pull request #2232 from MediaBrowser/beta 
Beta
 2016-10-13 17:19:50 -04:00
Luke Pulverenti 94ddbfd57f fix merge conflict 2016-10-13 17:19:38 -04:00
Luke 1c169b5b40 Merge pull request #2231 from MediaBrowser/dev 
update images
 2016-10-13 17:14:17 -04:00
Luke Pulverenti e206725b73 update images 2016-10-13 17:13:30 -04:00
Luke Pulverenti 91e877a88e 3.1.188 2016-10-13 14:45:32 -04:00
Luke 61030bb109 Merge pull request #2230 from MediaBrowser/dev 
fix playlist deletion
 2016-10-13 14:44:51 -04:00
Luke Pulverenti b9c430059a fix playlist deletion 2016-10-13 14:43:47 -04:00
Luke 2ef130260c Merge pull request #2229 from MediaBrowser/dev 
update translations
 2016-10-13 11:44:32 -04:00
Luke cf15c194ae Merge pull request #2228 from MediaBrowser/dev 
Dev
 2016-10-13 11:07:57 -04:00
Luke Pulverenti 2095170eed update live tv screens 2016-10-13 11:07:21 -04:00
Luke Pulverenti cc6b8f44d1 update RecordingStatus 2016-10-12 17:01:35 -04:00
Luke Pulverenti e1f953d517 update mac project 2016-10-12 15:50:30 -04:00
Luke 3f7f33bd51 update mac project 2016-10-12 15:49:26 -04:00
Luke Pulverenti 673e2c9d0f Merge branch 'master' of https://github.com/MediaBrowser/Emby 2016-10-12 15:44:48 -04:00
Luke Pulverenti 3aabe6aa19 3.0.8000 2016-10-12 15:44:06 -04:00
Luke 25ef9777ca Merge pull request #2224 from MediaBrowser/beta 
Beta
 2016-10-12 15:43:28 -04:00
Luke Pulverenti 0677d4ec99 fix merge conflict 2016-10-12 15:43:19 -04:00
Luke Pulverenti c25179473b 3.0.8000 2016-10-12 15:41:20 -04:00
Luke Pulverenti 54cf4cbb44 fix merge conflict 2016-10-12 15:40:19 -04:00
Luke Pulverenti 0fcceecaf6 fix merge conflicts 2016-10-12 15:39:01 -04:00
Luke 5be6cf05e3 Merge pull request #2226 from MediaBrowser/dev 
update mac project
 2016-10-12 15:35:49 -04:00
Luke cc54e0b710 update mac project 2016-10-12 15:35:11 -04:00
Luke 94d8ce5d7b Merge pull request #2225 from MediaBrowser/dev 
Dev
 2016-10-12 15:32:20 -04:00
Luke 1ce693ab4e update mac solution 2016-10-12 15:31:40 -04:00
Luke bab06848dd update mac project 2016-10-12 15:28:11 -04:00
Luke Pulverenti 1f1da49c29 update mac project 2016-10-12 15:26:28 -04:00
Luke Pulverenti 5f16d862d3 fix merge conflit 2016-10-12 15:14:26 -04:00
Luke dbc0aa4064 Merge pull request #2223 from MediaBrowser/dev 
update images
 2016-10-12 14:51:18 -04:00
Luke Pulverenti 4d80124d2e 3.1.187 2016-10-12 14:32:51 -04:00
Luke a6f0ceb78b Merge pull request #2222 from MediaBrowser/dev 
update playlist content
 2016-10-12 14:32:22 -04:00
Luke Pulverenti 038b11702e update playlist content 2016-10-12 14:23:09 -04:00
Luke Pulverenti b802a6320e 3.1.186 2016-10-11 17:39:06 -04:00
Luke 2abad94e21 Merge pull request #2220 from MediaBrowser/dev 
update live stream sharing
 2016-10-11 17:38:44 -04:00
Luke Pulverenti 2c6fc11dcf update live stream sharing 2016-10-11 17:33:38 -04:00
Luke Pulverenti 31c4a0e6af 3.1.185 2016-10-11 02:51:25 -04:00
Luke 88150e461c Merge pull request #2219 from MediaBrowser/dev 
Dev
 2016-10-11 02:47:51 -04:00
Luke Pulverenti d54f03514d Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev 2016-10-11 02:47:08 -04:00
Luke Pulverenti d5b5c8e1a5 update display of active recordings 2016-10-11 02:46:59 -04:00
Luke d1f213dbf5 Merge pull request #2218 from hatharry/dev 
add retry to service restart
 2016-10-11 00:46:07 -04:00
hatharry d6862cefd8 Merge branch 'dev' of https://github.com/hatharry/Emby.git 2016-10-11 17:21:21 +13:00
hatharry 91225bc968 add retry to service restart 2016-10-11 17:18:32 +13:00
hatharry 9b0ac4bde5 Merge pull request #28 from MediaBrowser/dev 
Dev
 2016-10-11 17:10:00 +13:00
Luke Pulverenti 9aab559331 3.1.184 2016-10-10 14:25:12 -04:00
Luke ebdb0753a1 Merge pull request #2217 from MediaBrowser/dev 
Dev
 2016-10-10 14:19:06 -04:00
Luke Pulverenti cb26cb9457 update program queries 2016-10-10 14:18:28 -04:00
Luke Pulverenti d6310048ed 3.1.183 2016-10-09 03:22:29 -04:00
Luke dbf1e2c27e Merge pull request #2216 from MediaBrowser/dev 
Dev
 2016-10-09 03:20:21 -04:00
Luke Pulverenti daaae69df5 add playback of in-progress recordings 2016-10-09 03:18:43 -04:00