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

11213 Commits

Author SHA1 Message Date
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
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 ab89b80b85 remove unnecessary install code for saas 2013-05-21 17:36:57 -04:00
Martin Konecny ab5639ef79 remove unnecessary install code for saas 2013-05-21 17:27:34 -04:00
Martin Konecny 3b9b23a7dd Merge branch '2.3.x-saas' into 2.4.x-saas 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/airtime-playout
 2013-05-21 16:40:10 -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
Martin Konecny 3208ab0fd1 Merge branch 'patch-2' of git://github.com/picizse/Airtime into picizse-patch-2 2013-05-16 12:28:23 -04:00
Martin Konecny 165b3b9640 Merge branch 'master' of git://github.com/Cougar/Airtime into Cougar-master 2013-05-16 12:27:17 -04:00
Martin Konecny 59785a952f make up for lack of 'total_seconds()' lib function for pre 2.7 version of python 2013-05-16 12:25:21 -04:00
Martin Konecny dc1ec789d2 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-16 12:08:38 -04:00
Martin Konecny d2f29b1f88 more informative message to user about new init.d script behaviour 2013-05-16 12:08:32 -04:00
cliff.wang 70b734c940 Update Chinese po file 2013-05-16 11:16:36 -04:00