cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-16 18:42:52 -07:00
Code Issues Packages Projects Releases Wiki Activity
1,543 Commits 20 Branches 82 Tags 1.3 GiB
24921ea0fb
Commit Graph

527 Commits

Author SHA1 Message Date
Luke Pulverenti
9553542875 incorporate ParentIndexNumber into audio sort order 2013-04-22 16:17:08 -04:00
Luke Pulverenti
a55e151054 parse budget and revenue from xml 2013-04-22 13:35:42 -04:00
Luke Pulverenti
6ef9fd9513 #182 - Eliminate duplicates in the selection list for max rating in user screen 2013-04-22 12:04:54 -04:00
Luke Pulverenti
4c69edebe0 fixes #180 - Deleting users doesn't remove all associated data. 2013-04-22 11:46:23 -04:00
Luke Pulverenti
fa53ad940f Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2013-04-22 11:38:52 -04:00
Luke Pulverenti
47d2a11bdf #182 - Eliminate duplicates in the selection list for max rating in user screen 2013-04-22 11:38:38 -04:00
Eric Reed
49cc12c4f5 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2013-04-22 11:27:23 -04:00
Eric Reed
8aa9a5ec63 Removed culture-specific procesing. tmdb appears to have unified their vote average format. #133 2013-04-22 11:26:56 -04:00
Luke Pulverenti
374b7f2f03 new Artist entity 2013-04-22 00:38:03 -04:00
Luke Pulverenti
19d21a246d made Audio.Artist plural and removed duplicated of artists into the people collection 2013-04-20 21:02:16 -04:00
Luke Pulverenti
58c77529d2 removed superfluous GetMemoryStream 2013-04-20 18:19:55 -04:00
Luke Pulverenti
de038ac029 faster progress reporting during library scan 2013-04-19 16:43:09 -04:00
Luke Pulverenti
eb612bd303 fixed db disposals 2013-04-19 16:27:02 -04:00
Luke Pulverenti
6c1bfe661b tighter control of shortcuts 2013-04-19 14:03:21 -04:00
Luke Pulverenti
32bc545a85 removed unused attributes 2013-04-18 15:57:28 -04:00
Luke Pulverenti
a8d8c598ca fixes #161 - Images not being displayed (correctly) in Views in DashBoard 2013-04-18 11:56:50 -04:00
Luke Pulverenti
dea10e5040 Capture revenue and add it as a sort order 2013-04-18 09:54:38 -04:00
Luke Pulverenti
7aa9e10821 fixes #152 - Gallery Images – some show, others don’t 2013-04-17 18:30:20 -04:00
Luke Pulverenti
a90e925ec6 fixes #144 - Marking a boxset as viewed doesn't mark the individual titles of the set as viewed 2013-04-16 23:37:14 -04:00
Luke Pulverenti
0fc6158500 more task reduction 2013-04-15 16:33:43 -04:00
Luke Pulverenti
b838c53017 reduce uses of Task.Run 2013-04-15 15:09:27 -04:00
Luke Pulverenti
2b8b98b590 reduce scanning overhead a bit 2013-04-15 14:45:58 -04:00
Luke Pulverenti
30d6e2cd6c made library scan a bit more conservative 2013-04-15 11:10:12 -04:00
Luke Pulverenti
650016ef62 added BaseGame 2013-04-15 00:03:11 -04:00
Luke Pulverenti
4260ebeb4e support box, menu & screenshot images 2013-04-14 17:44:54 -04:00
Luke Pulverenti
95b1bfb0de fixed people images being occasionally incorrect 2013-04-14 16:47:09 -04:00
Luke Pulverenti
07d8649f97 avoid guest star/actor dupes 2013-04-14 11:03:12 -04:00
Luke Pulverenti
d792fa4359 fixes #139 - 'Undefined' Library 2013-04-14 07:57:22 -04:00
Luke Pulverenti
7f1fdbf223 add GuestStar distinction 2013-04-13 19:43:41 -04:00
Luke Pulverenti
cdd1a03299 implemented filtering of ibn items based on like/dislike/favorite 2013-04-13 17:49:16 -04:00
Luke Pulverenti
5231cab777 added ability to mark IBN items as favorites 2013-04-13 15:24:34 -04:00
Luke Pulverenti
785deff188 removed excess hashing in providers and made user data key-based 2013-04-13 14:02:30 -04:00
Luke Pulverenti
b25fd4296c display new fields on person page 2013-04-12 14:22:40 -04:00
Luke Pulverenti
b789550a56 Added budget as a sort order 2013-04-12 10:32:04 -04:00
Luke Pulverenti
192e1676a4 Added Budget, EndDate, HomePageUrl, ProductionLocations, 2013-04-12 10:13:47 -04:00
Luke Pulverenti
ff1db0a173 resharper suggestions in controller project 2013-04-10 11:56:36 -04:00
Luke Pulverenti
7806ccd42f resharper suggestions in common project 2013-04-10 11:38:23 -04:00
Luke Pulverenti
ff6867b816 extract chapter images from single file blurays 2013-04-09 22:44:58 -04:00
Luke Pulverenti
dba8c8d230 fixed getitembyclientid 2013-04-09 20:41:04 -04:00
Luke Pulverenti
4dc1eb59c0 Add more to media info display 2013-04-09 15:38:19 -04:00
Luke Pulverenti
fe645c5cad centralize page size value 2013-04-09 12:42:55 -04:00
Luke Pulverenti
43d9cea6c4 Media Thumbs (not chapters) (#127) 2013-04-09 08:50:51 -04:00
Luke Pulverenti
29818f8cbf fixes Dvd Chapter Thumbs (#126) 2013-04-09 08:31:18 -04:00
Luke Pulverenti
cfe2c8f1b1 Only grab dvd files from the same title 2013-04-08 12:45:30 -04:00
Luke Pulverenti
804115bf8d remove and/or delay unnecessary startup work 2013-04-08 11:55:53 -04:00
Luke Pulverenti
f5620c81be removed unneeded startup processes 2013-04-07 18:09:48 -04:00
Luke Pulverenti
cb39f8e7b5 extracted a media encoding interface to keep ffmpeg out of nuget packages 2013-04-07 16:55:05 -04:00
Luke Pulverenti
d14c3b31ff break from chapter extraction once one fails 2013-04-06 20:27:33 -04:00
Luke Pulverenti
9c7f492e2c fixed an issue with the video image provider requiring two-pass refreshing 2013-04-05 21:03:38 -04:00
Luke Pulverenti
23c8a91976 moved display preferences repo off of the kernel 2013-04-05 15:48:01 -04:00
Luke Pulverenti
31c2d98532 Added a display preferences manager 2013-04-05 15:34:33 -04:00
Luke Pulverenti
4986722c73 made display preferences uniquely identifiable 2013-04-05 15:02:48 -04:00
Luke Pulverenti
1bf4b6110d Get/Set DisplayPreferences separately through the api 2013-04-05 13:10:55 -04:00
Luke Pulverenti
6cefbdcdbf fixes #101 - Subtitles for TV 2013-04-05 11:57:51 -04:00
Luke Pulverenti
dbcb62e462 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2013-04-05 11:22:10 -04:00
Eric Reed
4e9d4c44c7 Fix blank mbid for not found albums #106 2013-04-05 11:15:53 -04:00
Luke Pulverenti
70377c71cc removed Publishers 2013-04-05 11:13:23 -04:00
Luke Pulverenti
2d7c0ab29c updated ffmpeg 2013-04-05 01:07:12 -04:00
Luke Pulverenti
60e0f4d955 fixes #111 2013-04-05 01:03:50 -04:00
Luke Pulverenti
d1be0b31a2 Added publishers to BaseItem 2013-04-05 00:13:59 -04:00
Luke Pulverenti
5ba769f3b4 #79 - Music Image Extraction 2013-04-05 00:13:41 -04:00
Luke Pulverenti
0bc542b191 fixed issue of UserRootFolders never getting persisted 2013-04-05 00:12:35 -04:00
Luke Pulverenti
980620f290 made Images virtual 2013-04-05 00:12:05 -04:00
Luke Pulverenti
3314a0f69a #105 - MusicAlbum items give no PrimaryImage in API when one exists 2013-04-05 00:10:23 -04:00
Luke Pulverenti
cb6170712d #74 - Subtitle font 2013-04-04 15:34:50 -04:00
Luke Pulverenti
6e957cc0b0 added new video filters 2013-04-04 11:22:39 -04:00
Luke Pulverenti
d889cf1f57 remove library copying when setting up a custom library. we'll add a separate button to do it later. 2013-04-04 00:50:06 -04:00
Luke Pulverenti
cab2e13ae2 adjusted tile text spacing 2013-04-03 18:45:04 -04:00
Luke Pulverenti
4ba4d8d040 record level during media analysis 2013-04-03 08:03:37 -04:00
Luke Pulverenti
fa884f3fea #62 - File locking problem in cache 2013-04-02 22:59:27 -04:00
Luke Pulverenti
e2562879d8 Moved userdata to user manager to resolve concurrency issues. must delete userdata and displaypreferences db files. 2013-04-02 15:25:16 -04:00
Luke Pulverenti
b4dd8a2106 moved displaypreferences to usermanager to solve concurrency issues 2013-04-02 13:37:49 -04:00
Luke Pulverenti
9f06eb781f fixes #97 and creates a library dictionary cache to avoid FindById recursion 2013-03-31 13:39:28 -04:00
Luke Pulverenti
8f7981b6a6 getting started sorting in the dashboard 2013-03-29 01:45:21 -04:00
Luke Pulverenti
c415b6afa6 removed duplicate resource pool 2013-03-28 18:47:54 -04:00
Luke Pulverenti
3ff23530e7 comments 2013-03-28 18:08:04 -04:00
Luke Pulverenti
5c460c0b6f Moved search placeholder 2013-03-28 18:00:58 -04:00
Luke Pulverenti
67df3be368 removed extra lock 2013-03-28 15:27:34 -04:00
Luke Pulverenti
5422b14533 improve library scan progress reporting 2013-03-28 15:25:36 -04:00
Luke Pulverenti
680200864f try to avoid timeouts by increasing our default, and lower movie db concurrency 2013-03-28 14:47:58 -04:00
Eric Reed
d89df344e4 Fix stray assignment of remote image url in Series provider 2013-03-28 10:17:08 -04:00
Luke Pulverenti
31bb5b5cb3 removed udp server layer 2013-03-27 18:13:46 -04:00
Luke Pulverenti
f9a1feecbf updated ffmpeg 2013-03-27 00:16:01 -04:00
Eric Reed
c309ff653a Inherit ratings for episodes and seasons from series 2013-03-26 20:28:07 -04:00
Luke Pulverenti
521ec49361 adjust simultaneous image extractions 2013-03-23 01:27:55 -04:00
Luke Pulverenti
8db212f6bf #77 - Thumbnail Extraction Speed up 2013-03-23 00:37:58 -04:00
LukePulverenti
33a3f620e6 display pending installations on dashboard home 2013-03-20 17:17:47 -04:00
LukePulverenti
e25258e1c0 moved playback event args object 2013-03-20 12:54:32 -04:00
LukePulverenti
679143cffb populate last played value 2013-03-20 11:13:51 -04:00
LukePulverenti
9ecd2bbf91 #70 - TV library not being displayed 2013-03-20 10:06:22 -04:00
LukePulverenti
bd094311f0 updated servicestack to 3.9.40 2013-03-18 16:40:15 -04:00
LukePulverenti
cf61ac0264 fixed client type display for ios. also fixed display preferences saving. 2013-03-17 23:10:21 -04:00
LukePulverenti
bae89ee824 fix duplicate connections on the dashboard 2013-03-16 12:41:49 -04:00
LukePulverenti
4d083b618d restored request logging 2013-03-16 01:52:33 -04:00
Eric Reed
ab29ffd715 Remove testid from BaseItem 2013-03-15 15:13:22 -04:00
Eric Reed
c02ac2a8ca Manage some items as single instance throughout #54 2013-03-15 15:08:49 -04:00
LukePulverenti
2af33416a7 #22 - Need to strip html tags from overviews 2013-03-14 21:40:24 -04:00
Eric Reed
65303c8816 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2013-03-14 16:25:17 -04:00
Eric Reed
89e6124a5d Backout non persistence of virtual folders. Doesn't address the real issue. 2013-03-14 16:24:48 -04:00
LukePulverenti
08f0ba8335 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2013-03-14 15:53:03 -04:00
LukePulverenti
fe1834e6be Add resume capability to GetTempFile 2013-03-14 15:52:53 -04:00
Eric Reed
0ce5fc7799 Try not saving virtual folders in repository 2013-03-14 15:44:08 -04:00
Eric Reed
a82fc184d5 Fix exception in LastfmBaseProvider.cs 2013-03-14 15:31:52 -04:00
LukePulverenti
178859e0bd #11 - Image change in Trailer folder is only picked up on server start 2013-03-13 22:13:32 -04:00
LukePulverenti
00e0e44398 don't try to extract images if a video doesn't have any known video streams 2013-03-13 21:24:43 -04:00
LukePulverenti
ff55da9029 switch authentication to sha1 2013-03-13 01:19:03 -04:00
LukePulverenti
da89c337a8 #22 - missing from last checkin 2013-03-12 22:13:58 -04:00
LukePulverenti
9afd1741e0 #22 - Need to strip html tags from overviews 2013-03-12 22:10:43 -04:00
LukePulverenti
37d27ec0c3 #22 - Need to strip html tags from overviews 2013-03-12 18:53:04 -04:00
LukePulverenti
0cc0fbbe43 #22 - Need to strip html tags from overviews 2013-03-12 18:49:45 -04:00
LukePulverenti
b92db91a43 updated ffmpeg 2013-03-12 15:17:46 -04:00
LukePulverenti
d4797820db revised the framerate fix 2013-03-12 12:18:26 -04:00
LukePulverenti
33c8de1ecd Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2013-03-12 11:18:00 -04:00
LukePulverenti
1b47be2d1f check parsed floats for NaN in media info providers 2013-03-12 11:17:43 -04:00
Eric Reed
23a72fc74c Fix some date problems in lastfm providers 2013-03-12 10:27:37 -04:00
Eric Reed
806b8b2fe6 Needed more work on #22 strip html tags from overviews 2013-03-12 10:09:29 -04:00
LukePulverenti
3f44324623 Added LibraryManager.Search 2013-03-12 00:26:23 -04:00
LukePulverenti
cb189e7394 fixes #22 - Need to strip html tags from overviews 2013-03-12 00:09:31 -04:00
LukePulverenti
76dbab939c fixes #15 - SortRemoveWords config change not working 2013-03-11 21:46:46 -04:00
LukePulverenti
f010d032ed remove unused api properties 2013-03-11 08:26:27 -04:00
LukePulverenti
c7d2b3a407 updated ffmpeg. cleaned up some unused api properties 2013-03-10 15:44:36 -04:00
LukePulverenti
b1be6f1d73 minor namespace changes in the model 2013-03-10 00:36:39 -05:00
LukePulverenti
31d079f1ba unified the two sorting api's 2013-03-09 23:22:36 -05:00
LukePulverenti
913cb3c564 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2013-03-09 20:18:37 -05:00
LukePulverenti
937e434ab6 moved the javascript apiclient to it's own repo and nuget package 2013-03-09 20:18:29 -05:00
Eric Reed
51e11eb3e3 Only run ffprobe on local content 2013-03-09 15:27:35 -05:00
Eric Reed
13e6819ddd Check location type in CreateResolveArgs 2013-03-09 10:11:06 -05:00
LukePulverenti
ca5acb6edc more commenting for api docs 2013-03-09 00:15:51 -05:00
LukePulverenti
ad0ec70433 removed IsRecentlyPlayed option and fixed FileTime warnings 2013-03-08 11:45:35 -05:00
LukePulverenti
dbf6081a9b Add PrimaryImageAspectRatio to user dto 2013-03-08 11:40:01 -05:00
LukePulverenti
9911df11e8 extracted provider manager. took more off the kernel 2013-03-08 00:08:27 -05:00
LukePulverenti
4f67fc4aef removed base kernel and ikernel 2013-03-07 00:34:00 -05:00
LukePulverenti
c320434719 trimmed IPluginConfigurationPage 2013-03-05 18:11:20 -05:00
Eric Reed
b27cad2618 LastfmAlbumProvider 2013-03-05 11:48:17 -05:00
Eric Reed
d433ea5bf9 Add FanArtAlbumProvider 2013-03-05 10:45:59 -05:00
Eric Reed
09ec5670aa Add premier date to artist 2013-03-05 10:45:25 -05:00
LukePulverenti
176d090164 removed plugin configuration pages from the kernel 2013-03-04 23:34:00 -05:00
LukePulverenti
bf9e24502c extracted an installation manager interface 2013-03-04 23:25:27 -05:00
LukePulverenti
4c725e69a8 added swagger api docs 2013-03-04 22:34:02 -05:00
Eric Reed
4c46258763 Have FanArtArtistProvider retrieve album covers 2013-03-04 18:24:41 -05:00
Eric Reed
2e17667593 Simplified classes and add local saving/processing of artist meta 2013-03-04 15:03:36 -05:00
Eric Reed
b7a6a1d574 Refactor art download options (still need config changes) 2013-03-04 11:09:15 -05:00
Eric Reed
c1eb5a3b60 Move lastfm resource pool to base 2013-03-04 10:33:54 -05:00
Eric Reed
669eeed8cf Fix up providers from internal changes 2013-03-04 10:13:03 -05:00
Eric Reed
b4ca3a7ad9 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 
Conflicts:
	MediaBrowser.Controller/Providers/FanartBaseProvider.cs
	MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs
 2013-03-04 09:43:29 -05:00
Eric Reed
67b20fdf0f Initial FanArtArtistProvider 2013-03-04 09:34:00 -05:00
LukePulverenti
9cdda84b06 updated plugin security 2013-03-04 01:06:38 -05:00
LukePulverenti
a11e00b8d5 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 
Conflicts:
	MediaBrowser.Common/Kernel/ResourcePool.cs
 2013-03-04 00:44:04 -05:00
LukePulverenti
2ca4b7d03a Created IConfigurationManager 2013-03-04 00:43:06 -05:00
Eric Reed
d7cdf06326 First cut at LastfmArtistProvider 2013-03-03 20:46:06 -05:00
Eric Reed
de878025e6 Incremental LastfmArtistProvider 2013-03-03 15:55:30 -05:00
Eric Reed
77c894d228 Some stuff that doesn't need to be in LastfmBase 2013-03-03 12:47:03 -05:00
Eric Reed
cff5cd9503 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2013-03-03 12:07:44 -05:00
Eric Reed
a8683132a7 Create LastfmBaseProvider 2013-03-03 12:07:13 -05:00
LukePulverenti
e36467f651 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2013-03-03 11:54:09 -05:00
LukePulverenti
54a36322bb made base video resolver available for re-use 2013-03-03 11:53:58 -05:00
Eric Reed
2f258687fd Cosmetic touch-ups in MovieDbProvider.cs 2013-03-03 11:05:17 -05:00
LukePulverenti
ac3a94f5a1 moved resolvers to implementations, trimmed nuget package a bit 2013-03-03 01:58:04 -05:00
LukePulverenti
1ffc19a9a0 update loading sequence 2013-03-02 22:28:47 -05:00
LukePulverenti
0ea90ef7c6 added IServerEntryPoint to replace plugin.initialize 2013-03-02 21:47:04 -05:00
LukePulverenti
72051998e7 fix provider logging messages 2013-03-02 12:59:15 -05:00
LukePulverenti
e8f5fade43 Created an ItemsByName query dto 2013-03-02 02:16:52 -05:00
LukePulverenti
7bca933af0 added the beginning of a service stack abstraction 2013-03-01 21:44:46 -05:00
LukePulverenti
56a7fd6f23 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2013-03-01 16:22:50 -05:00
LukePulverenti
fe3323a492 fixes around http response caching, updated the mb icon in the dashboard, and isolated web socket events 2013-03-01 16:22:34 -05:00
Eric Reed
e3b42ad59e Remove archive extraction from PackageManager 
It is no longer needed as the installer does this
 2013-03-01 15:42:44 -05:00
LukePulverenti
af7aa597c3 referenced core plugins, fixed some dashboard issues, extracted library manager 2013-02-28 14:32:41 -05:00
LukePulverenti
94b6168e27 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2013-02-27 16:07:59 -05:00
LukePulverenti
4d71fc1d42 remvoed CO uninstall project 2013-02-27 16:07:51 -05:00
ScottIsAFool
acfca8e65a Dlls only copied to nuget folder when in Release configuration 2013-02-27 20:47:34 +00:00
LukePulverenti
ff4ee7ab9c combined usermanager and userdata manager 2013-02-27 15:25:45 -05:00
Eric Reed
e15ff541c6 Move actual installation to PackageManager 2013-02-27 08:34:24 -05:00
Eric Reed
340280edf2 Partial implementation of PackageManager 2013-02-27 07:49:55 -05:00
LukePulverenti
511328edf9 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2013-02-26 23:19:11 -05:00
LukePulverenti
3751e14eb1 restored audio 2013-02-26 23:19:05 -05:00
Eric Reed
4b2cf29fe1 Move SecurityManager to BaseKernel/IKernel 2013-02-26 17:19:45 -05:00
Eric Reed
1925288a86 Extract ISecurityManager interface 2013-02-26 17:14:08 -05:00
Eric Reed
c555920fe7 Move RemovePlugin to BaseKernel/IKernel 2013-02-26 16:53:45 -05:00
Eric Reed
4c1c717824 Move ResourcePools to BaseKernel/IKernel 2013-02-26 16:48:43 -05:00
Eric Reed
8956f6ff4a Move ResourcePool to common 2013-02-26 16:40:18 -05:00
Eric Reed
0c8d924bfc Extract IInstallationManager interface 
first step to moving update logic to common
 2013-02-26 15:21:55 -05:00
LukePulverenti
170154df18 assembly consolidation 2013-02-26 15:07:06 -05:00
LukePulverenti
0f1ec5b586 fix log window setting 2013-02-26 12:21:18 -05:00
LukePulverenti
6efd22a3d2 added a shutdown api method, font size fix and other decouplings 2013-02-26 11:10:55 -05:00
LukePulverenti
2d06095447 plugin security fixes and other abstractions 2013-02-25 22:43:04 -05:00
LukePulverenti
28ccfb1bd1 extracted httpclient dependancy 2013-02-24 19:13:45 -05:00
LukePulverenti
5b1eea558a Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 2013-02-24 16:54:01 -05:00
LukePulverenti
8ce3e74e81 More DI 2013-02-24 16:53:54 -05:00
Eric Reed
ad8855d447 Update PluginSecurity.dll 
Didn't want to change the interface so just implemented internally
 2013-02-24 13:02:20 -05:00
LukePulverenti
6c86721f6d placeholder for plugin security fix 2013-02-23 17:44:42 -05:00
LukePulverenti
2e4db75540 extracted http server, web socket server and udp server dependancies 2013-02-23 17:31:51 -05:00
LukePulverenti
465f0cc1e2 moved some network code to the networking assembly 2013-02-23 12:54:51 -05:00
LukePulverenti
b8d5c71842 type discovery without attributes 2013-02-23 02:57:11 -05:00
LukePulverenti
c165f37bb9 more dependancy injection. still just beginning 2013-02-22 22:49:00 -05:00
LukePulverenti
57cb08085d fix broken images 2013-02-22 20:24:04 -05:00
LukePulverenti
6a5bf9cc78 extracted more interfaces 2013-02-22 19:44:20 -05:00
LukePulverenti
84507736a0 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser 
Conflicts:
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Api.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.ApiInteraction.Javascript.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.Sqlite.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.Server.WorldWeatherOnline.dll
	MediaBrowser.ServerApplication/CorePlugins/MediaBrowser.WebDashboard.dll
 2013-02-22 19:26:38 -05:00
LukePulverenti
a2d215b6ae added simple injector for dependancy management 2013-02-22 19:24:50 -05:00
ScottIsAFool
83b7b18614 Set the Common, Controller, Model, UI and UI.Controls to go into one folder, set nuspec files up for the packages to make it easier to create nuget packages. 2013-02-22 19:22:39 +00:00
LukePulverenti
8b3e8ad478 created IWebSocketListener 2013-02-22 10:16:48 -05:00