Martin Konecny
|
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 |
|
Naomi
|
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 |
|
denise
|
c173744929
|
CC-5090: Unscheduled tracks are still marked at Scheduled in linked show
|
2013-05-14 10:58:06 -04:00 |
|
Naomi
|
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 |
|
Naomi
|
bd2462170b
|
CC-5121 : fix some SQL statements not being escaped/prepared
|
2013-05-13 11:42:11 -04:00 |
|
denise
|
6b560eede1
|
Deleted unused functions in Show.php
|
2013-05-13 09:55:17 -04:00 |
|
Naomi
|
82945038d5
|
CRLF fix
|
2013-05-10 17:44:50 -04:00 |
|
Naomi
|
da46757e28
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2013-05-10 17:36:18 -04:00 |
|
Naomi
|
b0018083c7
|
CC-5121 : fix some SQL statements not being escaped/prepared
|
2013-05-10 17:14:10 -04:00 |
|
Martin Konecny
|
6e0a3ffc60
|
CC-5102:
Cross Fading: No cross fading effect
-fixed start/end calculations
|
2013-05-10 15:24:43 -04:00 |
|
Martin Konecny
|
0c4691f3ea
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2013-05-10 13:20:07 -04:00 |
|
Martin Konecny
|
2250d89cbd
|
CC-5013:
Re-Added watched folder wont update
-fixed
|
2013-05-10 13:19:56 -04:00 |
|
Martin Konecny
|
c36333ae07
|
code cleanup
-user proper method for checking null
-reduce line length to 80 chars
|
2013-05-10 12:37:25 -04:00 |
|
Naomi
|
987537fbdc
|
CC-5121 :fix some SQL statements not being escaped/prepared
|
2013-05-10 12:35:08 -04:00 |
|
Naomi
|
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 |
|
Naomi
|
5666b688a0
|
CC-5112 : Listen Status: Please clean obsoleted mount point from status report page
CRLF
|
2013-05-10 12:03:33 -04:00 |
|
Naomi
|
263b89295f
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2013-05-10 11:59:49 -04:00 |
|
Naomi
|
115af29f2e
|
Merge branch 'CC-5112-status-page'
|
2013-05-10 11:59:37 -04:00 |
|
Naomi
|
8f31dd3069
|
CC-5112 : Listen Status: Please clean obsoleted mount point from status report page
|
2013-05-10 11:56:20 -04:00 |
|
Martin Konecny
|
3948964e8d
|
remove useless log
|
2013-05-09 16:58:50 -04:00 |
|
denise
|
afb24c37ab
|
CC-5121: fix some SQL statements not being escaped/prepared
|
2013-05-09 16:07:34 -04:00 |
|
denise
|
8cd8d0922f
|
CC-5121: fix some SQL statements not being escaped/prepared
|
2013-05-09 16:05:04 -04:00 |
|
denise
|
b7337d0df3
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2013-05-09 15:53:24 -04:00 |
|
denise
|
40eb51b892
|
CC-5121: fix some SQL statements not being escaped/prepared
|
2013-05-09 15:53:12 -04:00 |
|
Martin Konecny
|
9c05511613
|
CC-5121: fix some SQL statements not being escaped/prepared
|
2013-05-09 15:08:47 -04:00 |
|
Naomi
|
540e817101
|
fixing sql to be prepared statements.
|
2013-05-09 13:28:22 -04:00 |
|
denise
|
fedf564090
|
CC-5081: Calendar -> Add a linked show icon
|
2013-05-09 12:14:49 -04:00 |
|
denise
|
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 |
|
Naomi
|
a18fc87d97
|
CC-5065 : Playlist length is not built on actual cue in/out value
|
2013-05-08 14:19:22 -04:00 |
|
Naomi
|
299dfdc18a
|
Merge branch 'master' of dev.sourcefabric.org:airtime
|
2013-05-08 11:44:50 -04:00 |
|
Naomi
|
fe916ec043
|
CC-2301 : adding in crossfade durations to smart blocks.
|
2013-05-08 11:43:53 -04:00 |
|
Martin Konecny
|
9f6a1033ea
|
CC-5109: Fix race-condition when updating cc_pref table
|
2013-05-07 16:21:34 -04:00 |
|
Martin Konecny
|
ad82b4ff98
|
throw exception if we get unexpected numbers of results in cc_pref
|
2013-05-07 15:36:21 -04:00 |
|
denise
|
92f6ec029f
|
CC-5079: Timeline -> Moving items in linked shows doesn't work
|
2013-05-07 14:49:24 -04:00 |
|
Naomi
|
75e4e0c9b6
|
CC-2301 : only showing waveform buttons if the browser supports the audio api.
|
2013-05-03 14:42:42 -04:00 |
|
Naomi
|
435bb83588
|
CC-2301 : dos2unix being run
|
2013-05-02 16:52:30 -04:00 |
|
Naomi
|
3e320f1e2e
|
Merge branch 'master' into CC-2301
|
2013-05-02 16:15:58 -04:00 |
|
Naomi
|
517bb7557a
|
CC-2301 : testing default crossfade settings
|
2013-05-02 16:15:21 -04:00 |
|
denise
|
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 |
|
denise
|
5ba5864d8c
|
CC-5078: Wrong start time if dragging dynamic smart block into a show
|
2013-05-01 11:29:32 -04:00 |
|
Naomi
|
92ef0608d6
|
Merge branch 'master' into CC-2301
|
2013-05-01 11:04:14 -04:00 |
|
Naomi
|
2a1ac0ddb9
|
CC-2301 : updating playlist offsets in playlist builder to reflect crossfade overlaps.
|
2013-04-30 16:27:31 -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 |
|