Commit 5d57f19c authored by Francesc Guasch's avatar Francesc Guasch
Browse files

Merge branch 'master' of https://github.com/UPC/ravada

parents 5dd45f58 225ec9df
......@@ -3,5 +3,22 @@
**Implemented enhancements:**
- Define volume types [\#529]
- User experience acces directly to virtual desktop [\#1145]
- Restrict access using client headers [\#1213]
- Rebase virtual machines [\#1224]
- Change number of virtual CPUs [\#1238]
- Added Kali 2020 to the default ISO list [\#1236]
- Add turkish translation [\#1239]
- Arabic translation [\#1244]
**Bugfixes**
- Anonymous users don't get deleted [\#1023]
- Graphic parameters are removed on remote node base [\#1135]
- Renew mac with 2 devices [\#1232]
**Refactor**
- Turn frontend pulling to websockets [\#1187]
- Save screenshot database [\#1207]
......@@ -3330,6 +3330,7 @@ sub _cmd_list_isos($self, $request){
my $vm_type = $request->args('vm_type');
my $vm = Ravada::VM->open( type => $vm_type );
$vm->refresh_storage();
my @isos = sort { "\L$a" cmp "\L$b" } $vm->search_volume_path_re(qr(.*\.iso$));
$request->output(encode_json(\@isos));
......
......@@ -6,7 +6,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-01-03 10:12+0300\n"
"PO-Revision-Date: 2017-05-02 16:20+0200\n"
"Last-Translator: Fernando Verdugo fernando@etsetb.upc.edu\n"
"Last-Translator: Mohamed Guennoun mohamedguennoun@gmail.com\n"
"Language-Team: \n"
"Language: ca\n"
"MIME-Version: 1.0\n"
......@@ -280,6 +280,12 @@ msgstr "أو انسخ الأسطر التالية في ملف" "ASCII" " واح
msgid "Login"
msgstr "تسجيل الدخول"
msgid "Valencian"
msgstr "بلنسية اسبانيا"
msgid "Turkish"
msgstr "التركية"
msgid "Welcome"
msgstr "مرحبًا"
......
......@@ -110,6 +110,7 @@
};
ws_connected = false;
$timeout(function() {
if (typeof $scope.public_bases === 'undefined') $scope.public_bases = 0;
if (!ws_connected) {
$scope.ws_fail = true;
}
......
......@@ -275,6 +275,10 @@ sub test_rebase($vm, $swap, $data, $with_cd) {
$base->add_volume(type => 'data', size=>$VOL_SIZE) if $data;
$base->prepare_base(user => user_admin, with_cd => $with_cd);
$base->add_volume(type => 'swap', size=>$VOL_SIZE) if $swap;
$base->add_volume(type => 'data', size=>$VOL_SIZE) if $data;
$base->prepare_base(user => user_admin, with_cd => $with_cd);
my $clone1 = $base->clone( name => new_domain_name, user => user_admin);
my $clone2 = $base->clone( name => new_domain_name, user => user_admin);
......
......@@ -18,6 +18,7 @@
<h3 class="mb-3"><%=l 'Setting your default language' %></h3>
<form method='post' enctype="multipart/form-data">
<%=l 'Language:' %> <select onchange="this.form.submit();" id="tongue" name="tongue" >
<option <%= $c->param("tongue") eq 'tr' ? "selected" : "" %> value="tr" ><%=l 'Turkish' %></option>
<option <%= $c->param("tongue") eq 'ar' ? "selected" : "" %> value="ar" ><%=l 'Arab' %></option>
<option <%= $c->param("tongue") eq 'en' ? "selected" : "" %> value="en" ><%=l 'English' %></option>
<option <%= $c->param("tongue") eq 'ca' ? "selected" : "" %> value="ca" ><%=l 'Catalan' %></option>
......@@ -32,7 +33,7 @@
<option <%= $c->param("tongue") eq 'pt' ? "selected" : "" %> value="pt" ><%=l 'Portuguese' %></option>
<option <%= $c->param("tongue") eq 'ja' ? "selected" : "" %> value="ja" ><%=l 'Japanese' %></option>
<option <%= $c->param("tongue") eq 'vi' ? "selected" : "" %> value="vi" ><%=l 'Vietnamese' %></option>
<option <%= $c->param("tongue") eq 'cat@valencia' ? "selected" : "" %> value="cat@valencia" ><%=l 'Valenciano' %></option>
<option <%= $c->param("tongue") eq 'cat@valencia' ? "selected" : "" %> value="cat@valencia" ><%=l 'Valencian' %></option>
</select>
% if ($changed_lang) {
<font color="green"> <%=l 'Your language has been changed successfully' %></font>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment