Commits · 0af8a81a73cf9136064f0f9e7c3fd69fc2217a7e · R3 / howto-cards

28 Aug, 2019 3 commits
- Adding mailto: obfuscation · 0af8a81a
  Jacek Lebioda authored Aug 28, 2019
  
  0af8a81a
- Merge branch 'fix_asperaweb' into 'develop' · 2e284a0f
  Yohan Jarosz authored Aug 28, 2019
```
Update doc to reflect new interface

See merge request R3/labCards!13
```
  2e284a0f
- Update doc to reflect new interface · 79a6e0fe
  Yohan Jarosz authored Aug 28, 2019
  
  79a6e0fe
27 Aug, 2019 2 commits
- Merge branch 'develop' into 'develop' · 250b496c
  Laurent Heirendt authored Aug 27, 2019
```
pointing sys-admins email adress to mailto

See merge request R3/labCards!12
```
  250b496c
- pointing sys-admins email adress to mailto · 61f327dc
  Vilem Ded authored Aug 27, 2019 and Laurent Heirendt committed Aug 27, 2019
  
  61f327dc
22 Aug, 2019 1 commit
- Merge branch 'include-expiry-yml' into 'develop' · d7f41930
  Christophe Trefois authored Aug 22, 2019
```
add expiry of 1 week to artifacts

See merge request R3/labCards!11
```
  d7f41930
21 Aug, 2019 1 commit
- add expiry of 1 week to artifacts · 721d280f
  Laurent Heirendt authored Aug 21, 2019
  
  721d280f
07 Aug, 2019 1 commit
- Merge branch 'filter-daisy-merged' into 'develop' · 460e6b6c
  Laurent Heirendt authored Aug 07, 2019
```
integrate DAISY labcard

See merge request R3/labCards!9
```
  460e6b6c
02 Aug, 2019 2 commits
- added link to daisy page to index · a999f8d0
  Pinar Alper authored Aug 02, 2019
  
  a999f8d0
- fixed perma link · d6dabd1b
  Pinar Alper authored Aug 02, 2019
  
  d6dabd1b
31 Jul, 2019 3 commits
- move daisy to external · d13fb779
  Laurent Heirendt authored Jul 31, 2019
  
  d13fb779
- Merge branch 'filter-daisy' into filter-daisy-merged · f233b6d3
  Laurent Heirendt authored Jul 31, 2019
  
  f233b6d3
- move daisy to root · 3f0d36cc
  Laurent Heirendt authored Jul 31, 2019
  
  3f0d36cc
30 Jul, 2019 2 commits
- Merge branch 'duma-decryption' into 'develop' · 8a33e0b5
  Laurent Heirendt authored Jul 30, 2019
```
extending DUMA command-line steps by en/decryption steps

See merge request R3/labCards!8
```
  8a33e0b5
- extending DUMA command-line steps by en/decryption steps · 3ae028a3
  Vilem Ded authored Jul 30, 2019 and Laurent Heirendt committed Jul 30, 2019
  
  3ae028a3
09 Jul, 2019 9 commits
- change of config yml · 97d10ffe
  Laurent Heirendt authored Jul 09, 2019
  
  97d10ffe
- change url in autoredirect · a998243b
  Laurent Heirendt authored Jul 09, 2019
  
  a998243b
- Merge branch 'issue-19' into develop · 0a14705f
  Pinar Alper authored Jul 09, 2019
```
# Conflicts:
#	external/exchange-channels/R3labCARD-exchange-channels.md
```
  0a14705f
- Merge branch 'fix-links' into 'develop' · 1b8f47ca
  Laurent Heirendt authored Jul 09, 2019
```
fix links to passwords card

See merge request R3/labCards!5
```
  1b8f47ca
- fix links to passwords card · 7ca16fbc
  Laurent Heirendt authored Jul 09, 2019
  
  7ca16fbc
- add step for decryption of downloaded data from DUMA - web interface · 645a0127
  Vilem Ded authored Jul 05, 2019 and Laurent Heirendt committed Jul 09, 2019
  
  645a0127
- Added command line client instructions and changes to make card targeted to external collaborators · f752a8c4
  Pinar Alper authored Jun 28, 2019 and Laurent Heirendt committed Jul 09, 2019
  
  f752a8c4
- add DUMA web-interface decryption screenshots · bcb39e3e
  Vilem Ded authored Jul 05, 2019 and Laurent Heirendt committed Jul 09, 2019
  
  bcb39e3e
- Merge branch 'fix_issue15' into 'develop' · 1afcc8a6
  Laurent Heirendt authored Jul 09, 2019
```
Fix issue15

See merge request R3/labCards!3
```
  1afcc8a6
02 Jul, 2019 1 commit
- fix #15 - add email for external users · d7a2d159
  Yohan Jarosz authored Jul 02, 2019
  
  d7a2d159
01 Jul, 2019 2 commits
- Merge branch 'Trefex-develop-patch-46642' into 'develop' · ef6d3a96
  Christophe Trefois authored Jul 01, 2019
```
Update index.md

See merge request R3/labCards!2
```
  ef6d3a96
- Update index.md · a19ddb71
  Christophe Trefois authored Jul 01, 2019
  
  a19ddb71
28 Jun, 2019 2 commits
- Merge branch 'develop' into 'master' · 6d24a079
  Laurent Heirendt authored Jun 28, 2019
```
Regular merge of develop

See merge request R3/labCards!1
```
  6d24a079
- add js to redirect · f0bdc80a
  Laurent Heirendt authored Jun 28, 2019
  
  f0bdc80a
26 Jun, 2019 11 commits
- move banners to assets · 4143a7d3
  Laurent Heirendt authored Jun 26, 2019
  
  4143a7d3
- add autoredirect · 4745da4c
  Laurent Heirendt authored Jun 26, 2019
  
  4745da4c
- Merge remote-tracking branch 'ci/ci' · 357b5aeb
  Laurent Heirendt authored Jun 26, 2019
  
  357b5aeb
- adapted index file · b1e48dea
  Laurent Heirendt authored Jun 26, 2019
  
  b1e48dea
- Merge remote-tracking branch 'assets/master' into develop · 6b21319f
  Laurent Heirendt authored Jun 26, 2019
  
  6b21319f
- Revert "move to root" · b1c92425
  Laurent Heirendt authored Jun 26, 2019
```
This reverts commit 9f715bf1.
```
  b1c92425
- move to root · 9f715bf1
  Laurent Heirendt authored Jun 26, 2019
  
  9f715bf1
- Merge branch 'develop' into 'master' · 45346a1c
  Laurent Heirendt authored Jun 26, 2019
```
Regular merge of develop

See merge request R3/labCards.assets!1
```
  45346a1c
- put gitignore in asset repo · 1072cd07
  Laurent Heirendt authored Jun 26, 2019
  
  1072cd07
- moving the assets to the root · a06857b0
  Laurent Heirendt authored Jun 26, 2019
  
  a06857b0
- moving assets into place before filtering · 939782d4
  Laurent Heirendt authored Jun 26, 2019
  
  939782d4