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

4268 Commits

Author SHA1 Message Date
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
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
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
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
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
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 3010d014b4 Hungarian translation 2013-05-16 12:47:40 -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
cliff.wang 70b734c940 Update Chinese po file 2013-05-16 11:16:36 -04:00
Martin Konecny ca6442f7f0 ensure we are parsing in base 10 2013-05-15 17:18:52 -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 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
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 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 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
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
Naomi 872f68505b CC-5108 Waveform Editor UI 2013-05-13 16:01:06 -04:00
Naomi 2ba743a436 CC-5132 : Playlist Editor: Add file before Smart Block will cause exception 2013-05-13 12:23:05 -04:00
Naomi bd2462170b CC-5121 : fix some SQL statements not being escaped/prepared 2013-05-13 11:42:11 -04:00
denise 6b560eede1 Deleted unused functions in Show.php 2013-05-13 09:55:17 -04:00
denise 741507fab1 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-13 09:22:50 -04:00
denise ba82e3b3ae Added missing localization files for en_GB, and de_AT 2013-05-13 09:22:40 -04:00
Naomi 82945038d5 CRLF fix 2013-05-10 17:44:50 -04:00
Naomi da46757e28 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-10 17:36:18 -04:00
Naomi b0018083c7 CC-5121 : fix some SQL statements not being escaped/prepared 2013-05-10 17:14:10 -04:00
denise 27b79c2e91 CC-5128: Library -> Do not auto sort by scheduled 2013-05-10 16:17:30 -04:00
denise a9d0b53954 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-10 16:08:07 -04:00
denise 79bc927a30 CC-5130: Calendar -> Linked icon disappears if show is full 2013-05-10 16:07:54 -04:00
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