Skip to content
Snippets Groups Projects
Commit a121ee29 authored by Kaan Cimir's avatar Kaan Cimir
Browse files

Merge branch 'develop' into 'master'

[release] Regular merge of develop

See merge request !518
parents 43a399eb 1c411794
No related branches found
Tags v5.10.1
4 merge requests!544Update external/lab-hsa/ppe/ppe.md, external/lab-hsa/ppe/img/img1.png,...,!543Update external/lab-hsa/ppe/ppe.md, external/lab-hsa/ppe/img/img1.png,...,!520ad-fridges,!518[release] Regular merge of develop
Pipeline #78856 passed with warnings
Showing
with 36 additions and 32 deletions
......@@ -32,7 +32,7 @@ This serves for internal authentication for resources provided by the LCSB, e.g.
## Requesting LUMS account as external collaborator, UL members or UL student
* In case you are not a member of LCSB/DLSM, please ask your collaborator at LSCB/DLSM to request the account for you. You will need to provide an institutional email address.
* In case you are not a member of LCSB/DLSM, please ask your collaborator at LCSB/DLSM to request the account for you. You will need to provide an institutional email address.
* Once the account is created, you will receive an email with your new LUMS account details and how to access services and VMS.
## Requesting LUMS account for externals collaborators, UL members or UL students
......
external/access/vpn-access/img/dns-settings.png

269 KiB

