Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,102 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

1793 Commits

Author SHA1 Message Date
denise cee74b59f9 CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows 
Calculate crossfades during insert instead of after
 2013-05-27 10:39:31 -04:00
Martin Konecny f23fc472ef Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-24 17:01:15 -04:00
Martin Konecny daa310ac18 CC-5175: 
Now Playing: SQL syntax error happens when removing and add contents to current show.

-fixed
 2013-05-23 18:37:30 -04:00
Naomi 06fbbe89f2 CLRF fix. 2013-05-23 18:34:35 -04:00
Naomi 6110d47941 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-23 18:33:53 -04:00
Naomi 75e6f21ce0 CC-5108 : Waveform Editor UI 
putting on the timescale for time reference.

fade editor now has cursor playback info.
 2013-05-23 18:33:40 -04:00
denise e104146b9a CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows 
Removed propel from calculateCrossfades function and used prepared statements instead
 2013-05-23 16:10:00 -04:00
Naomi c57de650e8 CC-5172 : errors from setting cues in waveform editor not handled properly 
Conflicts:
	airtime_mvc/application/models/Playlist.php
 2013-05-23 13:01:38 -04:00
Naomi 02292569f9 CC-5172 : errors from setting cues in waveform editor not handled properly 
Conflicts:
	airtime_mvc/application/models/Playlist.php
 2013-05-23 13:00:37 -04:00
denise 0107f36206 Changed propel to prepared statements 2013-05-23 12:49:15 -04:00
denise 792366e1f5 CC-5100: Now Playing: Editing schedule on-the-fly will cause 2 tracks mixed at the same time. 2013-05-23 11:35:56 -04:00
Naomi d82725cb54 CLRF fix 2013-05-22 15:35:59 -04:00
Naomi a569d2f3f5 CC-5163 : Waveform - Hard coded api path will cause fail to open file when airtime is put under subfolder 2013-05-22 15:33:49 -04:00
denise 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
denise 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
Martin Konecny 5080807a21 IM-629 
-fix minor SQL syntax error
 2013-05-14 19:18:41 -04:00
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