Commit Graph

11024 Commits

Author SHA1 Message Date
Martin Konecny ab13acba84 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-10 15:24:56 -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
denise a3eda62bb2 CC-5113: Preferences -> Mail Server Config: Error present will cause web form read-only 2013-05-10 15:18:54 -04:00
denise 7b8a37065a CC-5080: Calendar -> Warn user a show cannot be linked again once it has been unlinked 2013-05-10 14:53:01 -04:00
denise 414348dd11 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-10 14:18:03 -04:00
denise 13458ad687 CC-5122: Calendar -> linked show: Change the repeating weekday will lost all the contents 2013-05-10 14:17:54 -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 f5fa033207 better flow in dispatchMetadata function 2013-05-09 17:37:23 -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
Martin Konecny 21df9013ee CC-5121: fix some SQL statements not being escaped/prepared 2013-05-09 14:43:59 -04:00
Martin Konecny 3ed106af56 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-09 13:29:00 -04:00
Martin Konecny 92c7c9c951 should constants instead of literals - only in function for now... 2013-05-09 13:28:26 -04:00
Naomi 540e817101 fixing sql to be prepared statements. 2013-05-09 13:28:22 -04:00
denise 125f80d322 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-09 12:15:03 -04:00
denise fedf564090 CC-5081: Calendar -> Add a linked show icon 2013-05-09 12:14:49 -04:00
Martin Konecny 17c3eb1407 CC-5071: Better RabbitMQ passwords
-missing / in front of vhost
2013-05-09 11:20:38 -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
denise 309156afd5 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-09 08:56:03 -04:00
denise 43738b3298 CC-5111: Please make upgrade detect the tracks already scheduled and added in playlist
Added in detection of tracks belonging to static smart blocks
2013-05-09 08:55:54 -04:00
Martin Konecny d06b2f3f94 CC-5116:
Please add opus into the file name filter

-fixed
2013-05-08 17:06:50 -04:00
Martin Konecny 7b4b0805a9 CC-5071: Better RabbitMQ passwords
-create rabbitmq host on upgrade as well
2013-05-08 16:59:43 -04:00
Martin Konecny 4dba722272 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-08 16:53:42 -04:00
denise 7946d1e511 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-08 16:28:57 -04:00
denise 2e69b35d75 CC-5086: Calendar: Update show pops up instead of Add show after clicking a cell 2013-05-08 16:28:45 -04:00
Martin Konecny f5b1daf2e0 CC-5071: Better RabbitMQ passwords
-remove rabbitmq vhost on uninstall
2013-05-08 15:53:53 -04:00
Martin Konecny ebfa5b8c5c Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-08 15:25:52 -04:00
Martin Konecny 56b9d0580f CC-5071:
Better RabbitMQ passwords

-fixed
2013-05-08 15:25:30 -04:00
denise 8344f3f3d5 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-08 15:09:10 -04:00
denise fe88e6249a CC-5093: Please disable link option for recording show 2013-05-08 15:08:56 -04:00
Naomi 35c8e80f6b Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-08 14:21:55 -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
Martin Konecny 357565bdcd Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-08 13:47:37 -04:00
Martin Konecny f0e846db75 CC-5049: Error messages on Liquidsoap start up/shut down after Airtime install
fixed
2013-05-08 13:47:24 -04:00
denise 9dbec4636a CC-5106: Calendar: Context menu "Show contents" is missing for past shows 2013-05-08 13:43:27 -04:00
denise fae0b2f873 CC-5111: Please make upgrade detect the tracks already scheduled and added in playlist 2013-05-08 13:11:30 -04:00
denise b4dc17f7e8 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-08 12:06:00 -04:00
denise d8ba15fac4 CC-5091: Linked Show: Cannot change the start time ahead 2013-05-08 12:05:45 -04:00