Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
11089 commits 3 branches 0 tags 405 MiB
Commit graph

4205 commits

Author SHA1 Message Date
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
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