Commit Graph

868 Commits

Author SHA1 Message Date
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 951bd3c9b5 CC-3933: Remove version number and date strings from login page footer, add robots.txt
-done
2012-06-08 10:51:10 -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
denise b76d602561 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-30 14:12:28 -04:00
denise 33e97e7b40 - changed trial-end-date box to have a fixed position 2012-05-30 14:12:18 -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
denise 925f98e3d0 SAAS-242: Livechat window obscures trial end date graphic
-fixed
2012-05-25 15:48:27 -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
Naomi Aro 6b8adff769 CC-3876 : "open the library to schedule files" button should be disabled for 'guest' users and DJ's not assigned to this show 2012-05-24 15:08:54 +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