Luke Pulverenti 02aee9dc90 fix merge conflict		2015-11-20 23:57:11 -05:00
..
Activity
Branding
Channels	fix merge conflict	2015-11-20 23:57:11 -05:00
Collections	update timeline view	2015-11-14 11:58:01 -05:00
Configuration
Connect
Devices	update timeline view	2015-11-14 11:58:01 -05:00
Dto	update cinema mode on/off setting	2015-11-19 00:19:54 -05:00
EntryPoints	added new parent methods	2015-11-11 09:56:31 -05:00
FileOrganization	Fix exception when episode title is null	2015-11-01 19:35:36 +01:00
HttpServer	fixes #1248 - Browsing to /web/ causes error	2015-11-14 14:09:49 -05:00
Intros	update cinema mode text	2015-11-19 00:22:57 -05:00
IO	added new parent methods	2015-11-11 09:56:31 -05:00
Library	update views	2015-11-18 00:49:20 -05:00
LiveTv	mix merge conflicts	2015-11-20 23:55:26 -05:00
Localization	update translations	2015-11-19 21:54:33 -05:00
Logging
MediaEncoder
News
Notifications
Persistence	update views	2015-11-18 00:49:20 -05:00
Photos	update timeline view	2015-11-14 11:58:01 -05:00
Playlists	added new parent methods	2015-11-11 09:56:31 -05:00
Properties
ScheduledTasks	update ffmpeg	2015-11-11 10:46:30 -05:00
Security
ServerManager
Session	added new parent methods	2015-11-11 09:56:31 -05:00
Social
Sorting
Sync	sync with master	2015-11-20 22:07:44 -05:00
TV	added new parent methods	2015-11-11 09:56:31 -05:00
Udp
UserViews	reduce image processing	2015-11-09 13:18:37 -05:00
app.config
MediaBrowser.Server.Implementations.csproj	update translations	2015-11-19 21:54:33 -05:00
packages.config	update translations	2015-11-19 21:54:33 -05:00
ServerApplicationPaths.cs