Commits · 9df10ccdb5bf04becb5be33ab7e006b07e231403 · Administrator / m4lab_landing_page

16 Dec, 2020 2 commits
- Merge branch 'prepare_prod' into 'master' · 9df10ccd
  Wolfgang Knopki authored Dec 16, 2020
```
Prepare prod

See merge request !83
```
  9df10ccd
- merged branch · 7e5704d6
  Wolfgang Knopki authored Dec 16, 2020
  
  7e5704d6
09 Dec, 2020 2 commits
- Merge branch 'MLAB-386' into 'testing' · fb27af8f
  Wolfgang Knopki authored Dec 09, 2020
```
added new page for bwcloud

See merge request !80
```
  fb27af8f
- added new page for bwcloud · ec6ae58a
  Wolfgang Knopki authored Dec 09, 2020
  
  ec6ae58a
04 Dec, 2020 5 commits
- Merge branch 'devel_varun' into 'testing' · a5d163db
  Varun Srivastava authored Dec 04, 2020
```
Devel varun

See merge request !79
```
  a5d163db
- alignment issue fix · bbc9c645
  Varun Srivastava authored Dec 04, 2020
  
  bbc9c645
- Merge branch 'devel_varun' into 'testing' · 5f9e8d85
  Varun Srivastava authored Dec 04, 2020
```
Devel varun

See merge request !78
```
  5f9e8d85
- css and style changes · 1dbbb7f6
  Varun Srivastava authored Dec 04, 2020
  
  1dbbb7f6
- Merge branch 'testing' into 'devel_varun' · 3bba8800
  Varun Srivastava authored Dec 04, 2020
```
Testing

See merge request !77
```
  3bba8800
19 Nov, 2020 3 commits
- alignment fixed · 5924155d
  Varun Srivastava authored Nov 19, 2020
  
  5924155d
- Merge branch 'simpelsamlphpadaption' into 'testing' · 65df70da
  Wolfgang Knopki authored Nov 19, 2020
```
add css adaptions for simplesamlphp pages

See merge request !76
```
  65df70da
- add css adaptions for simplesamlphp pages · 5dfa4e85
  Wolfgang Knopki authored Nov 19, 2020
  
  5dfa4e85
06 Nov, 2020 3 commits
- Merge branch 'devel_varun' into 'testing' · 35e8aa2a
  Varun Srivastava authored Nov 06, 2020
```
Devel varun

See merge request !75
```
  35e8aa2a
- Adobe Connect display commented · 2440a30f
  Varun Srivastava authored Nov 06, 2020
  
  2440a30f
- Merge branch 'testing' into 'devel_varun' · c0d86a14
  Varun Srivastava authored Nov 06, 2020
```
Testing

See merge request !74
```
  c0d86a14
03 Nov, 2020 4 commits
- Merge branch 'patch-1' into 'testing' · 9702cd36
  Wolfgang Knopki authored Nov 03, 2020
```
Patch 1

See merge request !73
```
  9702cd36
- Update jira.html · b6f5ca8b
  Wolfgang Knopki authored Nov 03, 2020
  
  b6f5ca8b
- Update confluence.html · 69045367
  Wolfgang Knopki authored Nov 03, 2020
  
  69045367
- Update confluence.html · f16260e0
  Wolfgang Knopki authored Nov 03, 2020
  
  f16260e0
29 Oct, 2020 19 commits
- Merge branch 'patch-1' into 'master' · 778643a3
  Wolfgang Knopki authored Oct 29, 2020
```
Update headfoot.js fix typo

See merge request !71
```
  778643a3
- Merge branch 'patch-2' into 'testing' · e02211f1
  Wolfgang Knopki authored Oct 29, 2020
```
Update headfoot.js, fix typo

See merge request !72
```
  e02211f1
- Update headfoot.js, fix typo · 6c1ea709
  Wolfgang Knopki authored Oct 29, 2020
  
  6c1ea709
- Update headfoot.js fix typo · bbba6164
  Wolfgang Knopki authored Oct 29, 2020
  
  bbba6164
- Merge branch 'Mlab-366' into 'master' · fec61acd
  Wolfgang Knopki authored Oct 29, 2020
```
Mlab 366

See merge request !70
```
  fec61acd
- Merge branch 'master' into 'Mlab-366' · b1412aa5
  Wolfgang Knopki authored Oct 29, 2020
```
# Conflicts:
#   js/headfoot.js
```
  b1412aa5
- removed jira/conf to merge directly to master · 99e7169c
  Wolfgang Knopki authored Oct 29, 2020
  
  99e7169c
- Merge branch 'Mlab-366' into 'testing' · c31f68de
  Wolfgang Knopki authored Oct 29, 2020
```
added projectlists to menu

See merge request !69
```
  c31f68de
- added projectlists to menu · 4cad9a5b
  Wolfgang Knopki authored Oct 29, 2020
  
  4cad9a5b
- Merge branch 'Mlab-366' into 'testing' · dc351a65
  Wolfgang Knopki authored Oct 29, 2020
```
added images projectlist pages

See merge request !68
```
  dc351a65
- added images projectlist pages · 417b490d
  Wolfgang Knopki authored Oct 29, 2020
  
  417b490d
- Merge branch 'Mlab-368' into 'testing' · 19afca5e
  Wolfgang Knopki authored Oct 29, 2020
```
added jira pages, harmonized confluence and jira descriptions

See merge request !67
```
  19afca5e
- added jira pages, harmonized confluence and jira descriptions · 564f57be
  Wolfgang Knopki authored Oct 29, 2020
  
  564f57be
- Merge branch 'MLAB-367' into 'testing' · 6cb506d6
  Wolfgang Knopki authored Oct 29, 2020
```
Mlab 367

See merge request !66
```
  6cb506d6
- Merge branch 'revert-f6b697ee' into 'master' · 0cf20bc1
  Wolfgang Knopki authored Oct 29, 2020
```
Revert "Merge branch 'MLAB-367' into 'master'"

See merge request !65
```
  0cf20bc1
- Revert "Merge branch 'MLAB-367' into 'master'" · 541cb540
  Wolfgang Knopki authored Oct 29, 2020
```
This reverts merge request !64
```
  541cb540
- Merge branch 'MLAB-367' into 'master' · f6b697ee
  Wolfgang Knopki authored Oct 29, 2020
```
Mlab 367

See merge request !64
```
  f6b697ee
- added list with features · 233f1987
  Wolfgang Knopki authored Oct 29, 2020
  
  233f1987
- first draft confluence page · b7d8f700
  Wolfgang Knopki authored Oct 29, 2020
  
  b7d8f700
28 Oct, 2020 2 commits
- Merge branch 'prepare_prod' into 'master' · 6452a3da
  Wolfgang Knopki authored Oct 28, 2020
```
Prepare prod

See merge request !63
```
  6452a3da
- Merge branch 'testing' into 'prepare_prod' · 2d7a6824
  Wolfgang Knopki authored Oct 28, 2020
```
Testing

See merge request !62
```
  2d7a6824