Commit Graph

11401 Commits

Author SHA1 Message Date
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
Naomi Aro 69f6295553 CC-5108 : Waveform Editor UI
error check for if both tracks cannot be decoded.
2013-05-24 11:27:56 -04:00
Naomi Aro f5e03db9fe CC-5108 : Waveform Editor UI
making sure the correct li is activated when a track has a decoding error.
2013-05-24 11:23:08 -04:00
drigato 46cc2d00b8 Removed CRLF 2013-05-24 10:30:37 -04:00
drigato 0e9c9e3946 Updating de_DE datatables and plupload language files. Thanks to Silvio Mende 2013-05-24 10:29:07 -04:00
drigato 84dfe127b6 Updating de_DE .po file. Thanks to Silvio Mende 2013-05-24 10:27:02 -04:00
drigato 96ac9cb534 CC-5174: Linked Show: Update a regular show to linked show will move the whole scheduled time forward. 2013-05-24 09:43:03 -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
Martin Konecny ca37ec3aff CC-5049:
Error messages on Liquidsoap start up/shut down after Airtime install

Suppress global warning messages. Clients should decide whether to print
or not.
2013-05-23 17:17:00 -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
Martin Konecny 16bd407136 create on_metadata callback for each source instead of once on unified source
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
2013-05-23 13:05:07 -04:00
Martin Konecny 2a897414a4 make operators more local to each queue source
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
2013-05-23 13:02:50 -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
Martin Konecny dd28c8ae31 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-22 16:03:35 -04:00
Martin Konecny 8e990e2bf9 CC-5170:
Sometimes the dashboard does not show the current playing file

-fixed
2013-05-22 16:03:24 -04:00
Naomi d82725cb54 CLRF fix 2013-05-22 15:35:59 -04:00
Naomi eda21307ff Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-22 15:34:16 -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
Daniel James 18a1c7ad98 Localization updates for fixes in CC-5166 and CC-5168 2013-05-22 10:55:14 +01:00
Daniel James 2e970bfc8a Fixes date format in Smart Block tooltip (CC-5618) 2013-05-22 10:25:43 +01:00
Daniel James 7ec664823d Fixes whitespace to the left of 'Open Media Builder' button (CC-5166) 2013-05-22 10:23:42 +01:00
Daniel James 717cda984a Fixed 'steam' typo in stream settings tooltip 2013-05-22 10:21:27 +01:00
Daniel James 8caea983dc Initial credits for 2.4.0 release, added new translators 2013-05-22 10:20:31 +01:00
Naomi 3ad7c868e2 Merge branch 'SAAS-317-datatables-reorder' into 2.4.x 2013-05-21 17:44:25 -04:00
Naomi 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
Martin Konecny 8e617b33de add ability to use id's with mksafe operator 2013-05-21 16:31:32 -04:00
denise fb605ccb71 Renamed 'Open Playlist Editor' button to 'Open Media Builder' on Library page 2013-05-21 09:30:35 -04:00
denise 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
denise 2f6e2e7de6 Merged in new string into updated de_DE .po file 2013-05-17 14:13:01 -04:00
denise abd3a37970 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-17 14:09:32 -04:00
denise 29225a8ea3 Updating de_DE .po file. Thanks Silvio Mende! 2013-05-17 14:09:19 -04:00
Martin Konecny 01d16348db Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-17 13:20:40 -04:00
Martin Konecny ae41a4f9ff more persistent links (won't be invalid if title changes) 2013-05-17 13:20:28 -04:00
denise d57836c42b CC-5159: Repeating Shows doesn't populate correct dates sometimes 2013-05-17 13:10:15 -04:00
Martin Konecny 76a02796b7 implement method stub 2013-05-17 12:16:04 -04:00
Martin Konecny d205b0dbd3 remove string literal 2013-05-17 12:14:33 -04:00
denise 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
denise dc664ad9ff CC-5156: Hungarian language is shown in strange font on login page 2013-05-17 11:05:38 -04:00
denise 9133384789 is_scheduled flag was not getting updated when shows were deleted 2013-05-16 15:03:10 -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 f4d313a67c Hungarian translation locale option 2013-05-16 12:50:12 -04:00
denise 1b2c60dd57 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-16 12:47:52 -04:00
denise 3010d014b4 Hungarian translation 2013-05-16 12:47:40 -04:00
Martin Konecny 1af4c7bbad fix version # in VERSION file 2013-05-16 12:33:27 -04:00