Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
Martin Konecny 2013-01-14 14:07:55 -05:00
commit ba66746a00
19 changed files with 989 additions and 278 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/public/css/styles.css
View file

@ -2992,7 +2992,7 @@ dd .stream-status {
.edit-user-errors {
margin-left: 33% !important;
width: 208px;
}
.jp-container a#popup-link {
width: 104px;
border: 1px solid black;

2
airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
View file

@ -113,7 +113,7 @@ var AIRTIME = (function(AIRTIME) {
}
if (aSchedIds.length == 0) {
alert("Please select a cursor position on timeline.");
alert($.i18n._("Please select a cursor position on timeline."));
return false;
}
console.log(aMediaIds);