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

12269 Commits

Author SHA1 Message Date
denise 85ee8aa0b2 Fixed bug where schedule start times were not getting calculated properly 2013-05-28 11:25:37 -04:00
Martin Konecny c8f0c9505e Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-28 11:07:52 -04:00
Martin Konecny 951eeb0bbe CC-5178: 
Dashboard: Error happens after creating a show

-fixed
 2013-05-28 11:07:45 -04:00
Naomi bf6437cf09 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-27 17:02:46 -04:00
Naomi 28f957be92 CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2013-05-27 17:02:34 -04:00
Martin Konecny 84abd78c8f CC-5109: Fix race-condition when updating cc_pref table 
-not a race condition..was a logic error.
 2013-05-27 15:58:29 -04:00
denise 1c452988cf Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-27 15:35:06 -04:00
denise 90ad62e4f9 CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows 
Refactoring schedule inserts
 2013-05-27 15:34:54 -04:00
Naomi 1336b1a87d Merge branch '2.4.x' 2013-05-27 15:34:34 -04:00
Naomi 5ba72d00bc CC-5109 : Fix race-condition when updating cc_pref table 2013-05-27 15:33:53 -04:00
Naomi 1e69e8b820 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-27 14:47:20 -04:00
Naomi 6b12dcdc2a Merge branch '2.4.x' 2013-05-27 14:46:48 -04:00
Naomi 051933e9ed Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-27 14:37:44 -04:00
Naomi 408ecc530d CC-3822 : NowPlaying-> Time filter is allowing Start_Time be greater than the End_Time 2013-05-27 14:37:16 -04:00
Martin Konecny 1130cf961c CC-5049: Error messages on Liquidsoap start up/shut down after Airtime install 
-fixed
 2013-05-27 13:41:36 -04:00
Martin Konecny 63b0d4194a CC-5109: 
Fix race-condition when updating cc_pref table

-not a race condition..was a logic error.
 2013-05-27 12:30:58 -04:00
Martin Konecny 9aedb40bdd CC-5109: 
Fix race-condition when updating cc_pref table

-not a race condition..was a logic error.
 2013-05-27 12:30:19 -04:00
Naomi 4c791e573b Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-27 11:57:00 -04:00
Naomi 9ce3b0c043 small modifications to make the waveform enabled in firefox 21 (playout does not work though) 2013-05-27 11:55:57 -04:00
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
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 46ecd69b03 Merge branch '2.4.x' 2013-05-23 13:47:19 -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 5c11f5fc72 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
 2013-05-22 18:08:14 -04:00
Martin Konecny 4e1dc6a86e make operators more local to each queue source 2013-05-22 18:07:12 -04:00
Martin Konecny 551d65ebf0 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-22 18:04:07 -04:00
Martin Konecny 45e5d339a1 make more operators local to each source 2013-05-22 18:03:56 -04:00
Naomi bb5889e6a5 CC-5172 : errors from setting cues in waveform editor not handled properly 2013-05-22 17:52:02 -04:00
Naomi d51139b615 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-22 17:50:59 -04:00
Naomi 0bfcd32554 CC-5172 : errors from setting cues in waveform editor not handled properly 2013-05-22 17:50:34 -04:00
Martin Konecny dc19d3f0b0 Merge branch '2.4.x' into 2.4.x-saas 2013-05-22 17:39:33 -04:00
Martin Konecny 36567c85cd create on_metadata callback for each source instead of once on unified source 2013-05-22 17:39:18 -04:00
Martin Konecny 254d3b8950 Merge branch '2.4.x' into 2.4.x-saas 2013-05-22 16:09:02 -04:00