Naomi
|
2b5a8b0d4b
|
CC-2301 : fixing changed function name after merging with master.
|
2013-05-01 11:41:07 -04:00 |
|
Naomi
|
92ef0608d6
|
Merge branch 'master' into CC-2301
|
2013-05-01 11:04:14 -04:00 |
denise
|
0362f24a4e
|
CC-5076: Calendar -> Context menu -> Remove all content doesn't remove content from linked instances
|
2013-05-01 10:30:51 -04:00 |
|
Naomi
|
f82659d582
|
CC-2301 : stopping playlist editor to make sure audio isn't stuck playing in the background.
|
2013-04-30 17:03:40 -04:00 |
|
Naomi
|
2a1ac0ddb9
|
CC-2301 : updating playlist offsets in playlist builder to reflect crossfade overlaps.
|
2013-04-30 16:27:31 -04:00 |
|
denise
|
ff2fde0173
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2013-04-30 15:54:20 -04:00 |
|
denise
|
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 |
|
Naomi
|
2462e4f144
|
CC-2301 : CRLF fix.
|
2013-04-30 15:34:20 -04:00 |
|
Naomi
|
0db557a570
|
CC-2301 : fades editor saving offset to database for playlists and smart blocks.
|
2013-04-30 15:32:43 -04:00 |
Martin Konecny
|
decb12f6b8
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2013-04-30 15:00:45 -04:00 |
|
Martin Konecny
|
de4934a317
|
ensure that uploaded file is UTF-8 encoded
|
2013-04-30 15:00:31 -04:00 |
|
denise
|
4ca60ca676
|
CC-5074: Editing a linked instance sets incorrect schedule start times
|
2013-04-30 13:58:03 -04:00 |
|
Naomi
|
2e03e1982f
|
CC-2301 : changing more CRLF files
|
2013-04-29 18:11:11 -04:00 |
|
Naomi
|
b2a490ac47
|
CC-2301 : working on creating a crossfade method for waveforms.
|
2013-04-29 18:09:12 -04:00 |
|
Naomi
|
58957cc919
|
CC-2301 : running dos2unix on 3 files.
|
2013-04-29 17:01:08 -04:00 |
|
Naomi
|
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
|
1384c5d39d
|
Function call was missing an argument
|
2013-04-29 15:57:59 -04:00 |
|
denise
|
71526a94cc
|
Merge branch 'cc-4961-show-linking'
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
|
2013-04-29 15:35:16 -04:00 |
|
denise
|
de8f7b0ff7
|
CC-4961: Show linking
|
2013-04-29 15:27:14 -04:00 |
|
Martin Konecny
|
acfc72f422
|
use sendJson, instead of manually disabling layouts + encoding data
|
2013-04-26 18:06:07 -04:00 |
|
Naomi
|
ef100f89f1
|
CC-2301 : not drawing fades of length zero.
|
2013-04-26 17:54:37 -04:00 |
|
Martin Konecny
|
3a931f27bf
|
CC-4417: Opus codec support
|
2013-04-26 17:54:29 -04:00 |
|
Naomi
|
0169c01724
|
CC-2301 : updating waveform code for states
|
2013-04-26 16:23:46 -04:00 |
|
denise
|
a5264aac1e
|
CC-4961: Show linking
|
2013-04-26 16:10:01 -04:00 |
|
Naomi
|
a4731d4af2
|
CC-2301 : automatically updating the fadein/fadeout for a track in the fadein/fadeout states.
Can enable states on a per track basis.
|
2013-04-26 15:57:02 -04:00 |
|
Martin Konecny
|
6cc366b100
|
CC-5069:
Airtime 2.4 upgrade scripts
-initial commit
|
2013-04-26 13:43:40 -04:00 |
|
denise
|
52655ab375
|
CC-4961: Show linking
|
2013-04-26 13:43:30 -04:00 |
|
Naomi
|
628af95325
|
CC-2301 : needed to adjust cueout if length information is inaccurate.
|
2013-04-26 12:38:13 -04:00 |
|
Naomi
|
2b22828e85
|
CC-2301 : destorying dialogs instead of just closing to free up resources.
|
2013-04-25 17:48:35 -04:00 |
|
Naomi
|
8fea97d580
|
CC-2301 : fade editor now loads currently set fades. Fixing some bugs in the waveform editor.
|
2013-04-25 17:10:37 -04:00 |
|
denise
|
0f1383d541
|
CC-4961: Show linking
|
2013-04-25 09:00:37 -04:00 |
|
Naomi
|
0deaee4d0e
|
CC-2301 : disallowing movement of first track in fade editor.
|
2013-04-24 15:32:48 -04:00 |
|
Martin Konecny
|
0e3b4da52f
|
clear unused function
|
2013-04-24 15:17:06 -04:00 |
|
Naomi
|
179621d687
|
CC-2301 : fades editor is loading now with a leftoffset for the second track and the cues for both tracks.
|
2013-04-24 14:15:07 -04:00 |
|
Naomi
|
956bcccd24
|
CC-2301 : creating different states for the fade editor:
cursor, fadein, fadeout.
|
2013-04-23 16:36:35 -04:00 |
|
Martin Konecny
|
8f6b583fcb
|
CC-5061:
Use propel transactions for StoredFile class
|
2013-04-19 20:40:31 -04:00 |
|
Martin Konecny
|
243dda60f8
|
remove useless comment
|
2013-04-19 20:25:26 -04:00 |
|
Martin Konecny
|
fd78ad29bf
|
cleanup of function names
|
2013-04-19 20:24:05 -04:00 |
|
Martin Konecny
|
923f4ee180
|
CC-5062:
Add "error" logging level
-done
|
2013-04-19 20:11:33 -04:00 |
|
Martin Konecny
|
f39f9329cc
|
CC-4992:
Decouple pypo from Airtime install
-first commit
|
2013-04-19 20:10:51 -04:00 |
|
Martin Konecny
|
018ec9231e
|
don't print out anything extra after printing json
|
2013-04-18 16:20:34 -04:00 |
|
denise
|
a9b5d00d87
|
CC-4961: Show linking
|
2013-04-18 16:12:26 -04:00 |
|
Martin Konecny
|
479e69de12
|
CC-5009:
Use Silan to silently update track length in the background
-done
|
2013-04-18 15:40:33 -04:00 |
|
Naomi
|
04a0d9c54e
|
CC-2301 : waveform editor
current cues being set.
|
2013-04-17 18:00:16 -04:00 |
|
Naomi
|
0d3c0912ba
|
CC-2301 : Waveform Editor
Cue editor can save values to the playlist.
|
2013-04-17 17:17:39 -04:00 |
|
Naomi
|
0385285741
|
CC-2301 : waveform editors are now in their own separate pop up. controls working for fades/cues. should add more specific states for fade editor.
|
2013-04-16 17:24:30 -04:00 |
|
Naomi
|
13c8e5f146
|
CC-2301 : showing waveform cue/fade editors inside of a jquery dialog box.
|
2013-04-16 14:37:08 -04:00 |
|
denise
|
1a2a05c3cf
|
CC-4961: Show linking
|
2013-04-12 16:34:36 -04:00 |
|
denise
|
9b4a0ba9c1
|
CC-4961: Show linking
Removed stamp tables
|
2013-04-12 10:52:13 -04:00 |
|
Martin Konecny
|
d46fef8eda
|
SAAS-301: Calendar content indicator did not update automatically after adding content to a show
-fixed
|
2013-04-11 15:11:20 -04:00 |