denise
|
71526a94cc
|
Merge branch 'cc-4961-show-linking'
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
|
2013-04-29 15:35:16 -04:00 |
denise
|
a9b5d00d87
|
CC-4961: Show linking
|
2013-04-18 16:12:26 -04:00 |
Martin Konecny
|
d46fef8eda
|
SAAS-301: Calendar content indicator did not update automatically after adding content to a show
-fixed
|
2013-04-11 15:11:20 -04:00 |
Martin Konecny
|
3714f83757
|
Merge branch '2.3.x'
|
2013-04-11 15:06:21 -04:00 |
Martin Konecny
|
3000f543d8
|
SAAS-301:
Calendar content indicator did not update automatically after adding content to a show
-fixed
|
2013-04-11 15:04:16 -04:00 |
Martin Konecny
|
0da0e798c6
|
make password input width same as text input width. Also make everything a little wider.
|
2013-04-10 18:19:46 -04:00 |
denise
|
418bf0b5ff
|
Created calendar service and moved the context menu creation there
|
2013-03-26 16:03:53 -04:00 |
denise
|
5b69761833
|
CC-4961: Show linking
Populate repeat show form correctly when a show is repeating monthly
on the same day of the week
|
2013-03-25 13:48:11 -04:00 |
denise
|
327d0dd6c9
|
CC-4961: Show linking
Add front-end for creating a show with monthly repeats on same day of week
|
2013-03-22 15:57:15 -04:00 |
denise
|
a7601d290f
|
CC-4961: Show linking
Refactored services
Removed ShowDaysService and ShowInstanceService
Combined all show actions into one ShowService
|
2013-03-21 10:05:11 -04:00 |
Martin Konecny
|
5ceeb88899
|
Merge branch '2.3.x' into devel
|
2013-03-06 13:46:01 -05:00 |
Martin Konecny
|
0ef1a5ffda
|
CC-4976: Cannot select Ogg/Vorbis output stream after selecting SHOUTcast then selecting Icecast
-fixed
|
2013-03-05 18:19:08 -05:00 |
Martin Konecny
|
943538ed9d
|
Revert "CC-4980: Create graphic with 4 switches for Airtime Dashboard"
This reverts commit baf693d1a9 .
|
2013-02-27 14:35:35 -05:00 |
Vladimir
|
baf693d1a9
|
CC-4980: Create graphic with 4 switches for Airtime Dashboard
|
2013-02-27 17:36:43 +01:00 |
denise
|
176e78632f
|
Added a comment about referring to the wiki when adding a new datatable column
|
2013-02-19 16:43:47 -05:00 |
denise
|
c8d7d23d62
|
CC-4963: Add cue in and cue out to smart block criteria list
Done
|
2013-02-19 16:38:58 -05:00 |
denise
|
959839e180
|
Renamed criteriaTypes to libraryColumnTypes for library advanced search
|
2013-02-19 15:09:24 -05:00 |
denise
|
32fc5eb758
|
CC-4951: Add cue in and cue out to library filter columns
Configured advanced search for these columns
|
2013-02-19 14:44:32 -05:00 |
denise
|
8bdf3508b0
|
CC-4951: Add cue in and cue out to library filter columns
Done
|
2013-02-19 13:38:35 -05:00 |
denise
|
49dc3140a8
|
CC-4962: Library -> Library and playlist editor have different heights sometimes
Fixed: needed to set height when we open the playlist editor
|
2013-02-19 11:59:17 -05:00 |
denise
|
14f1d5572f
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2013-02-19 10:59:03 -05:00 |
denise
|
d1301ff676
|
CC-4954: Please make Library page remember the status per user
-done
|
2013-02-19 10:58:48 -05:00 |
Naomi
|
542553bbc1
|
Merge branch '2.3.x' into devel
|
2013-02-15 17:05:36 -05:00 |
Naomi
|
9a2b8af7b1
|
Revert "CC-4955: Datatables saves its parameters twice on every page load"
This reverts commit 39ec07e71c .
|
2013-02-15 16:50:43 -05:00 |
Martin Konecny
|
09baf3a47d
|
remove unecessary file + better error handling
|
2013-02-15 14:19:04 -05:00 |
Martin Konecny
|
39ec07e71c
|
CC-4955: Datatables saves its parameters twice on every page load
-fixed
|
2013-02-15 14:18:32 -05:00 |
Martin Konecny
|
4f3ea3f406
|
Update ColReorder Datatables plugin
|
2013-02-14 17:48:32 -05:00 |
Martin Konecny
|
b30f67b24b
|
CC-4950: builder-feed is called twice on NowPlaying screen load
|
2013-02-14 15:49:38 -05:00 |
denise
|
e2e45b0160
|
CC-4948: Library -> library loses have its width when window is resized
-fixed
|
2013-02-14 15:34:11 -05:00 |
denise
|
1a36953d82
|
CC-4898: Pressing "Enter" from anywhere on the edit metadata popup should automatically Save and close the popup
-fixed
|
2013-02-14 14:52:48 -05:00 |
Martin Konecny
|
58740d6b41
|
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
|
2013-02-14 13:33:27 -05:00 |
Martin Konecny
|
b3ab84db2e
|
add minified datatables.js and upgrade from 1.9.1 to 1.9.4
|
2013-02-14 13:33:18 -05:00 |
denise
|
9e0d14a8a7
|
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
|
2013-02-14 13:31:39 -05:00 |
denise
|
1b5b7ae1f7
|
Stopped refetching calendar events when calendar is resized
|
2013-02-14 13:31:22 -05:00 |
Martin Konecny
|
bb7e56e39e
|
CC-4943: Raspberry Pi optimization: don't create new background AJAX request until the previous one has returned
-fixed
|
2013-02-14 12:58:31 -05:00 |
denise
|
cd5f1149af
|
CC-4924: Calendar: "View Recorded File Metadata" for record show still uses old Metadata Editor
-fixed
|
2013-02-14 11:43:29 -05:00 |
denise
|
74291cc248
|
Merge branch 'cc-3627-close-playlist' into devel
|
2013-02-13 17:57:41 -05:00 |
denise
|
ec159131a8
|
Merge branch '2.3.x' into devel
|
2013-02-13 16:09:53 -05:00 |
denise
|
6bbb603bcd
|
CC-3627: PlaylistBuilder->Playlist Panel -> it would be very handy to have "Close playlist" functionality
|
2013-02-13 16:05:11 -05:00 |
denise
|
04ed640756
|
CC-3885: Deleted open playlist is not closed until a new item is added to it
-fixed
|
2013-02-13 15:44:52 -05:00 |
denise
|
eb38503d6e
|
CC-4946: Now Playing -> Apache error when empty show starts
-we were trying to update the is_scheduled flag on a non-schedule item
|
2013-02-13 11:51:25 -05:00 |
denise
|
4ff1e8e78a
|
CC-4932: Library -> Update Scheduled column on 'Cancel current show' action
-fixed
|
2013-02-13 11:29:43 -05:00 |
denise
|
30c47df93d
|
Audio preview wasn't working in Firefox when airtime is not in document root
|
2013-02-11 15:56:21 -05:00 |
denise
|
2315e3473d
|
CC-4935: Smart Block -> Error when saving sometimes
-fixed
|
2013-02-07 17:33:11 -05:00 |
denise
|
93017b8477
|
Added Greek datatables and plupload language files
Added Greek to locale db table
|
2013-02-07 16:43:24 -05:00 |
denise
|
525b2dcb33
|
CC-4895: Remove all json die() statements from code
- removed json_encode
|
2013-02-07 15:41:47 -05:00 |
denise
|
969e34aba1
|
CC-4930: Calendar -> Recorded shows have 'show partially filled' icon
-fixed
|
2013-02-07 12:22:32 -05:00 |
denise
|
532ea09eed
|
Added Polish datatables and plupload translation files
Added Polish to upgrade script and default data
|
2013-02-06 16:46:12 -05:00 |
Martin Konecny
|
d028e00cdb
|
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
|
2013-02-06 16:30:11 -05:00 |
Martin Konecny
|
38c75791f2
|
Merge branch 'devel' of https://github.com/sematuszewski/Airtime into 2.3.x
|
2013-02-06 16:29:20 -05:00 |