Commit f8eb480d authored by Francesc Guasch's avatar Francesc Guasch
Browse files

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

parents bcf1e0a1 14e62ca4
......@@ -2,16 +2,5 @@
**Implemented enhancements:**
- Polished action buttons in main screen [\#1408]
- Polished shutdown clones buttons [\#1406]
- Add debug option [\#1402]
- Loading icon [\#1401]
- Feature migrate machine [\#1393]
**Bugfixes**
- Ubuntu 20.04 MD5SUM file gone [\#1420]
- Fix docker files config and dependencies [\#1411]
- Fix docker files for tzdata package compatibility [\#1376]
- Fix sync clones back [\#1403]
- Fix nodes nat [\#1400]
......@@ -240,7 +240,7 @@ git fetch upstream
Now we create a new branch:
```sh
git checkout -b feature/cool_thing
git checkout -b feature/cool_thing upstream/develop
```
Reset this branch, now it will be an exact replica of upstream UPC/develop:
......
# ravada
[![GitHub version](https://img.shields.io/badge/version-0.9.0-brightgreen.svg)](https://github.com/UPC/ravada/releases) [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://github.com/UPC/ravada/blob/master/LICENSE)
[![GitHub version](https://img.shields.io/badge/version-0.11.0-brightgreen.svg)](https://github.com/UPC/ravada/releases) [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://github.com/UPC/ravada/blob/master/LICENSE)
[![Documentation Status](https://readthedocs.org/projects/ravada/badge/?version=latest)](http://ravada.readthedocs.io/en/latest/?badge=latest)
[![Follow twitter](https://img.shields.io/twitter/follow/ravada_vdi.svg?style=social&label=Twitter&style=flat-square)](https://twitter.com/ravada_vdi)
[![Telegram Group](https://img.shields.io/badge/Telegram-Group-blue.svg)](https://t.me/ravadavdi)
......
......@@ -3,7 +3,7 @@ package Ravada;
use warnings;
use strict;
our $VERSION = '0.11.0';
our $VERSION = '1.0.0';
use Carp qw(carp croak cluck);
use Data::Dumper;
......@@ -268,8 +268,8 @@ sub _update_isos {
,arch => 'amd64'
,xml => 'focal_fossa-amd64.xml'
,xml_volume => 'focal_fossa64-volume.xml'
,url => 'http://releases.ubuntu.com/20.04'
,file_re => '^ubuntu-20.04.1-desktop-amd64.iso'
,url => 'http://releases.ubuntu.com/20.04/'
,file_re => '^ubuntu-20.04.\d+-desktop-amd64.iso'
,sha256_url => '$url/SHA256SUMS'
,min_disk_size => '9'
}
......@@ -921,6 +921,9 @@ sub _remove_old_isos {
,"DELETE FROM iso_images "
." WHERE (name LIKE 'Ubuntu Focal%' OR name LIKE 'Ubuntu Bionic%' ) "
." AND ( md5 IS NOT NULL OR md5_url IS NOT NULL) "
,"DELETE FROM iso_images "
."WHERE name like 'Ubuntu Focal%' "
." AND file_re like '%20.04.1%'"
) {
my $sth = $CONNECTOR->dbh->prepare($sql);
$sth->execute();
......@@ -3197,6 +3200,18 @@ sub _cmd_clone($self, $request) {
);
}
sub _get_last_used_clone_id
{
my ($base_name, $domains) = @_;
my $last_used_id = 0;
foreach my $domain (@$domains)
{
next if ($domain->{is_base});
$last_used_id = $1 if (($domain->{name} =~ m/^$base_name\-(\d+)$/) && ($1 > $last_used_id));
}
return $last_used_id;
}
sub _req_clone_many($self, $request) {
my $args = $request->args();
my $id_domain = $args->{id_domain};
......@@ -3215,8 +3230,9 @@ sub _req_clone_many($self, $request) {
$args->{after_request} = $req_prepare->id;
}
my @reqs;
my $last_used_id = _get_last_used_clone_id($base->name, $domains);
for ( 1 .. $number ) {
my $n = $_;
my $n = $last_used_id + $_;
my $name;
for ( ;; ) {
while (length($n) < length($number)) { $n = "0".$n };
......
# Translation for Ravada project
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl)
msgid ""
msgstr ""
"Language: he\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
msgid "Ravada broker"
msgstr ""
msgid "Machine Name"
msgstr ""
msgid "Tools"
msgstr ""
msgid "Choose a Machine to Start"
msgstr ""
msgid "Start"
msgstr ""
msgid "Stop"
msgstr ""
msgid "View"
msgstr ""
msgid "Prepare base"
msgstr ""
msgid "Clone"
msgstr ""
msgid "Clone/s"
msgstr ""
msgid "Users List"
msgstr ""
msgid "Name"
msgstr ""
msgid "Log Out"
msgstr ""
msgid "Available Machines"
msgstr ""
msgid "Help"
msgstr ""
msgid "Requirements"
msgstr ""
msgid "About"
msgstr ""
msgid "Mark all as read"
msgstr ""
msgid "Settings"
msgstr ""
msgid "New Machine"
msgstr ""
msgid "I want to change my password"
msgstr ""
msgid "I want to change my language"
msgstr ""
msgid "Language:"
msgstr ""
msgid "English"
msgstr ""
msgid "Spanish"
msgstr ""
msgid "Catalan"
msgstr ""
msgid "Galician"
msgstr ""
msgid "French"
msgstr ""
msgid "Hindi"
msgstr ""
msgid "Indonesian"
msgstr ""
msgid "Persian"
msgstr ""
msgid "Japanese"
msgstr ""
msgid "German"
msgstr ""
msgid "New Password:"
msgstr ""
msgid "Confirm Password:"
msgstr ""
msgid "Submit"
msgstr ""
msgid "Your language has been changed successfully"
msgstr ""
msgid "Your password has been changed successfully"
msgstr ""
msgid "Password is too short"
msgstr ""
msgid "Password fields do not match"
msgstr ""
msgid "Some of the password fields are empty"
msgstr ""
msgid "Status"
msgstr ""
msgid "Actions"
msgstr ""
msgid "Down"
msgstr ""
msgid "Running"
msgstr ""
msgid "Shutdown"
msgstr ""
msgid "Screenshot"
msgstr ""
msgid "Paused"
msgstr ""
msgid "Machine locked by request"
msgstr ""
msgid "Process"
msgstr ""
msgid "Copy"
msgstr ""
msgid "Error!"
msgstr ""
msgid "Error"
msgstr ""
msgid "Backend not available!"
msgstr ""
msgid "Subject"
msgstr ""
msgid "Date"
msgstr ""
msgid "Mark as read"
msgstr ""
msgid "Mark as unread"
msgstr ""
msgid "No messages to show"
msgstr ""
msgid "Admin"
msgstr ""
msgid "Machines"
msgstr ""
msgid "machines"
msgstr ""
msgid "Users"
msgstr ""
msgid "users"
msgstr ""
msgid "Messages"
msgstr ""
msgid "messages"
msgstr ""
msgid "Admin tools"
msgstr ""
msgid "Remove base"
msgstr ""
msgid "Restore"
msgstr ""
msgid "Hibernate"
msgstr ""
msgid "Are you sure?"
msgstr ""
msgid "Yes"
msgstr ""
msgid "No"
msgstr ""
msgid "Make public"
msgstr ""
msgid "Machine settings"
msgstr ""
msgid "Cannot remove base, machine has clones"
msgstr ""
msgid "show clones"
msgstr ""
msgid "hide clones"
msgstr ""
msgid "For Spice redirection you will need to install"
msgstr ""
msgid "in your computer."
msgstr ""
msgid "Search in your distro, e.g. in Debian/Ubuntu with"
msgstr ""
msgid "You will need to install"
msgstr ""
msgid "and USB drivers ("
msgstr ""
msgid ""
"Be aware that in Windows, Spice redirection is not automatic. It is "
"necessary to associate protocol with the app."
msgstr ""
msgid "To make this possible, download"
msgstr ""
msgid ""
"or copy the following lines in an ASCII file and save with extension .reg, "
"then execute the file."
msgstr ""
msgid "Login"
msgstr ""
msgid "Welcome"
msgstr ""
msgid "A viewer is required to run the virtual machines."
msgstr ""
msgid "It is required a viewer to run the virtual machines."
msgstr ""
msgid "Virtual Machines"
msgstr ""
msgid "User"
msgstr ""
msgid "Password"
msgstr ""
msgid "Start session"
msgstr ""
msgid "bits) in your computer."
msgstr ""
msgid "Permissions"
msgstr ""
msgid "can change the settings of owned virtual machines."
msgstr ""
msgid "can change the settings of any virtual machines."
msgstr ""
msgid "can change the settings of any virtual machines "
msgstr ""
msgid "cloned from one base owned by the user."
msgstr ""
msgid "can clone public virtual machines."
msgstr ""
msgid "can clone any virtual machine."
msgstr ""
msgid "can create bases."
msgstr ""
msgid "can create virtual machines."
msgstr ""
msgid "can grant permissions to other users"
msgstr ""
msgid "can hibernate any virtual machine."
msgstr ""
msgid "can hibernate clones from virtual machines owned by the user."
msgstr ""
msgid "can hibernate any clone."
msgstr ""
msgid "can remove any virtual machines owned by the user."
msgstr ""
msgid "can remove any virtual machine."
msgstr ""
msgid "can remove clones from virtual machines owned by the user."
msgstr ""
msgid "can remove any clone."
msgstr ""
msgid "can take a screenshot of any virtual machine owned by the user."
msgstr ""
msgid "can take a screenshot of any virtual machine."
msgstr ""
msgid "can shutdown any virtual machine."
msgstr ""
msgid "can shutdown clones from virtual machines owned by the user."
msgstr ""
msgid "Submit Query"
msgstr ""
msgid "From Template"
msgstr ""
msgid "From Machine"
msgstr ""
msgid "Backend"
msgstr ""
msgid "Select Template"
msgstr ""
msgid "This ISO image has not been downloaded yet. It may take some minutes, even hours until the file is fetched from the Internet."
msgstr ""
msgid "Download now"
msgstr ""
msgid "Select ISO"
msgstr ""
msgid "Template"
msgstr ""
msgid "Disk Size: (GB)"
msgstr ""
msgid "Swap Size: (GB)"
msgstr ""
msgid "Ram: (GB)"
msgstr ""
msgid "Machine name is required."
msgstr ""
msgid "Machine name can't exceed 20 characters."
msgstr ""
msgid "Backend selection is required."
msgstr ""
msgid "ISO image selection is required."
msgstr ""
msgid "Template selection is required."
msgstr ""
msgid "A machine with that name already exists."
msgstr ""
msgid "The machine name is only allowed to consist of alphabetic characters, numbers, dashes and points."
msgstr ""
msgid "Create"
msgstr ""
msgid ""
"can change the settings of all virtual machines "
"cloned from one base owned by the user."
msgstr ""
msgid "monitoring"
msgstr ""
msgid "Are you sure you want to remove the Base of"
msgstr ""
msgid "Are you sure you want to prepare the Base of"
msgstr ""
msgid "Are you sure you want to change the Public state of"
msgstr ""
msgid "Search"
msgstr ""
msgid "There are no public bases available in this system."
msgstr ""
msgid "There are no machines available in this system."
msgstr ""
msgid "Create one."
msgstr ""
msgid "not public"
msgstr ""
msgid "User Settings"
msgstr ""
msgid "Create a new account"
msgstr ""
msgid "Username"
msgstr ""
msgid "Hide Private"
msgstr ""
msgid "Show All"
msgstr ""
msgid "Shutting down ..."
msgstr ""
msgid "It may take a couple of minutes."
msgstr ""
msgid "Hybernating ..."
msgstr ""
msgid "Description"
msgstr ""
msgid "Rename"
msgstr ""
msgid "Options"
msgstr ""
msgid "Drivers"
msgstr ""
msgid "Graphics"
msgstr ""
msgid "Remove Machine"
msgstr ""
msgid "System overview"
msgstr ""
msgid "Danger Zone"
msgstr ""
msgid "Once you delete the machine, there is no going back. Please be certain."
msgstr ""
msgid "Danger"
msgstr ""
msgid "This will remove all the contents of the machine"
msgstr ""
msgid "This action can't be undone"
msgstr ""
msgid "Are you sure ?"
msgstr ""
msgid "Yes, remove"
msgstr ""
msgid "Virtual Machine"
msgstr ""
msgid "removed"
msgstr ""
msgid "This will remove all the"
msgstr ""
msgid "clones of the machine"
msgstr ""
msgid "Yes, remove all the clones"
msgstr ""
msgid "This virtual machine can't be removed because it has"
msgstr ""
msgid "clones"
msgstr ""
msgid "Clones"
msgstr ""
msgid "This machine has not Graphics parameters!"
msgstr ""
msgid "recommended"
msgstr ""
msgid "to"
msgstr ""
msgid "Changing Public State"
msgstr ""
msgid "Changing Base State"
msgstr ""
msgid "action"
msgstr ""
msgid "Grants"
msgstr ""
msgid "public"