Commit Graph

4614 Commits

Author SHA1 Message Date
Luke
e470e9c8af Merge pull request #947 from SvenVandenbrande/master
Removed max from Pre & Post padding minutes
2014-11-12 21:27:42 -05:00
Sven Van den brande
b3c0ab8694 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/livetvnewrecording.html
	MediaBrowser.WebDashboard/dashboard-ui/livetvseriestimer.html
	MediaBrowser.WebDashboard/dashboard-ui/livetvtimer.html
2014-11-12 19:21:14 +01:00
Luke Pulverenti
4f5c768704 added more card layouts 2014-11-11 23:51:40 -05:00
Sven Van den brande
cbd2c2fc54 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2014-11-11 23:15:20 +01:00
Luke Pulverenti
0dfac392e7 dlna genre images 2014-11-10 23:26:53 -05:00
Luke Pulverenti
1fea9ad926 fixes #945 - Add genre views to dlna 2014-11-10 22:41:55 -05:00
Luke Pulverenti
4d0a47e555 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2014-11-09 23:20:28 -05:00
Luke Pulverenti
95eaf88abd fixes #943 - Add web client filtering by genres, parental ratings, tags and years 2014-11-09 23:20:11 -05:00
Luke
a85ec965ba Merge pull request #942 from HurricaneHernandez/docker
Updated README for Docker.
2014-11-09 20:40:38 -05:00
Luke Pulverenti
1a80362a0f created common startup project for mono & windows 2014-11-09 13:24:57 -05:00
Luke Pulverenti
40897bac14 fixes #941 - Rework password recovery and remove IsLocal checks 2014-11-08 22:18:14 -05:00
Luke Pulverenti
0ef95fb19c check in missing files 2014-11-08 10:05:38 -05:00
Luke Pulverenti
9be4e12d00 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2014-11-07 22:50:20 -05:00
Luke Pulverenti
86e733978e 3.0.5424.1 2014-11-07 22:50:11 -05:00
Luke Pulverenti
9b47ae2530 3.0.5424.1 2014-11-07 20:15:30 -05:00
Luke
44a7825294 Merge pull request #940 from MrAnks/master
Update MainStartup.cs
2014-11-07 17:37:45 -05:00
Luke Pulverenti
d9bdfb9daa update sqlite 2014-11-07 17:37:10 -05:00
Luke Pulverenti
cc9a624647 update sqlite 2014-11-07 14:07:41 -05:00
Luke Pulverenti
db71076764 add sqlite interops 2014-11-07 11:39:19 -05:00
Luke Pulverenti
4351d0672e update release build configurations 2014-11-07 11:28:15 -05:00
Luke Pulverenti
7ad0293567 update sqlite references 2014-11-07 11:15:02 -05:00
MrAnks
3d76afc1ec Update MainStartup.cs
Updated based on feedback.  Best to keep everything consistent.
2014-11-07 15:38:04 +00:00
MrAnks
360f4e5cbd Update MainStartup.cs
Hide the start up splash screen if nosplash is given as a command line parameter.
2014-11-07 15:31:21 +00:00
Luke Pulverenti
7fc4a3d418 3.0.5424.0 2014-11-07 09:56:07 -05:00
Luke Pulverenti
fba1ed8062 update sqlite osx 2014-11-06 19:16:16 -05:00
Luke Pulverenti
4ef688e432 update osx ffmpeg 2014-11-05 20:32:36 -05:00
Luke Pulverenti
b5842f9f19 rework build scripts 2014-11-05 14:28:41 -05:00
Luke Pulverenti
ccb4e58519 3.0.5421 2014-11-04 22:41:14 -05:00
Luke Pulverenti
4a04483445 throw errors on null arguments 2014-11-04 18:50:26 -05:00
Luke Pulverenti
0df202e397 update connect login 2014-11-04 17:43:02 -05:00
Luke Pulverenti
60d3f47503 add server management to web client 2014-11-04 07:41:12 -05:00
Luke Pulverenti
7ca1cd8795 upgrade to jquery mobile 1.4.5 2014-11-02 22:38:43 -05:00
Luke Pulverenti
7a4d5b7951 3.0.5416.0 2014-10-31 00:57:24 -04:00
Luke Pulverenti
a32fd710a9 add library access to new user page 2014-10-29 22:06:05 -04:00
Luke Pulverenti
b1c9b224c4 add server id to dto's 2014-10-29 21:17:31 -04:00
Luke Pulverenti
45a01563e8 fix nuget targets 2014-10-29 19:03:58 -04:00
Luke Pulverenti
1d11741b57 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2014-10-29 18:02:52 -04:00
Luke Pulverenti
e33244d797 improve user view images 2014-10-29 18:01:02 -04:00
Eric Reed
6e3203bd58 Change Linking to Transfer 2014-10-29 11:19:06 -04:00
Luke Pulverenti
5eec770ae2 update translations 2014-10-28 20:13:12 -04:00
Luke Pulverenti
5ca4d60c34 connect updates 2014-10-28 19:17:55 -04:00
Luke Pulverenti
67528a0799 update connect scripts 2014-10-27 17:45:50 -04:00
Luke Pulverenti
3ccb6bddef connect updates 2014-10-26 23:06:01 -04:00
Luke Pulverenti
b5212f94a9 separate device script 2014-10-26 20:19:52 -04:00
Luke Pulverenti
68ed1be0ac Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2014-10-25 14:34:08 -04:00
Luke Pulverenti
d74e3b2dea connect updates 2014-10-25 14:32:58 -04:00
Luke
eba3e2bd57 Merge pull request #938 from HurricaneHernandez/docker
Docker
2014-10-24 18:33:28 -04:00
HurricaneHernandez
e01f932f4b Merge remote-tracking branch 'upstream/master' into docker 2014-10-24 16:12:24 -06:00
Luke Pulverenti
c8a735bcb1 add LocalFileInfo.Id 2014-10-24 00:54:35 -04:00
Luke Pulverenti
5a5b48feff added new cabac value 2014-10-23 00:26:01 -04:00