Merge branch 'develop' into 'master'

[release] Regular merge of develop

See merge request !524

external/contribute/web-ide/web-ide.md

@@ -13,7 +13,7 @@ redirect_from:
 
 # Contribute using Gitlab Web IDE
 
-This shows how to use Gitlab Web IDE to add or edit a How-to card:
+This card shows how to use GitLab Web IDE to modify a How-to card.
 
 Before you start, please make sure that you have the correct access rights to edit the repository.
 
@@ -22,75 +22,73 @@ the repository maintainers, or use your own copy of the repository (called a `fo
 Please follow [these instructions](https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html#creating-a-fork) to
 obtain your copy (fork). You can then [mirror the fork automatically]({{ '/?contribute:mirror-fork' | relative_url }}) to keep in sync.*
 
-A clear difference between editing a file in a git-tracked repository compared to a live document is that you can make an edit directly, and then suggesting the change. You can make this edit on your own version (called a `branch`), and then request to merge your changes into the main repository (through opening a `merge request`).
-
 ## Select the development version (branch)
 
-Before making an edit, please follow the instructions in the `README.md` file. Often, a standard development scheme is followed. For instance, there is a `master` branch (usually referred to as the stable version of the repository) and a `develop` branch (the unstable development version of the repository). There can also be lots of other versions in the same repository. In order to select the development version (`develop` branch), click on the drop-down menu and select `develop`
+Before making changes, please follow the instructions in the `README.md` file. This file contains important information about the project contribution guidelines. Often, a standard development scheme is followed. Usually, there is a `master` branch (referred to as the stable version of the repository) and a `develop` branch (the unstable development version of the repository). There can also be lots of other branches (versions) in the same repository. In most of the cases you would like to add your changes on top of `develop` branch that contains the latest version. In order to select the development version (`develop` branch), click on the drop-down menu on the top left of the page and select `develop`:
 
-<img src="img/img1.png">
+<img src="img/SelectBranch.png">
 
-The page will refresh and show the repository contents. On the top left of the page, you can see that the `develop` branch has been selected.
+The page will refresh and show the repository contents on this branch. You can see that the `develop` branch has been selected.
 
-<img src="img/img2.png">
+<img src="img/DevelopBranch.png">
 
 ## Open the web editor (Web IDE)
 
-You can now open the web editor (integrated development environment or IDE) by clicking on the Web IDE button:
+Now you can open the web editor (integrated development environment or IDE) by clicking on the Edit button and selecting Web IDE:
 
-<img src="img/img3.png">
+<img src="img/OpenWebIDE.png">
 
-Now, you can make changes to the file you wish. As an example, we will make a change to the file `privacy_policy.md`. Select the file `privacy_policy.md` from the list on the left.
+Now, you can make changes to the file you wish. As an example, we will change the file `privacy_policy.md`. Select the file `privacy_policy.md` from the list on the left.
 
-<img src="img/img4_v2.png">
+<img src="img/VSCode.png">
 
-Now, edit the file the way you want. For instance. we add a line with `test` in the first section:
+Now, edit the file the way you want. For instance, we added a line with `test` in the first section:
 
-<img src="img/img5.png">
+<img src="img/EditLine.png">
 
 *Note: You can see a green line on the left side of it, indicating that a new line has been added. The vertical line turns blue if a line is edited.*
 
-<img src="img/img55.png">
+<img src="img/EditedLine.png">
 
 ## Committing your change
 
-As already mentioned, a change has to be proposed, and will then be reviewed. The system used is through `merge requests`. Now, as you have edited the file, you can see that on the top left corner of the window, a blue circle with a number appeared on the `Source Control` button:
+Now, as you have edited the file, you can see that on the top left corner of the window, a circle with a number appeared on the `Source Control` button:
 
-<img src="img/img6_v2.png">
+<img src="img/CommitWindow.png">
 
-The number of commits are indicated in the blue circle on the `Source Control` button.
+This number indicates how many files has been changed, how many modifications there are to be saved.
 
 *Note: There is no `Save` button. You save your work by committing changes.*
 
-When clicking on `Commit...`, the page changes to display the changes made:
+To commit changes (save your modifications) click on `Source Control` button. It will open a commit dialog. Write a descriptive commit message to label the changes properly.
+
+If you would like to see all changes made in a file, click on the file name to display the changes made:
 
-<img src="img/img7_v2.png">
+<img src="img/CompareChanges.png"> test 
 
 You can see that a green line has been added on the right column. The left column displays the original file (of the `develop` branch).
 
-On the top left corner, you can see a form for committing the change. Here, you have to select `Commit to new branch` by clicking on the down arrow button. This is **important**.
+**Important:** You have to select `Commit to new branch` by clicking on the down arrow. 
 
-<img src="img/img8_v2.png">
+<img src="img/CommitToNewBranch.png">
 
 Once you click on the `Commit to new branch` button, type the name of your new branch and press `Enter` to accept or `Escape` to cancel.
 
-<img src="img/img88.png">
-
-You can also add a specific commit message to label the change properly. The name of the branch is generated automatically. You can, if you want, change it as well.
+<img src="img/CreateNewBranch.png">
 
 ## Submitting your merge request
 
-After creating the commit, the following pop-up window on the bottom right corner of your screen is going to indicate you that your changes have been commited. Click on the blue `Create MR` button to start your `Merge Request`.
+After creating the commit, the following pop-up window on the bottom right corner of your screen is going to indicate you that your changes have been commited. Click on the `Create MR` button to start your `Merge Request`.
 
-<img src="img/img888.png">
+<img src="img/CreateMR.png">
 
 You will be directed to the `New merge request` page. This page allows you to merge your changes with the target branch.
 
-<img src="img/img12.png">
+<img src="img/MergeRequestPage.png">
 
-Please make sure that you see that you are proposing to merge your branch (version) into the `develop` branch. You can change your target branch by clicking on the `Change branches` button. This is shown at the top of the page:
+Please make sure you are proposing to merge your branch (on your `fork`) into the `develop` branch (on main repository). You can change your target branch by clicking on the `Change branches` button at the top of the page. The following screenshot represents a merge request from `kc-test` branch on `kaan.cimir` fork of `howto-cards` to `develop` branch on original repository `R3/howto-cards`:
 
-<img src="img/img10_v2.png">
+<img src="img/ChangeBranchesInMR.png">
 
 You can then fill our the merge request submission form and select, for instance, an `Assignee`.
 
@@ -98,6 +96,8 @@ Good practice is to select `Delete source branch when merge request is accepted.
 
 Under `Changes`, you can see the added line:
 
-<img src="img/img11.png">
+<img src="img/ChangesImMR.png">
+
+All that is left now is to submit the merge request by clicking on `Create merge request` button. That is it.
 
-All that is left now is to submit the merge request by clicking on `Create merge request`. That is it.
+If you would like to understand more about described workflow, please consult [Git Trilogy Part 1: Contribute using GitLab](https://courses.lcsb.uni.lu/2022-05-31_git-trilogy-part-1/stable/#/) slides.

external/exchange-channels/cryptomator/cryptomator.md

+---
+card_order: 500
+layout: page
+permalink: /external/exchange-channels/cryptomator/
+shortcut: exchange-channels:cryptomator
+redirect_from:
+  - /cards/exchange-channels:cryptomator
+  - /external/cards/exchange-channels:cryptomator
+  - /exchange-channels/cryptomator
+  - /external/external/exchange-channels/cryptomator/
+---
+# Cryptomator
+
+Cryptomator is a cloud cryptor - a tool allowing to work on and to share encrypted data seamlessly. The main benefit of using Cryptomator is that the service is transparent - after proper setup, the user and all applications can work with the data exactly the same way as before while the data is more secured.
+
+<img src="img/cryptomator-diagram.png" height="500px"><br>
+
+Cryptomator protects your data by ingesting it in a so-called vault, which is mounted to a virtual drive and password protected. To access and view the data, you must unlock the vault with the created password. The data is stored on the cloud of your choice when creating the vault, but is encrypted automatically by the Cryptomator client. It is only from the virtual drive which act as a USB flash drive that you can access and view the data, as it shows the decrypted view of its content. Ingesting your files directly into the virtual drive permits Cryptomator to automatically encrypt the data with AES and 256-bit key length. 
+
+Please follow the below sections to: download Cryptomator locally on your computer, enable Cryptomator on your preffered cloud, or manage vaults as an administrator. Please visit Cryptomator’s official website for the full documentation on [vault management](https://docs.cryptomator.org/en/latest/). 
+
+`Note:` Cryptomator does not offer cloud storage but adds an extra protection to your data stored on the cloud by automatically encrypting the files in the vault. 
+
+## Downloading Cryptomator Desktop
+The desktop version of Cryptomator is available both for macOS, Windows, and Linux. Please follow the [guide](https://docs.cryptomator.org/en/latest/desktop/setup/) on Cryptomator's official website to install the application on your operating system. 
+
+ <img src="img/cryptomator-main.png" height="400px"><br>
+
+## Setting up key management system with Cryptomator Hub
+ Cryptomator Hub adds key and access management to your vaults from a central component deployed on your infrastructure, permitting collaborative work. As an admin, you can share your vaults with other people, who can access the vault by authenticating with Keycloak. There is thus no need for creating new accounts nor sharing encryption passwords with collaborators which are easily stolen, copied, or misused, and no data is shared on any online services. 
+
+As a vault administrator it is important to manage the admin password properly. In case you lose or forget the admin password, a recovery key is needed to restore access to the vault. This recovery key is generated upon creating the vault (see guide below). In practical, it is the responsibility of the project manager and/or PI to manage and store the admin vault password securely. Please use passphrase and proper password management when creating the admin vault password. For further information, visit the How-to Card on [password management]( https://howto.lcsb.uni.lu/?access:passwords). 
+
+## Enabling Cryptomator using a cloud of your choice
+1. Go to the LCSB instance of Cryptomator Hub https://lcsb.cryptomator.cloud/.
+2. Click on “LCSB Login”. 
+
+    <img src="img/cryptomatorHub-login.png" height="400px"> <br>
+
+3. Select "uni.lu" account to sign in. 
+
+    <img src="img/uni-login.png" height="400px"> <br>
+
+4. When signed in successfully, you will be presented with the Hub's main page. To create a new vault, click the “Add” button on the top left corner and then "create new". 
+
+    <img src="img/hub-mainpage.png" height="350px"> <br>
+
+5. Fill out vault name and admin password. The admin password is required to grant or revoke access to the vault. When the form is completed, click “Next”. 
+
+    <img src="img/creating-vault.png" height="350px"> <br>
+
+6. A recovery key is displayed on the page. Copy the recovery key and store it in a safe location (e.g. password management system). The recocery key is needed for restoring access to the vault data. Tick the checkbox and click “Create Vault”. 
+
+    <img src="img/recovery-key.png" height="350px"> <br>
+
+7. The vault has now been successfully created from the Hub. Click “download zipped vault folder”. 
+
+    <img src="img/download-vault-template.png" height="350px"> <br>
+
+8. Unzip the vault in your preferred cloud storage location (e.g., ownCloud or OneDrive). 
+
+    <img src="img/ownCloud-folder.png" height="300px"> <br>
+
+## Managing a vault as an administrator
+The following steps can only be performed by the vault administrator. 
+
+1. From the Hub's main page, click on the vault you wish to share and then "Manage vault". 
+
+    <img src="img/manage-vault.png" height="250px"> <br>
+ 
+2. Enter the vault admin password and click "Manage". 
+
+    <img src="img/vault-admin-password.png" height="200px"> <br>
+ 
+3. You are now able to share the vault with other team members by simply searching for the user and clicking the “add” button.
+
+    <img src="img/add-member.png" height="450px"> <br> 
+ 
+4. The team member has to register their local device to the shared vault (see next section). Once the device of the user has been registered to the vault, the admin can grant access by clicking on “update permission”. 
+
+    <img src="img/grant-access.png" height="150px"> <br>
+
+5. Once access is granted, the team member can unlock the vault locally. 
+
+## Collaborating on a shared vault as a user
+1. Open the desktop application. Click the “add’ button and then “Existing vault”. 
+
+    <img src="img/add-existing-vault.png" height="400px"> <br> 
+
+2. Click on “Choose”.
+
+    <img src="img/vault-file.png" height="400px"> <br> 
+ 
+3. Go to the shared vault folder on the cloud. Select "vault.cryptomator" and then "Open".  
+
+    <img src="img/import-vault.png" height="400px"> <br> 
+
+4. Click "Unlock now".
+
+     <img src="img/add-vault.png" height="350px"> <br> 
+
+5. Cryptomator will automatically redirect you to the login page. Please authenticate yourself with Keycloak.
+
+6. If it is the first time you connect your device to the shared vault, you have to register the device. In this case, you will be prompt to enter a device name and then click "Confirm. The admin can now grant access to the device. 
+
+   <img src="img/register-device.png" height="200px"> <br> 
+
+7. Once the admin grants access the vault is unlocked. Click “Reveal drive” to access the vault on the virtual drive. 
+
+   <img src="img/unlock-vault.png" height="400px"> <br> 
+
+8. All data can now be ingested in the vault on the virtual drive.
+
+    <img src="img/vault-data.png" height="400px"> <br> 
+
+9.	The cloud cannot see anything in the folder, as all data is encrypted - both folder/file name and files.
+
+    <img src="img/cloud-data.png" height="400px"> <br> 
+
+`Note:` Always ingest the files directly into the vault on the virtual drive, as it will be encrypted and stored properly. If the file is ingested directly in the folder of the cloud storage location, it will not get encrypted by Cryptomator! 
+
+
+
+
+