Commit Graph

4832 Commits

Author SHA1 Message Date
Luke Pulverenti
55a726cdef Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts:
	MediaBrowser.Common.Implementations/Archiving/ZipClient.cs
	MediaBrowser.Model/IO/IZipClient.cs
2014-12-28 23:13:03 -05:00
Luke Pulverenti
c9bf564c45 change zip extraction to resolve osx issue 2014-12-28 21:50:02 -05:00
Luke Pulverenti
726cf9697a sync updates 2014-12-28 12:59:40 -05:00
Luke Pulverenti
5278959ede sync fixes 2014-12-28 01:21:39 -05:00
Luke Pulverenti
7bce2e04b6 sync updates 2014-12-27 17:52:41 -05:00
Luke Pulverenti
0840bb9ba2 move web socket classes to server project 2014-12-27 13:06:32 -05:00
Luke Pulverenti
52caa0def1 sync updates 2014-12-27 01:24:46 -05:00
Luke Pulverenti
55b9bffabc added optional SeasonUserData 2014-12-27 00:08:39 -05:00
Luke Pulverenti
2e53ff1fd0 move files out of common 2014-12-26 14:34:39 -05:00
Luke Pulverenti
0ec3d217e7 sync updates 2014-12-26 12:45:06 -05:00
Luke Pulverenti
36577ac42e sync updates 2014-12-24 01:28:40 -05:00
Luke Pulverenti
381aa7adc5 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2014-12-23 10:58:38 -05:00
Luke Pulverenti
bade42783c added in-app help 2014-12-22 23:53:52 -05:00
Luke Pulverenti
42b1416602 begin work on daily episodes 2014-12-22 22:58:14 -05:00
Luke Pulverenti
fef1d16cec fix user policy serialization 2014-12-22 02:00:40 -05:00
Luke Pulverenti
498b58aad0 added content type selection 2014-12-22 01:50:29 -05:00
Luke Pulverenti
98ae564226 add transcode temp path migration 2014-12-21 20:02:15 -05:00
Luke Pulverenti
97ae93fe5e add standalone EncodingOptions 2014-12-21 14:40:37 -05:00
Luke Pulverenti
74520804f8 start on content type setting 2014-12-21 13:58:17 -05:00
Luke Pulverenti
659128073e update translations 2014-12-21 11:50:03 -05:00
Luke Pulverenti
e5e39e8e56 add metadata editor info endpoint 2014-12-21 00:57:06 -05:00
Luke Pulverenti
7b0306dce7 update to jstree 3.0.8 2014-12-20 20:23:56 -05:00
Luke Pulverenti
0a8291d39b resolve search returning missing episodes 2014-12-20 13:59:10 -05:00
Luke Pulverenti
34be2effa1 fix movie db season retrieval 2014-12-20 13:58:55 -05:00
Luke Pulverenti
c4e2158145 fix metascore itemfield 2014-12-20 13:56:32 -05:00
Luke Pulverenti
8807e80d0a start using user policy 2014-12-20 01:06:27 -05:00
Luke Pulverenti
e55ab989d2 add more sync buttons 2014-12-18 23:20:07 -05:00
Luke
a7f2bc5fda Merge pull request #956 from MediaBrowser/dev
3.0.5464.40000
2014-12-17 17:42:31 -05:00
Luke Pulverenti
e3484bdcc2 3.0.5464.40000 2014-12-17 17:39:17 -05:00
Luke Pulverenti
3763f7d912 resolve update check errors 2014-12-17 00:52:34 -05:00
Luke Pulverenti
13274348e9 sync updates 2014-12-17 00:30:31 -05:00
Luke Pulverenti
febaab13bf re-enable sync 2014-12-16 01:05:28 -05:00
Luke Pulverenti
999f2e03f4 3.0.5463.3000 2014-12-16 00:49:10 -05:00
Luke Pulverenti
7b4c2ec334 improve extra resolution 2014-12-16 00:46:54 -05:00
Luke Pulverenti
3c48def0d7 sync updates 2014-12-16 00:01:57 -05:00
Luke Pulverenti
7f7d2f85e3 display sync targets 2014-12-15 00:49:04 -05:00
Luke Pulverenti
e92e036574 add new sync methods 2014-12-15 00:16:23 -05:00
Luke Pulverenti
ed31b883f4 Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser 2014-12-14 15:01:57 -05:00
Luke Pulverenti
1c1336ac08 beta fixes 2014-12-14 15:01:26 -05:00
Luke
e490223ebc Merge pull request #955 from MediaBrowser/master
merge from master
2014-12-14 01:15:00 -05:00
Luke
89fcb0a902 update mac project to 3.0.5462.0 2014-12-14 00:42:41 -05:00
Luke
524293ea79 Merge pull request #954 from MediaBrowser/dev
3.0.5462.0
2014-12-14 00:38:07 -05:00
Luke Pulverenti
9df9723fa8 3.0.5462.0 2014-12-14 00:32:20 -05:00
Luke Pulverenti
afa808c3bf update translations 2014-12-14 00:23:04 -05:00
Luke Pulverenti
06b1896d8b xbox one dlna server fix 2014-12-13 19:42:22 -05:00
Luke Pulverenti
aecb8fb41f Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2014-12-13 19:42:03 -05:00
Luke
ff32d54b61 Merge pull request #953 from HurricaneHernandez/dev
Fixing dllmap entry for libwebp, needed version in so name.
2014-12-13 19:10:46 -05:00
Luke
00da34b90a Merge pull request #952 from HurricaneHernandez/master
Adding version number to so name of libwebp for dllmap.
2014-12-13 19:10:42 -05:00
HurricaneHernandez
76e23f88da Adding version number to so name of libwebp for dllmap, there is no unversion version of libwebp available. 2014-12-13 17:02:26 -07:00
HurricaneHernandez
b9e908d6fe Fixing dllmap entry for libwebp, needed version in so name. 2014-12-13 16:58:19 -07:00