denise
e8a2f23856
CC-84: Smart Playlists
...
- dynamically change modifier list depending on criteria type
- added extra text box for 'is in the range' modifier
2012-07-11 18:53:28 -04:00
denise
c27b886817
CC-84: Smart Playlists
...
-0-indexed form elements
2012-07-11 16:15:44 -04:00
denise
7358b00c81
CC-84: Smart Playlists
...
-disabled non-visible form elements
2012-07-11 15:18:47 -04:00
denise
5fb0364f2d
CC-84: Smart Playlists
...
-switched action names for static/dynamic
2012-07-11 11:57:13 -04:00
denise
1afe1e4d32
CC-84: Smart Playlists
...
-added in save/generate functionality in the UI
2012-07-11 11:50:40 -04:00
denise
4bed5e647e
CC-84: Smart Playlists
...
-moved smart_playlistbuilder.js into playlist folder
2012-07-11 10:45:24 -04:00
denise
4301a221b7
CC-84: Smart Playlists
...
-added in 'Add' and 'Remove' form elements functionality on the UI
2012-07-10 18:20:23 -04:00
denise
72dd48e33e
CC-84: Smart Playlists
...
-created form and view script
2012-07-10 15:25:29 -04:00
denise
0171212e9b
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-07-10 13:19:19 -04:00
denise
81eb751c9f
- shortened height on Add/Remove content dialog window
2012-07-10 13:19:03 -04:00
James
78acd4f805
CC-4093: Timeline -> Alert for deleting track(s) appears twice by clicking
...
context menu
- fixed
2012-07-10 13:08:36 -04:00
denise
e4fb42cbd0
CC-4027: In the Calendar view, please have a little play icon indicating the currently playing show.
...
-done
2012-07-06 15:26:51 -04:00
James
31f1d5879e
CC-4076: Library: make doubleclick trigger adding files to playlist/timeline
...
- done
2012-07-05 18:24:07 -04:00
James
f3fbaf89f5
CC-4076: Library: make doubleclick trigger adding files to playlist/timeline
...
- done
2012-07-05 18:23:34 -04:00
denise
bc93119adc
Merge branch '2.1.x' into devel
2012-07-04 09:46:30 -04:00
denise
87afea63bf
CC-4065: Timeline -> Cursor will disappear after a track is finished sometimes
...
-fixed
2012-07-03 18:22:48 -04:00
denise
598bf8942c
Merge branch '2.1.x' into devel
2012-07-03 14:57:16 -04:00
denise
f6d79b1f54
CC-4063: Timeline -> Add a track to a show will cause another show's cursor to be selected
...
-fixed
2012-07-03 14:52:27 -04:00
denise
2bf6d0e54e
Merge branch '2.1.x' into devel
2012-07-03 12:57:25 -04:00
denise
e11fe8a2b8
CC-4058: Timeline -> Cannot add song twice if last cursor is selected
...
-fixed
2012-07-03 12:42:53 -04:00
denise
bc569462ee
CC-4057: Calendar -> Add/Remove contents: Lost cursor after add contents to a show
...
-fixed
2012-07-03 11:48:57 -04:00
denise
3e75b28c9d
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
2012-07-03 10:42:29 -04:00
denise
46604fdf59
CC-4046: Timeline -> cannot drag and drog song into the posion between song's name and "show empty"
...
-fixed
2012-06-29 16:59:03 -04:00
denise
68420a898f
CC-4044: Timeline -> Cursor keeps highlight even if the song is played
...
-fixed
2012-06-29 15:49:22 -04:00
denise
335dd1516b
Merge branch '2.1.x' into devel
...
Conflicts:
python_apps/pypo/liquidsoap_scripts/ls_script.liq
2012-06-29 10:57:14 -04:00
denise
38cb439f53
CC-4036: Timeline -> A new Cursor will be selected when there are 2 shows and we add/delete items in timeline view
...
-fixed
2012-06-28 17:55:17 -04:00
denise
79513de1ba
CC-4035: Timeline -> Filter by show: please let the setting automatically takes effect without clicking the button out of the 'box'
...
-also added this functionality for the 'All my shows' checkbox
2012-06-28 17:07:01 -04:00
denise
61fc269b13
CC-4035: Timeline -> Filter by show: please let the setting automatically takes effect without clicking the button out of the 'box'
...
-done
2012-06-28 16:55:43 -04:00
denise
a603d67397
fixed indentation on schedule.js
2012-06-28 15:44:55 -04:00
denise
69eb80c5ac
CC-4000: Calendar -> Add/remove content -> Show / hide columns: the selector window will pop up at background sometimes
...
-fixed
2012-06-28 15:43:48 -04:00
denise
5427fbc083
CC-4033: Record show icon gets covered with soundcloud icons (soundcloud, progress, and error)
...
-done
2012-06-28 15:23:21 -04:00
denise
abc5b04045
fixed indentation
2012-06-28 14:02:57 -04:00
denise
0bc825947e
CC-3995: Media Library -> it takes too long time to switch page or select all from this page if set as displaying 100 item in Media Library.
...
-done
2012-06-28 11:44:30 -04:00
james
c4480a46b1
CC-4025: Suggest show colour in calendar automatically, based on show name
...
- done
2012-06-27 23:03:50 -04:00
denise
9fb9fb3219
CC-4021: Media Library -> "+" button wont take effect if uncheck one and check another
...
-fixed
2012-06-27 17:19:55 -04:00
denise
12bf42d2f1
CC-4031: Timeline cursor vanishes when every once in a while
...
-fixed
2012-06-27 15:50:56 -04:00
Martin Konecny
0a0e873ef9
CC-4019: Library: When "Add content" is clicked, "Proccessing" image …
...
-fix small comment typo
2012-06-27 11:50:31 -04:00
James
31d643cee1
CC-3997: Now Playing -> Time Line: different behaviour between 'delete'
...
button and 'delete' menu items
- added confirm box on clicking delete button on now playing table
- also added confirm box on library delete button as well
2012-06-26 17:43:15 -04:00
James
576c13963d
CC-3998: Now Playing -> Time Line: confirm message for user 'delete'
...
track by context menu is misleading
- fixed
2012-06-26 17:35:07 -04:00
James
c2cc4253b3
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-26 16:56:01 -04:00
James
9a14051f0b
CC-4019: Library: When "Add content" is clicked, "Proccessing" image is keep
...
flickering
- fixed
2012-06-26 16:55:43 -04:00
denise
d892a4b5ae
CC-4009: Calendar icon cannot be clicked twice without clicking another icon first
...
-fixed
2012-06-26 16:43:36 -04:00
denise
ca3d554c07
CC-3983: Timeline cursor in Now Playing vanishes after adding a file to a show
...
-empty cursorId array after every callback
2012-06-26 15:49:17 -04:00
denise
05fa673e42
CC-3983: Timeline cursor in Now Playing vanishes after adding a file to a show
...
-done
2012-06-26 15:36:45 -04:00
James
c669d3cb47
CC-3969: Reset Password: specifying wrong e-mail keeps you on the same page
...
without possibility to navigate back gracefully
- done
2012-06-20 18:02:46 -04:00
James
2480639e58
CC-3980: Excel export button in Playout History does not really export
...
Excel format
- removed xls option
2012-06-20 17:42:49 -04:00
James
5c43fa5a7b
CC-3978: Playout History table says Artist when it should say Creator
...
- fixed
2012-06-20 16:51:34 -04:00
James
3a32e7240a
CC-3984: Now Playing scissor and trashcan buttons are incorrectly labelled in
...
tooltips
- fixed
2012-06-20 16:49:41 -04:00
James
e40d9731a2
CC-3979: Playout History export should include date range in file and/or
...
filename
- fix
2012-06-20 16:47:11 -04:00
James
6a75fd6c76
CC-3979: Playout History export should include date range in file and/or
...
filename
- done
2012-06-20 16:35:34 -04:00
denise
b0e93005e5
Merge branch '2.1.x' into devel
2012-06-15 15:04:18 -04:00
denise
d02607ed94
CC-3561: Add button to automatically rescan watched folders.
...
-done
2012-06-15 12:16:19 -04:00
James
73a7a76078
Merge branch 'CC-3963' into 2.1.x
...
Conflicts:
airtime_mvc/public/js/airtime/preferences/streamsetting.js
2012-06-14 16:06:53 -04:00
denise
6b990f8712
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into devel
2012-06-14 13:45:14 -04:00
denise
295a8ea5fe
CC-3561: Add button to automatically rescan watched folders.
...
-done
2012-06-14 13:44:56 -04:00
denise
9cabd4d32c
CC-3921: Add mobile phone number field to user record
...
-done
2012-06-13 13:39:54 -04:00
James
4077858c8e
CC-3927: Should automatically switch back to Master/Show stream if there
...
is a connection interruption
- chaning label and description text
2012-06-13 12:46:26 -04:00
James
032637049d
CC-3952: Calendar: Create/Edit Show's End time manually and keep date picker
...
open, the change will not take effect
- fixed
2012-06-12 17:07:24 -04:00
denise
8b2353ede0
Merge branch '2.1.x' into devel
2012-06-12 15:49:18 -04:00
James
57397312f2
CC-3963: If DJ is scheduled to broadcast for show, then automatically
...
enable source when DJ connects.
- done
2012-06-12 15:38:03 -04:00
denise
df518fb03f
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-12 14:58:51 -04:00
denise
8a63478c73
CC-3972: it is not possible to select tracks in Now Playing tab
...
-fixed
2012-06-12 14:58:33 -04:00
Martin Konecny
22453f3820
CC-3968: Cannot preview file as * .MP3
...
-fixed
2012-06-12 11:31:10 -04:00
denise
d66ba4074c
Merge branch '2.1.x' into devel
2012-06-11 18:11:09 -04:00
denise
81c7eb7763
CC-3941: Overridden connection url in stream settings gets reverted back to default when 'Save' is clicked
...
-fixed
2012-06-11 18:08:36 -04:00
denise
1b057c8954
Merge branch '2.1.x' into devel
2012-06-11 16:49:03 -04:00
denise
ebaff793be
CC-3940: Calendar displays highlighting with regards to date and time of server instead of adjusting to the Timezone settings
...
-fixed (had to apply custom changes to new version of fullcalendar.js)
2012-06-11 16:43:24 -04:00
denise
5b9add360c
CC-3718: Please enable user to input the mail server settings
...
-fixed soundcloud settings from collapsing if there are form input errors
2012-06-11 15:18:12 -04:00
denise
d498c51814
Merge branch '2.1.x' into devel
2012-06-11 15:10:33 -04:00
denise
d348d21c10
CC-3960: Day of week text is missing from monthly Calendar view
...
-fixed
2012-06-11 15:08:02 -04:00
denise
16b6f09420
CC-3959: Make default username "source" for master and show inputs
...
-done (just added tooltip)
2012-06-11 14:55:26 -04:00
denise
ca8187c9c2
CC-3718: Please enable user to input the mail server settings
...
-done
2012-06-11 12:53:09 -04:00
denise
cf32096d9c
CC-3942: Canceling a storage folder change does not blank the Import Folder field
...
-fixed
2012-06-08 12:14:16 -04:00
denise
33f77c8c28
CC-3923: Show Timefilter - Even If the time filter is scheduled for yesterday it displays the Show played today
...
-fixed
2012-06-08 12:03:23 -04:00
denise
76c598c05b
CC-3940: Calendar displays highlighting with regards to date and time of server instead of adjusting to the Timezone settings
...
-committing diff between original fullcalendar.js and changes made to it
2012-06-08 10:55:13 -04:00
denise
8fae454db6
CC-3901: DJ not assigned to Show, Guest: selection dialog populated upon clicking on "Select All" button in Now Playing
...
-fixed
2012-06-07 17:04:31 -04:00
denise
24f4e589a4
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-07 16:10:04 -04:00
denise
da7e44a78c
CC-3940: Calendar displays highlighting with regards to date and time of server instead of adjusting to the Timezone settings
...
-fixed
2012-06-07 16:09:51 -04:00
James
dc4597e526
CC-3910: NowPlaying-> preview dialog is greyed for files uploaded to Soundcloud
...
- fixed
2012-06-07 11:26:35 -04:00
denise
a0a078db2b
CC-3925: Media Library: Please keep staying current page after editing or searching items instead of switching to first page.
...
-fixed to keep current page after deleting an item
2012-06-07 10:33:00 -04:00
denise
fda04295a6
CC-3941: Overridden connection url in stream settings gets reverted back to default when 'Save' is clicked
...
-fixed
2012-06-06 17:06:46 -04:00
denise
532b2710f0
CC-3932: Master/Source Source Connection URL should be in non-editable box
...
-done
2012-06-06 13:10:57 -04:00
denise
8e0c886350
CC-3896: Playlist Builder: Using "select this page" to add songs to playlist, those songs will be added in by opposite order, like a stack
...
-fixed whitespace in library.js
2012-06-06 10:45:27 -04:00
James
b23e3d0a54
CC-3927: Should automatically switch back to Master/Show stream if there is a
...
connection interruption
- done
2012-06-05 16:41:41 -04:00
denise
af71a03982
CC-3925: Media Library: Please keep staying current page after editing or searching items instead of switching to first page.
...
-maintains current page after edit metadata
2012-06-05 11:27:17 -04:00
denise
a3754be31a
CC-3850: Use qTip instead of custom tooltips
...
-done
2012-06-05 11:24:40 -04:00
denise
9c89d263db
CC-3880: NowPlaying-> there is no tooltip for the removed files available
...
-done
2012-06-05 11:20:00 -04:00
denise
c554190faf
-fixed indentation
2012-06-05 11:20:00 -04:00
denise
c18704aa4d
CC-3900: Show Builder boxes remain checked even when the item is no longer visible
...
-fixed playlist builder "Dragging <x> items" message so <x> is amount of visible items only
2012-06-05 11:20:00 -04:00
denise
1b540626ed
CC-3900: Show Builder boxes remain checked even when the item is no longer visible
...
-only visible tracks can be added/deleted
2012-06-05 11:20:00 -04:00
denise
5e894f7351
CC-3893: Add Media: Red underline appears on the bottom
...
-fixed
2012-06-05 11:19:59 -04:00
denise
05378f52d3
CC-3896: Playlist Builder: Using "select this page" to add songs to playlist, those songs will be added in by opposite order, like a stack
...
-fixed
2012-06-05 11:19:59 -04:00
denise
3566480999
CC-3888: Record Show: ON AIR light and scheduled Play will ON for several seconds when a record show starts
...
-fixed
2012-06-05 11:19:59 -04:00
Martin Konecny
54d741972a
CC-3903: Help -> Getting Started: the link "user manual" is different from the menu item "Help -> User Manual"
...
-fixed
2012-06-03 22:51:23 -04:00
James
e1a86d50f6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-30 12:46:30 -04:00
James
e48b2f2a84
CC-3913: Live Stream: When master switch is turned on, it turns off show switch
...
- fixed
2012-05-30 12:46:05 -04:00
Naomi Aro
1a49173d2f
CC-3860 : Timeline: Can knock a current playing song out of place with drag and drop if current playing song has checkbox selected
2012-05-30 17:46:24 +02:00
denise
3277a81221
- moved calcAdditionalShowData call before currentShow and nextShow get assigned
2012-05-29 14:19:31 -04:00
Naomi Aro
d91850b1ca
CC-3877 : Now Playing-> Show manipulation buttons should be disabled for guest user and DJ's who are not assigned to the show
2012-05-24 18:10:36 +02:00
Naomi Aro
1b115178d3
CC-3877 : Now Playing-> Show manipulation buttons should be disabled for guest user and DJ's who are not assigned to the show
2012-05-24 15:50:29 +02:00
James
a6dc2adb78
CC-3874: after 3 unsuccessful attempts to login no RE-CAPTCHA is shown and
...
you can't even login as admin user
- fixed
2012-05-23 17:14:59 -04:00
Naomi Aro
bf614dd729
CC-3870 : Now playing -> "Add n items" displays wrong "n" when drag and drop tracks to Time Line
2012-05-23 17:40:56 +02:00
Naomi Aro
0c233c3346
CC-3860 : Timeline: Can knock a current playing song out of place with drag and drop if current playing song has checkbox selected
2012-05-23 17:06:04 +02:00
Naomi Aro
0b84dec86f
CC-3862 : Now playing -> Time Line: Left clicking and "Select cursor" won't enable to add current selected track from Media Library
2012-05-23 12:18:51 +02:00
denise
773693f636
- fixed spelling mistake on variable 'songElapsedTime' in dashboard.js
2012-05-22 17:47:46 -04:00
Martin Konecny
8720aabc27
CC-3857: Chmod fixes for files which should not be executable
...
-fixed
2012-05-22 11:22:43 -04:00
Naomi Aro
438bc93133
CC-3851 : Preview Player: does not expand on Chrome, too big on Firefox
2012-05-22 15:03:34 +02:00
Naomi Aro
4fe80194b6
CC-3845 : General UI cleanup
2012-05-21 17:07:34 +02:00
Naomi Aro
466e30895c
CC-3845 : General UI cleanup
2012-05-18 16:00:36 +02:00
Naomi Aro
ff1327881a
CC-3845 : General UI cleanup
2012-05-18 15:40:22 +02:00
denise
3ba4551ed3
- increased amount of time is allowed to pass before ON-AIR light is turned off
2012-05-17 18:49:06 -04:00
denise
9967f5451c
CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing
...
- fixed
- added a 'type' key to distinguish between tracks and shows
2012-05-17 18:21:58 -04:00
Naomi Aro
fd0d82a873
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-17 17:53:23 +02:00
Naomi Aro
45ef2af142
CC-3420 : Custom UI for jplayer from CC-3395
2012-05-17 17:53:01 +02:00
denise
8abb57c402
CC-3842: Next scheduled show gets registered as next scheduled song
...
- removed case where light stays on for first 5 seconds of track
- also removed function calls no longer in use (notifySongStart(), and notifyShowStart())
- removed nowplayingdatagrid.js since it is no longer in use
2012-05-17 11:23:24 -04:00
Naomi Aro
ccbe4f1998
CC-3420 : Custom UI for jplayer from CC-3395
...
creating new stylesheet for our audio previews based from jplayer blue monday.
2012-05-17 16:20:40 +02:00
denise
1629f41a8d
CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing
...
-fixed
2012-05-16 12:54:02 -04:00
Paul Baranowski
c5b1e23486
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-15 17:13:20 -04:00
Paul Baranowski
2856d379b5
Fixed bug with upgrade notifications - it was always saying that your version
...
is obsolete if the version was greater than 1 minor version.
2012-05-15 17:13:01 -04:00
Naomi Aro
07d029b8cc
CC-3777 : Decide on what should happen with canceling recorded show
2012-05-15 14:56:31 +02:00
denise
ea5c5c8586
CC-3795: Schedule Play's line is all OFF after Master source is ON
...
-fixed
2012-05-14 12:16:11 -04:00
Naomi Aro
71c279a2f9
CC-3820 : when using reupload to soundcloud on calendar, progress icon never goes away unless you refresh the page
2012-05-14 16:30:18 +02:00
Naomi Aro
803c44611a
CC-3819 : Add View on Soundcloud context menu option on calendar page
2012-05-14 15:48:09 +02:00
Naomi Aro
ff5aebfd6b
CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar
2012-05-14 15:06:56 +02:00
Naomi Aro
2b55002532
CC-3809 : Metadata popup keeps loading by right clicking the preview button of a playlist, only in Firefox
2012-05-11 11:27:53 +02:00
Naomi Aro
4e2aee83fd
CC-3806 : "n" of Add n items increases unexpectly
2012-05-11 11:04:16 +02:00
Naomi Aro
e61924de37
CC-3799 : Dragging and dropping a track from the library causes the track in the library to be selected
2012-05-10 14:19:36 +02:00
Martin Konecny
6c4bb1ef9e
-rename playlists.js to dashboard.js
2012-05-08 20:41:09 -04:00
Martin Konecny
55312e9538
-add missing semicolons
2012-05-08 20:37:45 -04:00
denise
9203e8c5d6
CC-3768: Reduce number of columns selected by default on the Playlist Builder screen
...
-fixed
2012-05-07 16:24:59 -04:00
denise
b4d8c72869
CC-3765: When master resource and schedule source are all ON, the current playing area only shows scheduled resource's name
...
-fixed
2012-05-07 16:08:26 -04:00
Naomi Aro
df4cdfb07e
CC-3687 : Remove context menus from recorded shows since they are blank.
2012-05-07 17:48:56 +02:00
Naomi Aro
a79514c8ee
CC-3687 : Remove context menus from recorded shows since they are blank.
2012-05-07 15:24:06 +02:00
Naomi Aro
a4b949cc2f
CC-3753 : Cannot cancel record show on Timeline view
2012-05-07 14:28:21 +02:00
Naomi Aro
f78e6eaeca
CC-3763 : Don't call window.resize callbacks multiple time during continuous events
2012-05-04 18:16:10 +02:00
Naomi Aro
025822ce35
CC-3763 : Don't call window.resize callbacks multiple time during continuous events
2012-05-04 18:13:01 +02:00
Naomi Aro
96d2f657f7
CC-3741 : Timeline's cursors looks a little bit far from timeline
2012-05-04 15:49:05 +02:00
Naomi Aro
edaec54a5d
CC-3724 : Now Playing -> Timeline view: to drag and drop single file very fast will block adding the same file
...
using jquery.blockUI.js on timeline/playlist builder pages.
2012-05-04 15:00:18 +02:00
Naomi Aro
12a5f17ff5
CC-3724 : Now Playing -> Timeline view: to drag and drop single file very fast will block adding the same file
2012-05-04 11:50:51 +02:00
Naomi Aro
0a17b34885
CC-3735 : Now Playing: Browser(Firefox) Mem usage goes high when play a show with hundreds of songs more than 3 hours
2012-05-03 18:00:10 +02:00
Naomi Aro
9b52115abc
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-03 15:04:56 +02:00
Naomi Aro
c2c6e1b114
CC-3735 : Now Playing: Browser(Firefox) Mem usage goes high when play a show with hundreds of songs more than 3 hours
...
updating datatables to stable 1.9.1 release.
optimizing javascript, using jquery to add/remove nodes to avoid JQuery.cache issues.
2012-05-03 15:04:23 +02:00
denise
37190c25c6
CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing
...
-reverting previous commit
2012-05-02 17:02:05 -04:00
denise
0d5b9ebada
CC-3734: Library/Timeline: Use horizontal scrollbar when there isnt enough room for column data
...
-fixed
2012-05-02 11:26:39 -04:00
Naomi Aro
08d939d736
CC-3742 : Library: could be confused by carrying over selected state betwee pages
2012-05-02 14:40:27 +02:00
Naomi Aro
c5f9288aab
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-05-02 11:15:20 +02:00
Naomi Aro
b5b24ae8f1
CC-3735 : Now Playing: Browser(Firefox) Mem usage goes high when play a show with hundreds of songs more than 3 hours
2012-05-02 11:14:53 +02:00
denise
3c53d5c7e6
CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing
...
-fixed
2012-05-01 10:51:28 -04:00
denise
4477ac02e7
CC-3677: Tooltips improvements
...
-done
2012-04-30 16:20:23 -04:00
Naomi Aro
f6ff289506
CC-3677 : Tooltips improvements
2012-04-27 15:53:37 +02:00