mirror of
https://github.com/Radarr/Radarr.git
synced 2024-09-11 12:02:35 +02:00
Merge from hell? Something from the past came back to haunt us
This commit is contained in:
parent
7ab1084437
commit
17e99958e1
@ -1,3 +0,0 @@
|
||||
.quality-size-item {
|
||||
padding-left: 10px;
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
"use strict";
|
||||
define(['app', 'Shared/ModalRegion', 'AddSeries/AddSeriesLayout',
|
||||
'Series/Index/SeriesIndexLayout', 'Upcoming/UpcomingCollectionView',
|
||||
'Series/Index/SeriesIndexLayout',
|
||||
'Calendar/CalendarCollectionView', 'Shared/NotificationView',
|
||||
'Shared/NotFoundView', 'MainMenuView',
|
||||
'Series/Details/SeriesDetailsView', 'Series/EpisodeCollection',
|
||||
@ -32,11 +32,6 @@ define(['app', 'Shared/ModalRegion', 'AddSeries/AddSeriesLayout',
|
||||
NzbDrone.mainRegion.show(new NzbDrone.AddSeries.AddSeriesLayout({action: action}));
|
||||
},
|
||||
|
||||
upcoming: function () {
|
||||
this._setTitle('Upcoming');
|
||||
NzbDrone.mainRegion.show(new NzbDrone.Upcoming.UpcomingCollectionView());
|
||||
},
|
||||
|
||||
calendar: function () {
|
||||
this._setTitle('Calendar');
|
||||
var calendarCollection = new NzbDrone.Calendar.CalendarCollection();
|
||||
|
@ -3,7 +3,6 @@ define([
|
||||
'app',
|
||||
'History/Collection',
|
||||
'Series/Index/Table/AirDateCell',
|
||||
'Shared/Toolbar/ToolbarView',
|
||||
'Shared/Toolbar/ToolbarLayout'
|
||||
],
|
||||
function () {
|
||||
|
@ -14,11 +14,10 @@
|
||||
<link href="/content/backbone.backgrid.filter.css" rel='stylesheet' type='text/css'/>
|
||||
<link href="/content/tablesorter.bootstrap.css" rel='stylesheet' type='text/css'/>
|
||||
<link href="/content/tablesorter.pager.css" rel='stylesheet' type='text/css'/>
|
||||
<link href="/content/toggle-switch.css" rel='stylesheet' type='text/css'/>
|
||||
<link href="/content/bootstrap.toggle-switch.css" rel='stylesheet' type='text/css'/>
|
||||
<link href="/AddSeries/addseries.css" rel='stylesheet' type='text/css'/>
|
||||
<link href="/content/menu.css" rel='stylesheet' type='text/css'/>
|
||||
<link href="/content/form.css" rel='stylesheet' type='text/css'/>
|
||||
<link href="/content/settings.quality.css" rel='stylesheet' type='text/css'/>
|
||||
<link href="/series/series.css" rel='stylesheet' type='text/css'/>
|
||||
|
||||
<link href="/content/base.css" rel='stylesheet' type='text/css'/>
|
||||
|
@ -11,8 +11,6 @@ require(['app', 'Controller'], function (app, controller) {
|
||||
'series/add' : 'addSeries',
|
||||
'series/add/:action(/:query)': 'addSeries',
|
||||
'series/details/:query' : 'seriesDetails',
|
||||
'upcoming' : 'upcoming',
|
||||
'upcoming/index' : 'upcoming',
|
||||
'calendar' : 'calendar',
|
||||
'settings' : 'settings',
|
||||
'settings/:action(/:query)' : 'settings',
|
||||
|
Loading…
Reference in New Issue
Block a user