......@@ -16,7 +16,7 @@ VPN is used to access the servers that are hosted at the LCSB, but are not reach
## Download and start the VPN
Once you have reset your VPN Password, please download VPN client from [VPN](https://vpn.uni.lu/)
Once you have reset your VPN Password, please download VPN client from [vpn.uni.lu](https://vpn.uni.lu/).
**ENTER**
......@@ -30,3 +30,8 @@ Then depending on your distribution of OS, it will suggest you a link to downloa
<img src="img/vpn-download-01.png" height="300px"><br/>
## Troubleshooting
Despite establishing the VPN connection, if you still cannot reach the internal websites and How-to cards, please make sure that you **do not use a custom DNS configuration**. The DNS configuration can be displayed under the **privacy and security options of your browser** or the **network settings of your operating system**.
<img src="img/dns-settings.png" height="300px"><br/>
external/contribute/review/img/img9.png

26.8 KiB

......@@ -64,12 +64,14 @@ To have a more readable view, with the pictures integrated, click on the 3 dots
- Make your comment on the comment section and click on **Start a review** or on **Add comment now**. Clicking on *"Start a review"* will allow you to compile several comments before an email is sent to the assignee when you will click on **Finish review**. Clicking on *"Add comment now"* will send an email to the assignee for every comment.
Clicking on the first icon will allows you to directly suggest a change that the assignee will be able to accept or not.
<div align="center">
<img src="img/img7.png">
<img src="img/img9.png">
</div>
<div align="center">
<img src="img/img8.png">
</div>
When all the threads are resolved, you will be able to **Approve** the merge request and the repository maintenair can proceed with the merge.
When all the threads are resolved, you will be able to **Approve** the merge request and the repository maintainer will be able to proceed with the merge.
\ No newline at end of file
external/contribute/web-ide/img/img10.png

11 KiB

external/contribute/web-ide/img/img10_v2.png

38.8 KiB

external/contribute/web-ide/img/img4.png

443 KiB

external/contribute/web-ide/img/img4_v2.png

535 KiB

external/contribute/web-ide/img/img6.png

16.4 KiB

external/contribute/web-ide/img/img6_v2.png

16.6 KiB

external/contribute/web-ide/img/img7.png

377 KiB

external/contribute/web-ide/img/img7_v2.png

410 KiB

external/contribute/web-ide/img/img8.png

22.2 KiB

external/contribute/web-ide/img/img8_v2.png

24.6 KiB

......@@ -7,11 +7,13 @@ redirect_from:
- /external/cards/contribute:web-ide
- /contribute/web-ide
- /external/external/contribute/web-ide/
- /cards/contribute:add-edit-card
- /external/cards/contribute:add-edit-card
---
# Contribute using Gitlab Web IDE
This shows how to use Gitlab Web IDE to add or edit a howto-card:
This shows how to use Gitlab Web IDE to add or edit a How-to card:
Before you start, please make sure that you have the correct access rights to edit the repository.
......@@ -40,7 +42,7 @@ You can now open the web editor (integrated development environment or IDE) by c
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.
<img src="img/img4.png">
<img src="img/img4_v2.png">
Now, edit the file the way you want. For instance. we add a line with `test` in the first section:
......@@ -54,7 +56,7 @@ Now, edit the file the way you want. For instance. we add a line with `test` in
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:
<img src="img/img6.png">
<img src="img/img6_v2.png">
The number of commits are indicated in the blue circle on the `Source Control` button.
......@@ -62,13 +64,13 @@ The number of commits are indicated in the blue circle on the `Source Control` b
When clicking on `Commit...`, the page changes to display the changes made:
<img src="img/img7.png">
<img src="img/img7_v2.png">
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**.
<img src="img/img8.png">
<img src="img/img8_v2.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.
......@@ -76,22 +78,19 @@ Once you click on the `Commit to new branch` button, type the name of your new b
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.
Then, select `Start a new request` when you are ready to start the submission process and hit the `Commit` button.
## 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`.
<img src="img/img888.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">
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:
<img src="img/img10.png">
<img src="img/img10_v2.png">
You can then fill our the merge request submission form and select, for instance, an `Assignee`.
......@@ -102,4 +101,3 @@ Under `Changes`, you can see the added line:
<img src="img/img11.png">
All that is left now is to submit the merge request by clicking on `Create merge request`. That is it.
......@@ -13,7 +13,7 @@ redirect_from:
{:toc}
> AsperaWEB will be deprecated in the future (the end of service is planned for January 2023). LCSB File Transfer (LFT) will be used instead ([LFT quick guide](https://howto.lcsb.uni.lu/?exchange-channels:lft)).
> AsperaWEB will be deprecated in the future (the end of service is planned for January 2023). LCSB File Transfer (LFT) will be used instead ([LFT quick guide]({{ '/?exchange-channels:lft' | relative_url }})).
## Overview
......
......@@ -26,7 +26,7 @@ Similar to other cloud storage systems, ownCloud is accessible both via a browse
![LCSB ownCloud web login](img/owcld_1.png)
You can download the ownCloud client suitable for your staff computer [here](https://owncloud.com/desktop-app/). User documentation on ownCloud tools and portal can be found [here](https://doc.owncloud.com/server/client_releases.html).
User documentation on ownCloud tools and portal can be found [here](https://doc.owncloud.com/).
When sharing research data, one should observe the following guidance using Owncloud:
......@@ -47,13 +47,11 @@ When sharing research data, one should observe the following guidance using Ownc
## Installing Owncloud Desktop Client
**Important:** OwnCloud is fetching information from LUMS, therefore changes like a password reset (see How-to cards [Changing password for LUMS accounts]({{ '/?lums-passwords' | relative_url }}) should be performed **only** via LUMS!
**Important:** OwnCloud is fetching information from LUMS, therefore changes like a password reset (see How-to cards [Changing password for LUMS accounts]({{ '/?lums-passwords' | relative_url }})) should be performed **only** via LUMS!
1. Please try following link to download the owncloud desktop client depending on your operating system (this is an example for Windows, similar steps for other OS) -
1. Please try following link to download the Owncloud Desktop Client depending on your operating system (this is an example for Windows, similar steps for other OS) - [Owncloud Client](https://owncloud.com/desktop-app/)
[OwncloudClient](https://owncloud.org/download/#owncloud-desktop-client)
2. Start the owncloud client installation by clicking twice on the downloaded file
2. Start the Owncloud client installation by clicking twice on the downloaded file
3. Owncloud Setup Wizard will pop-up, like below image -
......@@ -73,7 +71,7 @@ When sharing research data, one should observe the following guidance using Ownc
**Note**- If you do not have admin rights, please ask SIU to provide you the admin rights on the laptop or do the installation for you.
8. Click **Finish** when the owncloud setup wizard completes -
8. Click **Finish** when the Owncloud setup wizard completes -
<img src="img/setup-wizard-complete.png" height="300px"><br/>
......
......@@ -12,8 +12,9 @@ redirect_from:
# How to get to the Luxembourg Centre for Systems Biomedicine
![](img/LCSB.jpg)
| House of Biomedicine (BT1) | Biotech II (BT2) |
| :----------------------------- | :----------------------------- |
| ------------------------------ | ------------------------------ |
| 7, avenue des Hauts-Fourneaux, L-4362 Esch-sur-Alzette | 6, avenue du Swing, L-4371 Belvaux |
| N 49°30'5.62'', E 5°56'57.14'' | N 49°29'59.73'', E 5°57'7.271 |
......@@ -59,13 +60,13 @@ Biotech II (LCSB II) is right next to ADEM (Agence pour le développement de l'e
Since Campus Belval is foreseen to be a green car-free Campus, parking may not be easy. Due to the constructions around
our buildings, we currently cannot offer visitor parking. To park your car we recommend using one of the following. From
either site it is less than five minute walk to either of our buildings.
- University parking “Mason du savoir” has outdoor and indoor areas<br>
- University parking “Mason du Savoir” has outdoor and indoor areas<br>
Price: first 15 min free, first 2 hours 0.8€/hour, afterwards 1€/hour<br>
- Belval Plaza has 2 parking garages<br>
Price: first 3 hours free, afterwards 3€/hour (from 07:00 to 20:00) and 1€/hour (from 20:00 to 07:00)
Price: Between 7:00 - 18:00, the first hour is free and an additional free hour is earned by shopping at a store in Belval Plaza and scanning the parking ticket at the store. Afterwards, 3€/hour until 18:00. After 18:00, the first hour is free, the second hour is 4€ and the rest of the night is 3€/hour.
- Belval-Gare [Park&Rail] parking garage<br>
Price: 1€/hour (from 06:00 to 19:00) and 0.6€/hour (from 19:00 to 06:00)
- ALDI parking (small parking, convinient for short visit of BT2 and Rouden Eck)<br>
Price: first 90 min free, next 1 hour 2€, afterwards 3€/hour
Price: 0.6€/30 min. (from 06:00 to 19:00) and 0.3€/30 min. (from 19:00 to 06:00). Monthly pass can be obtained at the CFL Store for 85€.
- ALDI parking (small parking, convenient for short visit of BT2 and Rouden Eck)<br>
Price: first 90 min free, next hour 2€, afterwards 3€/hour
![](img/map.jpg)
......@@ -17,14 +17,14 @@ This is an overview on websites to manage work and help you with the navigation
| Link | Description |
| :------ | :------ |
|[www.uni.lu](https://www.uni.lu)|General website of the University. You can find general information as well as specific information on the faculties and institutes here.|
|[uniluxembourg.sharepoint.com](https://uniluxembourg.sharepoint.com/) / [uniluxembourg.sharepoint.com/sites/lcsb/lscb_internal](https://uniluxembourg.sharepoint.com/sites/lcsb/lscb_internal/SitePages/default.aspx)|The internal platform of the University / the LCSB **Please note:** This site can only be accessed when you are logged into the university network, either in your office or via a VPN client from elsewhere. See also the [corresponding How-to Card](https://howto.lcsb.uni.lu/?access:vpn-cerbere-access).|
|[uniluxembourg.sharepoint.com](https://uniluxembourg.sharepoint.com/) / [uniluxembourg.sharepoint.com/sites/lcsb/lcsb_internal](https://uniluxembourg.sharepoint.com/sites/lcsb/lcsb_internal/SitePages/default.aspx)|The internal platform of the University / the LCSB **Please note:** This site can only be accessed when you are logged into the university network, either in your office or via a VPN client from elsewhere. See also the [corresponding How-to Card]({{ '/?access:vpn-access' | relative_url }}).|
|[service.uni.lu](https://service.uni.lu/sp)|Here you find service and support from the university. You can create tickets on all regulatory and legal issues as well as on IT-related topics, e.g. to get access to specific folders and software.|
|[lums.uni.lu](https://lums.uni.lu)|The LUMS (LCSB User Management System) allows you to get access to internal resources such as software provided and/or hosted by the LCSB. **Please note:** You need to request an additional account to be able to log in as your usual UNI.LU-credentials will **not do the job.** The LUMS-accounts can also be created for external researchers and collaborators.|
|[howto.lcsb.uni.lu](https://howto.lcsb.uni.lu/)|This is where the How-to Cards are deposited and constantly updated. You can find answers on administrative as well as on lab-related procedures here. For complex instructions, a step-by-step tutorial with corresponding screenshots or examples is provided. We encourage you to bookmark this page as many answers to your questions might be covered by a card. If you have any suggestions for improvements on existing or additional How-to Cards, just contact the R3 department.|
|[owncloud.lcsb.uni.lu](https://owncloud.lcsb.uni.lu/)|LCSB ownCloud is a private cloud storage service for the use of LCSB staff and collaborators. It is suitable for exchanging small-sized files (up to 1-2 gigabyte, all SSL encrypted). You need a [LUMS account](https://howto.lcsb.uni.lu/?access:lums-passwords) for using this platform. The LUMS accounts can also be provided to external collaboration partners and can be requested at the [Service Portal](https://service.uni.lu/sp). For more information see also the [User’s Guide for ownCloud](https://howto.lcsb.uni.lu/?exchange-channels:owncloud).|
|[owncloud.lcsb.uni.lu](https://owncloud.lcsb.uni.lu/)|LCSB ownCloud is a private cloud storage service for the use of LCSB staff and collaborators. It is suitable for exchanging small-sized files (up to 1-2 gigabyte, all SSL encrypted). You need a [LUMS account]({{ '/?access:lums-passwords' | relative_url }}) for using this platform. The LUMS accounts can also be provided to external collaboration partners and can be requested at the [Service Portal](https://service.uni.lu/sp). For more information see also the [User’s Guide for ownCloud]({{ '/?exchange-channels:owncloud' | relative_url }}).|
|[daisy.lcsb.uni.lu](https://daisy.lcsb.uni.lu/)|The DAta Information SYstem (DAISY) is a comprehensive tool to manage your research data in a GDPR-compliant manner. You can create projects & datasets and share them with your collaboration partners. For more information and detailed description on DAISY, please refer to the [DAISY documentation](https://elixir.pages.uni.lu/daisy-doc/).|
|[gitlab.lcsb.uni.lu](https://gitlab.lcsb.uni.lu/)|A developer’s platform operated by the R3-team where you can contribute to publish and develop public protocols/procedures, etc. For instance, these How-to-cards can be created there. So also the corresponding card on [how to contribute](https://howto.lcsb.uni.lu/?contribute:web-ide).|
|[gitlab.lcsb.uni.lu](https://gitlab.lcsb.uni.lu/)|A developer’s platform operated by the R3-team where you can contribute to publish and develop public protocols/procedures, etc. For instance, these How-to-cards can be created there. So also the corresponding card on [how to contribute]({{ '/?contribute:web-ide' | relative_url }}).|
|[owa.uni.lu](https://owa.uni.lu/)|The Outlook Web Application to access your mail account via any web browser. Login with you UNI.LU-credentials.|
|[fiori.uni.lu](https://fiori.uni.lu/fiori/)|Upon login with your UNI.LU-credentials, this site provides you information on your employee profile. You can submit leave requests via this portal and also view your payslips.|
|[archibus.uni.lux](https://archibus.uni.lux)|Booking a room in BT2 ground floor, Room 212 in BT1 and meeting rooms in other university buildings. **Please note:** This site can only be accessed when you are logged into the university network, either in your office or via a VPN client from elsewhere. See also the [corresponding How-to Card](https://howto.lcsb.uni.lu/?access:vpn-cerbere-access). Login with your staff/student credentials.|
|[archibus.uni.lux](https://archibus.uni.lux)|Booking a room in BT2 ground floor, Room 212 in BT1 and meeting rooms in other university buildings. **Please note:** This site can only be accessed when you are logged into the university network, either in your office or via a VPN client from elsewhere. See also the [corresponding How-to Card]({{ '/?access:vpn-access' | relative_url }}). Login with your staff/student credentials.|
|[llcreservation.uni.lu](http://llcreservation.uni.lu)|Booking a room in the Luxembourg Learning Centre at the University Campus in Belval. Login with your staff/student credentials.|
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment