Commit Graph

120 Commits

Author SHA1 Message Date
Martin Konecny f33485f8ea Merge branch '2.1.x' into devel 2012-08-08 00:09:13 -04:00
denise 550c97a2dc CC-4154L: Indicate whether a show has scheduled content on the calendar page
-done
2012-08-07 14:57:04 -04:00
Martin Konecny 4ebcb1b1f9 Merge branch '2.1.x' into devel
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/models/Playlist.php
	python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
2012-07-16 14:31:03 -04:00
Martin Konecny 8dcb1f8f3d CC-4101Calendar displays white on white for certain show names, making shows invisible 2012-07-13 10:28:50 -04:00
denise 81eb751c9f - shortened height on Add/Remove content dialog window 2012-07-10 13:19:03 -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
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
james c4480a46b1 CC-4025: Suggest show colour in calendar automatically, based on show name
- done
2012-06-27 23:03:50 -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 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 a3754be31a CC-3850: Use qTip instead of custom tooltips
-done
2012-06-05 11:24:40 -04:00
Naomi Aro 07d029b8cc CC-3777 : Decide on what should happen with canceling recorded show 2012-05-15 14:56:31 +02: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 df4cdfb07e CC-3687 : Remove context menus from recorded shows since they are blank. 2012-05-07 17:48:56 +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
James c9df8e8b15 CC-3722: Create loading indicator for AJAX call when calculating Show length
- done
2012-04-26 11:56:14 -04:00
James b5a65ae7e4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-25 17:22:05 -04:00
James fe71487fa2 CC-3478: Calendar->Show has some inconsistencies on special Days (e.g.
switching to Daylight Saving Time)

- fixed
2012-04-25 17:21:25 -04:00
Martin Konecny 517013ffc3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-25 16:21:15 -04:00
Martin Konecny d04e053814 CC-3704: No default checked day when creating repeat show
-fixed
2012-04-25 16:21:03 -04:00
James 5c401cb472 CC-3671: add show on week/day view doesn't get start time/end time filled in
- fixed
- moved pad function into common.js
2012-04-25 16:04:36 -04:00
Martin Konecny da8a5296b0 CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window
-add user type into javascript as a variable so we can check permissions on js side
2012-04-20 11:31:24 -04:00
James a482a8fe07 CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window
- done
2012-04-19 15:55:55 -04:00
James 295eab430a CC-3671: add show on week/day view doesn't get start time/end time filled in
- fixed in both day and week view
2012-04-19 15:45:13 -04:00
Martin Konecny fbef6aa3c4 -remove reference to deleted meio mask jquery library 2012-04-12 13:11:45 -04:00
James 32548de639 CC-3486: Text Fields in Stream settings behave in unorthodox way. Highlighting
entire text and typing does not erase the highlighted text.

- removed all the masking
- meioMask is very outdated so it's removed from the project.
2012-04-09 16:35:39 -04:00
James b32e463350 CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window
- fixed
2012-04-09 12:19:22 -04:00
Martin Konecny d562a26f4b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-07 22:33:47 -04:00
James 332c1d91b5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/public/js/airtime/schedule/add-show.js
2012-04-05 16:03:15 -04:00
James 954fa2bceb CC-3444: Ability to edit currently playing show (end time and permissions)
- handling in better way. we created separate action for this.
2012-04-05 16:01:27 -04:00
Martin Konecny ef6c496ba3 CC-3541: Missing show title from "Show Content" pop-up
-fixed
2012-04-05 15:49:58 -04:00
Martin Konecny 176e5fdbd7 CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
-in progress
2012-04-05 15:30:21 -04:00
Martin Konecny 8050a1ce29 CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
-in progress
2012-04-05 14:45:16 -04:00
James ab7da1ce90 CC-3581: Calendar->It should not be possible to change the duration for
the recorded show

- "When" section is disabled when editting rebroadcasting show
2012-04-04 15:44:52 -04:00
James 5da7d42290 CC-3548: Schedule: Separate repeate show template and single instance on
'When' section

- UI portion of the feature
2012-04-04 14:53:26 -04:00
Naomi Aro f2a05adf49 CC-3481 : Calendar->AddRemoveShow->Content management dialog can't be moved 2012-04-03 16:23:37 +02:00
Naomi Aro 079862d2f2 CC-3505 : Timeline: Remove repeating date if "end date" is the same as the "Start date" 2012-04-03 16:11:53 +02:00
Naomi Aro eeb7273909 CC-3542 : When you delete the current show it takes all songs from that show out of the playout history 2012-04-02 15:20:13 +02:00
Martin Konecny 8cb5ccbe41 CC-3516: Creating a show has a long execution time
-cool effect now works under firefox
2012-03-28 23:52:17 -04:00
James d7819b6dd2 CC-3489: Live Stream: When Custom Auth check box is checked, Custom
Username and Custom Password field must be required

- fixed spacing
2012-03-26 17:21:13 -04:00
James e76f4baf18 CC-3489: Live Stream: When Custom Auth check box is checked, Custom Username and Custom Password field must be required
- done
2012-03-26 15:09:27 -04:00
Martin Konecny 0525f182ef CC-3516: Creating a show has a long execution time
-grey out add-show form while busy
2012-03-25 22:56:51 -04:00
Naomi Aro 8af4f052e0 CC-3360 : timeline css 2012-03-23 01:46:45 +01:00
Naomi Aro 7ab0289d12 CC-3360 : timeline css
changed library search width calculation to be in library.js
2012-03-22 23:31:18 +01:00
Naomi Aro 1fdb3cf163 CC-3360 : Timeline Css
adding Css to timeline.
2012-03-22 18:04:22 +01:00
Naomi Aro 7a5054655e CC-3174 : showbuilder
change max-height slightly for the library dialog.
2012-03-08 11:14:09 +01:00