8344f3f3d5
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-08 15:09:10 -04:00
fe88e6249a
CC-5093: Please disable link option for recording show
2013-05-08 15:08:56 -04:00
35c8e80f6b
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-08 14:21:55 -04:00
a18fc87d97
CC-5065 : Playlist length is not built on actual cue in/out value
2013-05-08 14:19:22 -04:00
9dbec4636a
CC-5106: Calendar: Context menu "Show contents" is missing for past shows
2013-05-08 13:43:27 -04:00
b4dc17f7e8
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-08 12:06:00 -04:00
d8ba15fac4
CC-5091: Linked Show: Cannot change the start time ahead
2013-05-08 12:05:45 -04:00
299dfdc18a
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-08 11:44:50 -04:00
fe916ec043
CC-2301 : adding in crossfade durations to smart blocks.
2013-05-08 11:43:53 -04:00
62d666ea4d
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-07 16:21:50 -04:00
9f6a1033ea
CC-5109: Fix race-condition when updating cc_pref table
2013-05-07 16:21:34 -04:00
80cdd3f2e2
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-07 16:16:45 -04:00
22b74126f9
CC-5087: Repeating show -> Same day by Month: Time slot of repeating instances aren't correct
2013-05-07 16:16:32 -04:00
ad82b4ff98
throw exception if we get unexpected numbers of results in cc_pref
2013-05-07 15:36:21 -04:00
0efe914352
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-07 14:49:38 -04:00
92f6ec029f
CC-5079: Timeline -> Moving items in linked shows doesn't work
2013-05-07 14:49:24 -04:00
f64e99176e
CC-510: Cue Editor: Please enable to preview the current cue in/out settings.
2013-05-07 12:46:44 -04:00
3a74bb7ca5
CC-2301 : removing shift buttons since it's disabled for this release.
2013-05-06 17:47:35 -04:00
6bdc2caaec
Merge branch 'CC-2301'
2013-05-03 16:15:39 -04:00
75e4e0c9b6
CC-2301 : only showing waveform buttons if the browser supports the audio api.
2013-05-03 14:42:42 -04:00
f3dce46a5a
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-03 11:37:28 -04:00
fac96996e3
CC-5084: Repeating show edited to linked doesn't add content to repeat instances
...
Fixed. If the each repeating instance has different content, we replace it
with the first instance's content
2013-05-03 11:37:11 -04:00
3fc6a0fbae
Merge branch 'master' into CC-2301
2013-05-02 18:02:09 -04:00
d902d38429
revert jsonEncode change not supported by older zend versions
2013-05-02 17:50:36 -04:00
bd1c1fa32f
Merge branch 'master' into CC-2301
2013-05-02 16:59:47 -04:00
ca22a25827
fix silly mistake with echoing json twice
2013-05-02 16:57:07 -04:00
435bb83588
CC-2301 : dos2unix being run
2013-05-02 16:52:30 -04:00
3e320f1e2e
Merge branch 'master' into CC-2301
2013-05-02 16:15:58 -04:00
517bb7557a
CC-2301 : testing default crossfade settings
2013-05-02 16:15:21 -04:00
0e5ba2f07f
CC-5085: Linked show: Changing a regular show to linked show and updating the weekday, all the contents will lost
2013-05-02 15:36:14 -04:00
ea73d98c49
CC-5075: Future bi-weekly linked shows don't get filled with content sometimes
2013-05-02 11:40:56 -04:00
09754b20cc
CC-5082: Repeating shows "disappear" when switching calendar to next month
...
This was caused by the calendar trying to re-create single instance shows.
We needed to exclude non-repeating shows when populating the calendar with repeat events
2013-05-01 15:20:55 -04:00
3d61a18261
CC-5082: Repeating shows "disappear" when switching calendar to next month
...
Small fix. Was treating object as an array
2013-05-01 14:42:53 -04:00
ded8ceb86b
CC-5082: Repeating shows "disappear" when switching calendar to next month
...
We were trying to call a function on an object that was not set
2013-05-01 14:40:33 -04:00
2b5a8b0d4b
CC-2301 : fixing changed function name after merging with master.
2013-05-01 11:41:07 -04:00
5ba5864d8c
CC-5078: Wrong start time if dragging dynamic smart block into a show
2013-05-01 11:29:32 -04:00
92ef0608d6
Merge branch 'master' into CC-2301
2013-05-01 11:04:14 -04:00
0362f24a4e
CC-5076: Calendar -> Context menu -> Remove all content doesn't remove content from linked instances
2013-05-01 10:30:51 -04:00
2a1ac0ddb9
CC-2301 : updating playlist offsets in playlist builder to reflect crossfade overlaps.
2013-04-30 16:27:31 -04:00
ff2fde0173
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-04-30 15:54:20 -04:00
ec2f36efa8
CC-5077: Calendar -> Context menu -> Show Content -> shows incorrect time filled on edited repeat instances
...
- We weren't updating the time_filled column in cc_show_instances when creating the new show
2013-04-30 15:54:04 -04:00
2462e4f144
CC-2301 : CRLF fix.
2013-04-30 15:34:20 -04:00
0db557a570
CC-2301 : fades editor saving offset to database for playlists and smart blocks.
2013-04-30 15:32:43 -04:00
decb12f6b8
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-04-30 15:00:45 -04:00
de4934a317
ensure that uploaded file is UTF-8 encoded
2013-04-30 15:00:31 -04:00
4ca60ca676
CC-5074: Editing a linked instance sets incorrect schedule start times
2013-04-30 13:58:03 -04:00
2e03e1982f
CC-2301 : changing more CRLF files
2013-04-29 18:11:11 -04:00
b2a490ac47
CC-2301 : working on creating a crossfade method for waveforms.
2013-04-29 18:09:12 -04:00
58957cc919
CC-2301 : running dos2unix on 3 files.
2013-04-29 17:01:08 -04:00
410d298272
CC-2301 : creating an offset column to help create crossfades in the playlist.
...
changing default fade to be a separate default fade in/out
2013-04-29 16:55:08 -04:00
denise
Naomi
Martin Konecny