Merge branch 'master' into develop

.gitignore

@@ -7,8 +7,10 @@ pm_to_blib
 t/.db
 t/etc/ravada_ldap*.conf
 t/etc/remote_vm*.conf
+t/etc/front_ldap*.conf
 hypnotoad.pid
 log
 rvd_front.conf
 pkg-debian-out
 public/img/screenshots
+t/vm/b10*

CONTRIBUTING.md

@@ -1,49 +1,145 @@
-## Contributing
+# Contributing
 
 First off, thank you for considering contributing to Ravada. It's people
 like you that make it such a great tool.
 
-### 1. Where do I go from here?
+## 1. Where do I go from here?
 
 If you've noticed a bug or have a question that doesn't belong on the
 [mailing list](http://groups.google.com/group/ravada)
 or
 [search the issue tracker](https://github.com/UPC/ravada/issues?q=something)
 to see if someone else in the community has already created a ticket.
-If not, go ahead and [make one](https://github.com/UPC/ravada/issues/new)!
+You can also ask in our [telegram public group](https://t.me/ravadavdi).
+If it is not, go ahead and [create a new issue](https://github.com/UPC/ravada/issues/new)!
 
-### 2. Fork & create a branch
+## 2. Fork & create a branch
 
 If this is something you think you can fix, then
 [fork Ravada](https://help.github.com/articles/fork-a-repo)
-and create a branch with a descriptive name.
+and create a branch with a descriptive name. We prepend the issue number to
+the branch so it is easier to follow.
 
-A good branch name would be (where issue #325 is the ticket you're working on):
+A good branch name would be (where issue #77 is the one you're working on):
 
 ```sh
-git checkout -b 325_boost_performance
+git checkout -b 77_start_machine
 ```
 
-If you contribute code, *thank you* ! Plase, follow this rules so our
-code is in sync:
+## 3. Code Style
 
-- Use spaces, don't do tabs.
-- Add the issue number at the very beggining of the commit message
-``[#44] Fixed flux capacitor leak``
+See our
+[editor configuration](http://ravada.readthedocs.io/en/latest/devel-docs/editor-rules.html)
+guidelines so your code gets along with old code. A recurrent problem for newcommers
+is to submit code automatically cleaned by the editor. Usually, removed end of line
+spaces or spaces converted to tabs.
+Please make sure you don't do that. Run ``git diff`` before commit to see what you are
+exactly contributing.
 
-### 3. Get the tests running
+## 4. Commit Format
+
+If you contribute code, *thank you* ! Plase, follow this guide.
+
+Each commit message consists of a header, a body, and a footer. The header has a special format that includes a type, a scope, and a description.
+We use [conventional commits](https://conventionalcommits.org/) format. Each commit must be for
+a reason, and we should have an [issue](https://github.com/UPC/ravada/issues) for that, so we
+decided to add the issue number in the footer.
+
+The commit message should be structured as follows:
+
+```
+type(optional scope): description
+<blank line>
+optional body
+<blank line>
+footer #issue
+```
+
+Example:
+```
+fix: active virtual machines can not be started
+
+check the machine status before start
+returns if machine active
+before it crashed trying to start the machine
+
+fixes #77
+```
+
+### 4.1 Header: Type
+
+Commits must be prefixed with a type, which consists of a verb, feat, fix, build, followed by a colon and space.
+
+Your options:
+
+- build: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm).
+- ci: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs).
+- docs: Documentation only changes.
+- feat: A new feature.
+- fix: A bug fix.
+- perf: A code change that improves performance.
+- refactor: A code change that neither fixes a bug or adds a feature.
+- style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc).
+- test: Adding missing tests or correcting existing tests.
+
+### 4.2 Header: Optional Scope
+
+Refers to the extent, subject matter or contextual information about your changes. A scope is a phrase describing the file modified or a section of the codebase, it is always enclosed in parenthesis.
+
+Example for a (optional scope):
+
+    feat(parser): add ability to parse arrays
+
+### 4.3 Header: Description
+
+A description must immediately follow the type(optional scope): The description is a short description of the commit.
+
+Important:
+
+ - About commit character length, keep it concise and don't write more than 50 characters.
+ - Use the imperative present tense: change, make, add, update, fix, etc; Do not use changed,
+    changes, added, fixes, fixed, etc.
+ - Don't capitalize the first letter.
+ - Do not use a dot (.) at the end.
+
+### 4.4 Header Lenghth
+
+The header cannot be longer than 100 characters. This allows the message to be easier to read on GitHub as well as in various git tools.
+
+### 4.5 Writing the optional body
+
+The body should include the motivation for the change and contrast this with previous behavior.
+
+Example for optional body:
+
+```
+fix orthography
+remove out of date paragraph
+fix broken links
+ ```
+
+### 4.5 Writing the optional footer
+
+The <optional footer> should contain a closing reference to an issue if any.
+
+For example, to close an issue numbered 123, you could use the phrases Closes #123 in your
+pull request description or commit message. Once the branch is merged into the default branch,
+the issue will close.
+
+
+## 5. Get the tests running
 
 See this documentation about [testing](http://ravada.readthedocs.io/en/latest/devel-docs/commit-rules.html#testing) the project.
 
-#### 4. Did you find a bug?
+## 6. Did you find a bug?
 
 * **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/UPC/ravada/issues).
 
 * If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/UPC/ravada/issues/new).
 Be sure to include a **title and clear description**, as much relevant information as possible,
 and a **code sample**, an **executable test case** or a step by step guide demonstrating the expected behavior that is not occurring.
 
-### 5. Implement your fix or feature
+## 7. Implement your fix or feature
 
 At this point, you're ready to make your changes! Feel free to ask for help;
 everyone is a beginner at first :smile_cat:
@@ -52,9 +148,20 @@ Follow this guide about running [Ravada in development mode](http://ravada.readt
 
 If you change a translation or language file make sure you follow this small [guide](http://ravada.readthedocs.io/en/latest/devel-docs/translations.html?highlight=translate) and don't forget to add the issue number when committing.
 
-### 6. Make a Pull Request
+## 8. Push your changes
+
+Pushing refers to sending your committed changes to a remote repository, such as a repository
+hosted on GitHub. Before that all the changes where local in the computer you are working in.
+
+After working on your changes you need to Push it (upload) your newly created branch to GitHub
+
+    git push
+
+## 9. Create a Pull Request
 
-At this point, you should switch back to your master branch and make sure it's
+Pull requests or PR are proposed changes to a repository submitted by a user and accepted or rejected by a repository's collaborators.
+
+When your changes are done, you should switch back to your master branch and make sure it's
 up to date with Ravada's master branch:
 
 ```sh
@@ -71,11 +178,18 @@ git rebase master
 git push --set-upstream origin 325_boost_performance
 ```
 
-Finally, go to GitHub and
-[make a Pull Request](https://help.github.com/articles/creating-a-pull-request)
-:D
+Finally, go to our GitHub repository and
+[create a Pull Request](https://github.com/UPC/ravada/pulls)
+
+### 9.1 How to Write a Title for a Pull Request
+
+Pull Request should be named in reference to the main fix or feature you provide; minor information can be added to the description. Please be specific and don't use generic terms.
+Keep it concise and don't write more than 50 characters in the title.
+
+Read [more information about PR](https://help.github.com/articles/creating-a-pull-request)
+
 
-### 7. Keeping your Pull Request updated
+### 9.2 Keeping your Pull Request updated
 
 If a maintainer asks you to "rebase" your PR, they're saying that a lot of code
 has changed, and that you need to update your branch so it's easier to merge.
@@ -91,7 +205,7 @@ git pull --rebase origin master
 git push --force-with-lease origin 325_boost_performance
 ```
 
-### 8. Merging a PR (maintainers only)
+### 9.3 Merging a PR (maintainers only)
 
 A PR can only be merged into master by a maintainer if:
 

MANIFEST

@@ -1,28 +1,30 @@
 etc/rvd_front.conf.example
 etc/ravada.conf
-etc/xml/jessie-amd64.xml
-etc/xml/win8.1-volume.xml
-etc/xml/dsl-i386.xml
-etc/xml/yakkety64-amd64.xml
+etc/xml/default-volume.xml
 etc/xml/dsl-volume.xml
+etc/xml/jessie-amd64.xml
+etc/xml/jessie-i386.xml
 etc/xml/jessie-volume.xml
-etc/xml/xenial64-amd64.xml
-etc/xml/xenial-volume.xml
 etc/xml/swap-volume.xml
-etc/xml/win7pro-volume.xml
-etc/xml/xenial64-volume.xml
-etc/xml/sarah64-volume.xml
-etc/xml/jessie-i386.xml
-etc/xml/win8.1.xml
 etc/xml/trusty-amd64-volume.xml
-etc/xml/yakkety64-volume.xml
-etc/xml/win7pro.xml
+etc/xml/trusty-amd64.xml
 etc/xml/trusty-i386.xml
-etc/xml/xenial-i386.xml
 etc/xml/trusty-volume.xml
-etc/xml/trusty-amd64.xml
-etc/xml/default-volume.xml
-etc/xml/miniremix-volume.xml
+etc/xml/windows10-volume.xml
+etc/xml/windows_10.xml
+etc/xml/windows_12.xml
+etc/xml/windows_7.xml
+etc/xml/windows_8.xml
+etc/xml/windows_xp.xml
+etc/xml/wisuvolume.xml
+etc/xml/xenial-i386.xml
+etc/xml/xenial-volume.xml
+etc/xml/xenial64-amd64.xml
+etc/xml/xenial64-volume.xml
+etc/xml/yakkety64-amd64.xml
+etc/xml/yakkety64-volume.xml
+etc/xml/zesty-amd64.xml
+etc/xml/zesty-volume.xml
 etc/systemd/rvd_front.service
 etc/systemd/rvd_back.service
 lib/Ravada.pm

README.md

@@ -1,4 +1,11 @@
-# ravada [![GitHub version](https://img.shields.io/badge/version-0.2.14-brightgreen.svg)](https://github.com/frankiejol/ravada/releases) [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://github.com/frankiejol/ravada/blob/master/LICENSE) [![Documentation Status](https://readthedocs.org/projects/ravada/badge/?version=latest)](http://ravada.readthedocs.io/en/latest/?badge=latest) [![GitHub Stats](https://img.shields.io/badge/github-stats-ff5500.svg)](http://githubstats.com/upc/ravada)
+# ravada 
+
+[![GitHub version](https://img.shields.io/badge/version-0.2.17-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)
+[![Project Status: Active - The project has reached a stable, usable state and is being actively developed.](http://www.repostatus.org/badges/latest/active.svg)](http://www.repostatus.org/#active)
+[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg)](https://conventionalcommits.org)
 
 
 ## Remote Virtual Desktops Manager