2e970bfc8a
Fixes date format in Smart Block tooltip (CC-5618)
2013-05-22 10:25:43 +01:00
3ad7c868e2
Merge branch 'SAAS-317-datatables-reorder' into 2.4.x
2013-05-21 17:44:25 -04:00
b720086a4b
SAAS-317 : http://ryerson.airtime.pro/ is having issues with show/hide column in their library
...
missing single quote problem, updating column visible plugin.
2013-05-21 17:40:52 -04:00
fb605ccb71
Renamed 'Open Playlist Editor' button to 'Open Media Builder' on Library page
2013-05-21 09:30:35 -04:00
0f1a94532e
CC-5157: [Beta user reported]Linked Show: Multiple warnings after multiple check/uncheck action
...
Fixed. Also had to prepare the warning message for localization.
2013-05-17 14:47:34 -04:00
d57836c42b
CC-5159: Repeating Shows doesn't populate correct dates sometimes
2013-05-17 13:10:15 -04:00
5bf91d513d
CC-5127: Library -> Scheduled and Playlist columns needs better icon
...
Changed icon
Renamed Playlist to Playlist / Block
2013-05-17 11:42:48 -04:00
9133384789
is_scheduled flag was not getting updated when shows were deleted
2013-05-16 15:03:10 -04:00
3d09747990
CC-5150: Calendar->Add/Remove Show contents: Exception happens when try to adding contents for show
2013-05-16 13:42:06 -04:00
5a86bd9ac4
CC-5149: Linked show: Regular show will be treat as linked show in some case
...
A new form was not getting sent to the user properly after a show creation
2013-05-15 15:47:45 -04:00
491ea6a32c
CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows
...
Made some small optimizations. Still needs more work.
2013-05-15 15:32:29 -04:00
f3edc2bee6
CC-5151: Calendar -> Remove all content -> Does not update scheduled flag in library
...
Fixed so it doesn't update files that are scheduled in other shows
2013-05-15 12:38:48 -04:00
254ebb709e
CC-5151: Calendar -> Remove all content -> Does not update scheduled flag in library
2013-05-15 11:25:30 -04:00
b2c8cb0f9d
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 19:18:51 -04:00
5080807a21
IM-629
...
-fix minor SQL syntax error
2013-05-14 19:18:41 -04:00
b287409bfb
IM-629
...
-not using show_instnace_filter POST param correctly
2013-05-14 19:18:30 -04:00
bb36556bb9
IM-629
...
-filter by using instance id instead of show id
Conflicts:
airtime_mvc/application/models/Schedule.php
2013-05-14 19:18:08 -04:00
7d5177d77d
CC-5096 : Add "i" (info) icon to stream output type
2013-05-14 18:14:38 -04:00
78187a72ac
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 16:52:24 -04:00
74c0e390b6
CC-5147 : check builder feed on now playing page updating when not needed
...
wrong timestamp used when changing to prepared statement.
2013-05-14 16:51:34 -04:00
ec87a8ff88
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 16:09:22 -04:00
e1d0dc9b95
Updated .po files
2013-05-14 16:08:21 -04:00
809d5a35b9
CC-5108 : Waveform Editor UI
...
changing colour to be less dark. can better see highlights/drawn fades.
2013-05-14 15:49:13 -04:00
0dd8138c2b
CC-5131 : Please give user a message that Browser other than Chrome can't use waveform
2013-05-14 14:15:54 -04:00
2d09ba3a16
CC-4863: I18N:System -> Listener status: string is not translated
2013-05-14 11:50:01 -04:00
4ee7724149
CC-4864: I18N: Password reset page is not translated
2013-05-14 11:32:21 -04:00
c173744929
CC-5090: Unscheduled tracks are still marked at Scheduled in linked show
2013-05-14 10:58:06 -04:00
bfd525395a
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 08:59:30 -04:00
9377e21293
Removed unnecessary function call when editing a show
2013-05-14 08:59:21 -04:00
d9b6a15fb6
CC-5139 : WaveForm: Click save will cause problem when setting crossfading between track and Smart block
2013-05-13 18:21:24 -04:00
872f68505b
CC-5108 Waveform Editor UI
2013-05-13 16:01:06 -04:00
2ba743a436
CC-5132 : Playlist Editor: Add file before Smart Block will cause exception
2013-05-13 12:23:05 -04:00
bd2462170b
CC-5121 : fix some SQL statements not being escaped/prepared
2013-05-13 11:42:11 -04:00
6b560eede1
Deleted unused functions in Show.php
2013-05-13 09:55:17 -04:00
82945038d5
CRLF fix
2013-05-10 17:44:50 -04:00
da46757e28
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-10 17:36:18 -04:00
b0018083c7
CC-5121 : fix some SQL statements not being escaped/prepared
2013-05-10 17:14:10 -04:00
ab13acba84
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-10 15:24:56 -04:00
6e0a3ffc60
CC-5102:
...
Cross Fading: No cross fading effect
-fixed start/end calculations
2013-05-10 15:24:43 -04:00
414348dd11
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-10 14:18:03 -04:00
13458ad687
CC-5122: Calendar -> linked show: Change the repeating weekday will lost all the contents
2013-05-10 14:17:54 -04:00
0c4691f3ea
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-10 13:20:07 -04:00
2250d89cbd
CC-5013:
...
Re-Added watched folder wont update
-fixed
2013-05-10 13:19:56 -04:00
c36333ae07
code cleanup
...
-user proper method for checking null
-reduce line length to 80 chars
2013-05-10 12:37:25 -04:00
987537fbdc
CC-5121 :fix some SQL statements not being escaped/prepared
2013-05-10 12:35:08 -04:00
d5e7185789
Merge branch 'sql-changes'
...
Conflicts:
airtime_mvc/application/models/StreamSetting.php
airtime_mvc/application/models/Subjects.php
2013-05-10 12:23:57 -04:00
5666b688a0
CC-5112 : Listen Status: Please clean obsoleted mount point from status report page
...
CRLF
2013-05-10 12:03:33 -04:00
263b89295f
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-10 11:59:49 -04:00
115af29f2e
Merge branch 'CC-5112-status-page'
2013-05-10 11:59:37 -04:00
8f31dd3069
CC-5112 : Listen Status: Please clean obsoleted mount point from status report page
2013-05-10 11:56:20 -04:00
f5fa033207
better flow in dispatchMetadata function
2013-05-09 17:37:23 -04:00
3948964e8d
remove useless log
2013-05-09 16:58:50 -04:00
afb24c37ab
CC-5121: fix some SQL statements not being escaped/prepared
2013-05-09 16:07:34 -04:00
8cd8d0922f
CC-5121: fix some SQL statements not being escaped/prepared
2013-05-09 16:05:04 -04:00
b7337d0df3
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-09 15:53:24 -04:00
40eb51b892
CC-5121: fix some SQL statements not being escaped/prepared
2013-05-09 15:53:12 -04:00
9c05511613
CC-5121: fix some SQL statements not being escaped/prepared
2013-05-09 15:08:47 -04:00
21df9013ee
CC-5121: fix some SQL statements not being escaped/prepared
2013-05-09 14:43:59 -04:00
3ed106af56
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-09 13:29:00 -04:00
92c7c9c951
should constants instead of literals - only in function for now...
2013-05-09 13:28:26 -04:00
540e817101
fixing sql to be prepared statements.
2013-05-09 13:28:22 -04:00
fedf564090
CC-5081: Calendar -> Add a linked show icon
2013-05-09 12:14:49 -04:00
9c8935af47
CC-5114: Calendar: User from different timezone will see the same start/end time when editing show
2013-05-09 09:35:27 -04:00
2e69b35d75
CC-5086: Calendar: Update show pops up instead of Add show after clicking a cell
2013-05-08 16:28:45 -04:00
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
1384c5d39d
Function call was missing an argument
2013-04-29 15:57:59 -04:00
71526a94cc
Merge branch 'cc-4961-show-linking'
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
2013-04-29 15:35:16 -04:00
de8f7b0ff7
CC-4961: Show linking
2013-04-29 15:27:14 -04:00
acfc72f422
use sendJson, instead of manually disabling layouts + encoding data
2013-04-26 18:06:07 -04:00
3a931f27bf
CC-4417: Opus codec support
2013-04-26 17:54:29 -04:00
a5264aac1e
CC-4961: Show linking
2013-04-26 16:10:01 -04:00
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
52655ab375
CC-4961: Show linking
2013-04-26 13:43:30 -04:00
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
0f1383d541
CC-4961: Show linking
2013-04-25 09:00:37 -04:00
0e3b4da52f
clear unused function
2013-04-24 15:17:06 -04:00
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
956bcccd24
CC-2301 : creating different states for the fade editor:
...
cursor, fadein, fadeout.
2013-04-23 16:36:35 -04:00
8f6b583fcb
CC-5061:
...
Use propel transactions for StoredFile class
2013-04-19 20:40:31 -04:00
243dda60f8
remove useless comment
2013-04-19 20:25:26 -04:00
fd78ad29bf
cleanup of function names
2013-04-19 20:24:05 -04:00
923f4ee180
CC-5062:
...
Add "error" logging level
-done
2013-04-19 20:11:33 -04:00
f39f9329cc
CC-4992:
...
Decouple pypo from Airtime install
-first commit
2013-04-19 20:10:51 -04:00
018ec9231e
don't print out anything extra after printing json
2013-04-18 16:20:34 -04:00
a9b5d00d87
CC-4961: Show linking
2013-04-18 16:12:26 -04:00
479e69de12
CC-5009:
...
Use Silan to silently update track length in the background
-done
2013-04-18 15:40:33 -04:00
04a0d9c54e
CC-2301 : waveform editor
...
current cues being set.
2013-04-17 18:00:16 -04:00
0d3c0912ba
CC-2301 : Waveform Editor
...
Cue editor can save values to the playlist.
2013-04-17 17:17:39 -04:00
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
13c8e5f146
CC-2301 : showing waveform cue/fade editors inside of a jquery dialog box.
2013-04-16 14:37:08 -04:00
1a2a05c3cf
CC-4961: Show linking
2013-04-12 16:34:36 -04:00
9b4a0ba9c1
CC-4961: Show linking
...
Removed stamp tables
2013-04-12 10:52:13 -04:00
9b2fb3bece
CC-4961: Show linking
2013-04-09 15:55:18 -04:00
e64f6fb3fd
CC-4961: Show linking
...
-modified db
2013-04-08 14:43:27 -04:00
76bfce21b1
CC-4961: Show linking
...
-modified db
2013-04-08 14:42:37 -04:00
cfee74693b
CC-4961: Show linking
...
moved move-show to calendar service
2013-04-05 17:44:30 -04:00
4595aab694
Merge branch '2.3.x'
2013-04-05 15:33:48 -04:00
d1f655d79d
CC-5038: Silan error: list index out of range
...
-fixed
2013-04-05 15:32:44 -04:00
62d1b22fcc
CC-4961: Show linking
...
created new cc_show_stamp table
2013-04-05 12:27:54 -04:00
f9d7167638
CC-4961: Show linking
2013-04-04 16:30:33 -04:00
fcbac2a044
Merge branch '2.3.x' into devel
2013-04-04 15:15:19 -04:00
Daniel James
Naomi
denise
Martin Konecny