From 44f85e8fc836c43701ab77525bbf2bedaed0e62c Mon Sep 17 00:00:00 2001 From: laurentheirendt Date: Thu, 7 Nov 2019 08:23:10 +0100 Subject: [PATCH 1/7] change email address --- external/exchange-channels/duma.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/exchange-channels/duma.md b/external/exchange-channels/duma.md index e1b44ad..87e365b 100644 --- a/external/exchange-channels/duma.md +++ b/external/exchange-channels/duma.md @@ -16,7 +16,7 @@ An access link can be reached via standard web browsers. Data can be transferred * Through the web browser by visiting the link, which is our recommended way of data transfer, described in this [section of the guide](#ASPERAWEB_WEB) * Through the use of a command line tool. If your data sits in an environment, where you can not launch a web browser, then you may use use a command line client tool to reach an access link. This process is described in this [section of this guide](#ASPERAWEB_CLI). -The use of DUMA is mediated by LCSB's data stewards. If you require assistance in using DUMA, you should send an email to [LCSB admin team](mailto:lcsb-sysadmins@uni.lu). +The use of DUMA is mediated by LCSB's data stewards. If you require assistance in using DUMA, you should send an email to the [LCSB datastewards](mailto:lcsb-datastewards@uni.lu). ## Accessing AsperaWEB via Web Interface -- GitLab From cedbe4dc10a87f33c9e18aba1d5d67e6acf63885 Mon Sep 17 00:00:00 2001 From: laurentheirendt Date: Fri, 8 Nov 2019 07:10:20 +0100 Subject: [PATCH 2/7] add 404 --- .ci/deploy.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.ci/deploy.sh b/.ci/deploy.sh index 2bbc419..61c0e4c 100644 --- a/.ci/deploy.sh +++ b/.ci/deploy.sh @@ -26,3 +26,6 @@ git reset --hard origin/$CI_COMMIT_REF_NAME # set the auto redirection cp .ci/.autoRedirect public/index.html + +# set the 404 +cp 404.html public/. -- GitLab From 342c34c3716d05dd9bac0b334d0f92fdb582ed92 Mon Sep 17 00:00:00 2001 From: laurentheirendt Date: Fri, 8 Nov 2019 08:50:21 +0100 Subject: [PATCH 3/7] redirection to 404 --- .ci/.autoRedirect | 41 +++++++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/.ci/.autoRedirect b/.ci/.autoRedirect index a2eb11b..4e14557 100644 --- a/.ci/.autoRedirect +++ b/.ci/.autoRedirect @@ -14,7 +14,12 @@ } }); } - UrlExists('https://r3-core.pages.uni.lu/howto-cards-internal/index.html', function(status){ + + // define URLs + var internalURL = 'https://r3-core.pages.uni.lu/howto-cards-internal'; + var externalURL = 'https://r3.pages.uni.lu/howto-cards'; + + UrlExists(internalURL+'/index.html', function(status){ var s = window.location.href; var pathArray = s.split('?'); @@ -28,22 +33,38 @@ if(status === 200){ // internal pages if (sub.length > 0) { - UrlExists('https://r3-core.pages.uni.lu/howto-cards-internal/stable/internal/'+sub, function(status){ - // redirect if card is actually internal and exists - if (status == 200) { - window.location.href = 'https://r3-core.pages.uni.lu/howto-cards-internal/stable/internal/'+sub; + UrlExists(internalURL+'/stable/internal/'+sub, function(status){ + if (status == 200) { // if sub-card is internal in the internal directory and exists + window.location.href = internalURL+'/stable/internal/'+sub; } else { - window.location.href = 'https://r3-core.pages.uni.lu/howto-cards-internal/stable/external/'+sub; + UrlExists(internalURL+'/stable/external/'+sub, function(status){ + if (status == 200) { // if sub-card is internal in the external directory and exists + window.location.href = internalURL+'/stable/external/'+sub; + } else { + window.location.href = internalURL+'/404.html'; + } + }); } }); } else { - window.location.href = 'https://r3-core.pages.uni.lu/howto-cards-internal/stable/'+sub; + UrlExists(internalURL+'/stable', function(status){ + if (status == 200) { // if card is internal and exists + window.location.href = internalURL+'/stable'; + } else { + window.location.href = internalURL+'/404.html'; + } + }); } - + // external pages } else { - // external pages if (sub.length > 0) { sub = 'external/'+sub; } - window.location.href = 'https://r3.pages.uni.lu/howto-cards/stable/'+sub; + UrlExists(externalURL+'/stable/'+sub, function(status){ + if (status == 200) { // if sub-car is internal and exists + window.location.href = externalURL+'/stable/'+sub; + } else { + window.location.href = externalURL+'/404.html'; + } + }); } }); -- GitLab From e3f01850200f6a5b9934cd60fff2655a15920b6c Mon Sep 17 00:00:00 2001 From: laurentheirendt Date: Fri, 8 Nov 2019 08:52:10 +0100 Subject: [PATCH 4/7] change GET to HEAD --- .ci/.autoRedirect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/.autoRedirect b/.ci/.autoRedirect index 4e14557..9691ca2 100644 --- a/.ci/.autoRedirect +++ b/.ci/.autoRedirect @@ -6,7 +6,7 @@ jQuery.ajax({ url: url, dataType: 'text', - type: 'GET', + type: 'HEAD', cache: false, complete: function(xhr){ if(typeof cb === 'function') -- GitLab From aaf5db20f520520c4e0181034a1f1de49b18e6d9 Mon Sep 17 00:00:00 2001 From: laurentheirendt Date: Fri, 8 Nov 2019 08:58:50 +0100 Subject: [PATCH 5/7] Revert "change GET to HEAD" This reverts commit e3f01850200f6a5b9934cd60fff2655a15920b6c. --- .ci/.autoRedirect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/.autoRedirect b/.ci/.autoRedirect index 9691ca2..4e14557 100644 --- a/.ci/.autoRedirect +++ b/.ci/.autoRedirect @@ -6,7 +6,7 @@ jQuery.ajax({ url: url, dataType: 'text', - type: 'HEAD', + type: 'GET', cache: false, complete: function(xhr){ if(typeof cb === 'function') -- GitLab From 201f553399469efc0327a5a92fc4717f3fe4febf Mon Sep 17 00:00:00 2001 From: Sarah Peter Date: Sat, 9 Nov 2019 09:54:28 +0100 Subject: [PATCH 6/7] Git clients --- external/git-clients/git-clients.md | 30 +++++++++++++++++++++++++++++ index.md | 1 + 2 files changed, 31 insertions(+) create mode 100644 external/git-clients/git-clients.md diff --git a/external/git-clients/git-clients.md b/external/git-clients/git-clients.md new file mode 100644 index 0000000..f86b164 --- /dev/null +++ b/external/git-clients/git-clients.md @@ -0,0 +1,30 @@ +--- +layout: page +permalink: /external/git-clients/ +--- + +# Git clients + +## Installation of Git + +You can find installers for Windows, MacOS and Linux on the [Git webpage](https://git-scm.com/downloads). + +## GUI clients + +Here is a list of suggested Git GUI clients: + +* [Sourcetree](https://www.sourcetreeapp.com) +* [Fork](https://git-fork.com) +* [SmartGit](https://www.syntevo.com/smartgit/) + +You can find more clients on the [Git webpage](https://git-scm.com/downloads/guis). + +## IDEs + +There are also several IDEs (integrated development environments) that have git functionalities included: + +* [GitLab WebIDE](https://docs.gitlab.com/ee/user/project/web_ide/) +* [Visual Studio Code](https://code.visualstudio.com/) +* [Atom](https://atom.io/) +* [IntelliJ](https://www.jetbrains.com/idea/) +* [PyCharm](https://www.jetbrains.com/pycharm/) diff --git a/index.md b/index.md index 9e417ea..f16de6d 100644 --- a/index.md +++ b/index.md @@ -14,3 +14,4 @@ Bioinformatics Core assists Luxembourg Centre for Systems Biomedicine ([LCSB](ht * [Registering human-subject data to DAISY](./external/daisy/) * [Markdown markup language](./external/markdown/) * [LUMS account](./external/lums-passwords) + * [Git clients](./external/git-clients/) -- GitLab From d671d6ff01b12627d570a318f53f9a6011547fb9 Mon Sep 17 00:00:00 2001 From: Jacek Lebioda Date: Mon, 11 Nov 2019 09:26:41 +0100 Subject: [PATCH 7/7] Use master's 404.html --- .ci/deploy.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.ci/deploy.sh b/.ci/deploy.sh index 61c0e4c..0726a17 100644 --- a/.ci/deploy.sh +++ b/.ci/deploy.sh @@ -17,6 +17,11 @@ for branch in $(git for-each-ref --format='%(refname:strip=3)' refs/remotes); do # build the website bundle exec jekyll build --baseurl="howto-cards/$artefact" -d "public/$artefact" + + if [[ $branch == "master" ]]; then + # set the 404 + cp howto-cards/$artefact/404.html public/404.html + fi done # checkout the current branch @@ -26,6 +31,3 @@ git reset --hard origin/$CI_COMMIT_REF_NAME # set the auto redirection cp .ci/.autoRedirect public/index.html - -# set the 404 -cp 404.html public/. -- GitLab