Commit Graph

299 Commits

Author SHA1 Message Date
naomiaro e3e8f10021 CC-1985 : Automatic rebroadcast of recorded content
added url column to cc_shows table, logic to show/hide form components for rebroadcast
2011-03-17 18:23:05 -04:00
naomiaro 20f3c49dcb CC-1985 : Automatic rebroadcast of recorded content
rebroadcast shows are automatically resized if parent recorded shows are altered.
progress bar is removed from recorded/rebroadcast shows, waiting on special icons.
2011-03-16 11:33:08 -04:00
naomiaro f104872175 CC-1985 : Automatic rebroadcast of recorded content
modified full calendar code to allow disabling resize of specific events (rebrodcast shows)
2011-03-15 17:26:59 -04:00
naomiaro 8f86b05a4b Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
	application/controllers/ScheduleController.php
	public/css/styles.css
2011-03-15 17:02:22 -04:00
naomiaro 6ef4169315 CC-1985: Automatic rebroadcast of recorded content
populates rebroadcast show instances now, added a new table cc_show_rebroadcast,
added columns record, rebroadcast, instance_id, file_id to cc_show_instances table.
added column record to cc_show_days.
2011-03-15 12:05:41 -04:00
martin a947306222 CC-2002
GUI changes done
2011-03-11 13:56:13 -05:00
martin 55745d1a4a CC-2025
Indicate songs that are over-booked
2011-03-10 19:28:57 -05:00
martin 43a9b63fb5 CC-1848
-began progress, not complete yet. Show can be deleted from database while it is playing, need to notify pypo as well
2011-03-09 22:25:02 -05:00
martin 7c1739247d -doctrine 2.0 alpha upgrade scripts 2011-03-08 16:44:47 -05:00
Naomi dc0ea0a532 edits to show class to support resizing/dragging with overbooking. 2011-03-07 12:43:05 -05:00
Naomi cf5b24dc8c added one minute resolution.. why not? 2011-03-06 16:50:26 -05:00
martin e16dd6c486 early implementation of CC-1962 2011-03-06 00:08:02 -05:00
martin 93874af2b8 -improved code for shows grouping in now playing view 2011-03-05 12:28:48 -05:00
martin cb119802df -further modifications to now-playing view with grouping by shows 2011-03-04 23:53:29 -05:00
martin 38856c4af7 -began adding grouping by shows for the datatable. 2011-03-04 18:26:22 -05:00
Naomi 94567ed046 CC-1969 made all menus left click activated instead to prevent mac problems. metadata for a file can now be seen by hovering over the "type" icon 2011-03-01 12:25:20 -05:00
martin bc7d2ec8d5 Merge branch 'airtime-1.6.1' 2011-02-24 12:03:44 -05:00
naomiaro db0f619eb0 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-23 18:29:14 -05:00
naomiaro eae196f58b IE8 doesn't support runtime html5 in plupload, defaults to html4 runtime for IE. upgrading to newer plupload then solved IE specific problems setting a form's content type. 2011-02-23 18:28:51 -05:00
martin dab39f391e -interface is now notified when a song starts playing. ON-AIR graphic only turns red after this notification. 2011-02-23 17:03:27 -05:00
martin 6b615b4e70 -small js fix for IE8 2011-02-23 12:24:38 -05:00
martin 8ad5d23ee6 -api_key autogeneration and usage implemented 2011-02-22 16:16:37 -05:00
martin 2df731bd3d -updated doc files
-small change to styles.css
2011-02-14 11:03:04 -05:00
martin 7f83868214 -fix for bad merge conflict 2011-02-14 10:46:52 -05:00
martin bb2d4c6795 Merge branch 'master' of dev.sourcefabric.org:airtime
Conflicts:
	public/js/playlist/nowplayingdatagrid.js
2011-02-14 10:40:22 -05:00
martin 416c6ceb10 -fixed bug where a song would appear as current song and next song simultaneously.
-show background color switching on the list-view should now be instant.
2011-02-13 15:35:41 -05:00
martin bb82dc2f4a -alternating colors for blue datatable rows 2011-02-13 14:09:47 -05:00
martin a5fd68c252 -fixed UI freeze on some very special occasions
-fixed some php errors related to php shipped with debian
-playlist.js no longer active on login page
2011-02-13 13:29:16 -05:00
martin b9e1078e10 -small fixes to now playing 2011-02-13 11:49:28 -05:00
naomiaro 0b9377b362 added height to hosts element. 2011-02-12 22:29:12 -05:00
Naomi d9118fe2d0 Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
	public/css/styles.css
2011-02-11 18:59:27 -05:00
Naomi 89267748d4 CC-1916 playlist metadata page looks better. 2011-02-11 18:55:08 -05:00
martin 3ea9c9bc2d -now playing blue rows now slightly alternate in color. 2011-02-11 18:43:07 -05:00
martin 6cf4310c24 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-02-11 18:13:38 -05:00
martin 43f7f8e103 -added help page
-added additional user info
2011-02-11 18:13:26 -05:00
Naomi 12dbdf8f4c CC-1915 playlist name no longer required in form, defaults to "Untitled Playlist" 2011-02-11 15:59:16 -05:00
Naomi 4cf5a46c67 will go back to date you were looking at when changing time resolution. 2011-02-11 12:45:00 -05:00
mkonecny b43db577dd Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-11 11:56:29 -05:00
mkonecny 14ee1f553e -fixed up about tool-tip
-ui tweaks to manage users screen
2011-02-11 11:56:14 -05:00
Naomi 2b1163a157 added opening what section if errors 2011-02-11 11:16:15 -05:00
naomiaro 00b70c5144 CC-1871 when clicking on a time slot on the calendar it automatically opens the add show form and populates the start date and start time(if on week/day view) 2011-02-10 23:50:31 -05:00
naomiaro cb8679e43e adding show button when form hides. 2011-02-10 22:27:22 -05:00
naomiaro 8cb91726f7 fix for +show button appearing when it shouldn't when changing time resolution. 2011-02-10 22:07:13 -05:00
Naomi 1b705939a2 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-10 21:05:40 -05:00
Naomi f8623dfb81 add show form will reset the dates that you had selected if there are errors. 2011-02-10 21:05:17 -05:00
mkonecny e28a1421c5 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-02-10 20:48:36 -05:00
mkonecny cf004abb44 -small fixes
-about popup without styling added
2011-02-10 20:48:26 -05:00
Naomi 44c830066b CC-1880 show content is styled 2011-02-10 20:27:25 -05:00
Naomi 8dbb79d9e2 CC-1902 default duration is 1:00 2011-02-10 19:53:41 -05:00
Naomi f3efc9edaa add classes to day check in jQuery or else zend doesn't populate the form properly. 2011-02-10 19:19:55 -05:00