Mark McDowall 89082ea94e Fixed merge conflict

2013-06-07 08:44:27 -07:00

..

.idea

fixed FileSizeCell, template helper.

2013-06-07 07:34:54 -07:00

AddSeries

added placeholder image for missing posters.

2013-06-06 20:53:05 -07:00

Calendar

Calendar moved to layout

2013-06-06 22:34:32 -07:00

Commands

…

Content

Calendar moved to layout

2013-06-06 22:34:32 -07:00

Episode

fixed FileSizeCell, template helper.

2013-06-07 07:34:54 -07:00

Form

…

History

…

Instrumentation

…

JsLibraries

…

Logs

…

Missing

System icon is a laptop now

2013-06-06 20:29:35 -07:00

Mixins

…

Quality

…

Release

…

Series

Added trakt/imdb links to series details

2013-06-07 08:43:58 -07:00

Settings

…

Shared

Fixed merge conflict

2013-06-07 08:44:27 -07:00

app.js

…

Config.js

…

Controller.js

Calendar moved to layout

2013-06-06 22:34:32 -07:00

favicon.ico

…

Index.html

Calendar moved to layout

2013-06-06 22:34:32 -07:00

MainMenuView.js

…

RouteBinder.js

RouteBinder will open external links in new tab

2013-06-07 08:43:59 -07:00

Routing.js

…