Commit Graph

11043 Commits

Author SHA1 Message Date
cliff.wang 70b734c940 Update Chinese po file 2013-05-16 11:16:36 -04:00
cliff.wang 0e843e2e7b Update liquidsoup compile files 2013-05-16 10:51:57 -04:00
Martin Konecny ca6442f7f0 ensure we are parsing in base 10 2013-05-15 17:18:52 -04:00
Martin Konecny 1ab27e3cf8 be more idiomatic 2013-05-15 17:18:42 -04:00
Martin Konecny 95bb5b2f36 CC-5153:
Cancel show won't cut off current song after airtime-playout is restarted

-fixed
2013-05-15 17:18:15 -04:00
Martin Konecny 05dc0b7dbc added comments, remove deprecated code, better var names... 2013-05-15 16:44:36 -04:00
Martin Konecny 018c88d12a CC-5063:
"Nothing Scheduled" appears between 2 scheduled tracks

-fixed
2013-05-15 16:43:58 -04:00
denise 148e1b9e46 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-15 15:48:04 -04:00
denise 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
Naomi 10154ae724 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-15 15:39:07 -04:00
Naomi b0cdc606f8 CC-5096 : Add "i" (info) icon to stream output type 2013-05-15 15:38:46 -04:00
denise 58a806a607 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-15 15:32:43 -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 658fd82e1f version number change necessary for nightly build scripts 2013-05-15 13:55:21 -04:00
Martin Konecny 8545803dbf CC-5126: Media Monitor: Exception happens when cuein value is 00:00:00
-slightly better way of not writing cue-in/cue-out
2013-05-15 13:19:29 -04:00
Martin Konecny 4a82fe2e52 Revert "CC-5126: Media Monitor: Exception happens when cuein value is 00:00:00"
This reverts commit 9ad42b2b2c.
2013-05-15 13:13:37 -04:00
Martin Konecny ba3703b556 Revert "CC-5126:"
This reverts commit a2b500729c.
2013-05-15 13:10:56 -04:00
Martin Konecny 80686b7063 add parameter parsing to airtime-liquidsoap script.
-Allow us to prevent running as daemon
2013-05-15 13:06:16 -04:00
denise 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
denise 254ebb709e CC-5151: Calendar -> Remove all content -> Does not update scheduled flag in library 2013-05-15 11:25:30 -04:00
Martin Konecny 9ad42b2b2c CC-5126: Media Monitor: Exception happens when cuein value is 00:00:00
-also removed functions that query for cue-in/cue-out,
since we don't care about these.
2013-05-14 22:26:48 -04:00
Martin Konecny a2b500729c CC-5126:
Media Monitor: Exception happens when cuein value is 00:00:00

-fixed this be ensuring we're not writing cue-in/out values to the file.
This should never have been allowed.
2013-05-14 22:16:30 -04:00
Martin Konecny b2c8cb0f9d Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-14 19:18:51 -04:00
Martin Konecny 5080807a21 IM-629
-fix minor SQL syntax error
2013-05-14 19:18:41 -04:00
Martin Konecny b287409bfb IM-629
-not using show_instnace_filter POST param correctly
2013-05-14 19:18:30 -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 393c8abb95 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-14 18:14:51 -04:00
Naomi 7d5177d77d CC-5096 : Add "i" (info) icon to stream output type 2013-05-14 18:14:38 -04:00
Martin Konecny af7b2d5347 IM-629
-fix using instance id instead of show id
2013-05-14 17:18:20 -04:00
Martin Konecny 992e3c37ef IM-629
-add missing POST parameter
2013-05-14 17:18:11 -04:00
Martin Konecny 22a12dd1a9 IM-629
-show only single show at a time
2013-05-14 17:18:03 -04:00
Martin Konecny 43e825fe49 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-14 16:57:28 -04:00
Naomi 78187a72ac Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-14 16:52:24 -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
Martin Konecny 70a8d3d5dd CC-5146:
Output Stream Settings: Please disable options opus and aac when streaming server is SHOUTcast

-fixed
2013-05-14 16:16:58 -04:00
denise 8901d6b4d9 Committing new compiled .po files 2013-05-14 16:14:19 -04:00
denise ec87a8ff88 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-14 16:09:22 -04:00
denise e1d0dc9b95 Updated .po files 2013-05-14 16:08:21 -04:00
Naomi 20ef068246 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-14 15:49:56 -04:00
Naomi 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
Martin Konecny c693c4b015 remoe id's for mksafe (they aren't supported params) 2013-05-14 15:14:57 -04:00
Martin Konecny a59fc69d17 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-14 15:10:13 -04:00
Martin Konecny b3f0a2fcdd CC-5144:
SHOUTcast listener stats auth not working
2013-05-14 15:10:04 -04:00
Naomi 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
denise 2d09ba3a16 CC-4863: I18N:System -> Listener status: string is not translated 2013-05-14 11:50:01 -04:00
denise 4ee7724149 CC-4864: I18N: Password reset page is not translated 2013-05-14 11:32:21 -04:00
denise c173744929 CC-5090: Unscheduled tracks are still marked at Scheduled in linked show 2013-05-14 10:58:06 -04:00
denise bfd525395a Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-14 08:59:30 -04:00
denise 9377e21293 Removed unnecessary function call when editing a show 2013-05-14 08:59:21 -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