Commits · 778643a3062bde9fec45b2c7c1800c95feb573bf · Administrator / m4lab_landing_page

29 Oct, 2020 15 commits
- Merge branch 'patch-1' into 'master' · 778643a3
  Wolfgang Knopki authored Oct 29, 2020
```
Update headfoot.js fix typo

See merge request !71
```
  778643a3
- 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
- added projectlists to menu · 4cad9a5b
  Wolfgang Knopki authored Oct 29, 2020
  
  4cad9a5b
- 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
23 Oct, 2020 1 commit
- Merge branch 'Partizipation' into 'testing' · 40858c16
  Wolfgang Knopki authored Oct 23, 2020
```
Update to the info_partizipation.html

See merge request !61
```
  40858c16
20 Oct, 2020 1 commit
- Update to the info_partizipation.html · 9dba7042
  Patrick authored Oct 20, 2020
```
Correction of grammar/spelling
Adding the "Weilimdorf" project
```
  9dba7042
13 Oct, 2020 2 commits
- Merge branch 'serverchange' into 'testing' · bd9b493e
  Wolfgang Knopki authored Oct 13, 2020
```
Update .gitlab-ci.yml

See merge request !59
```
  bd9b493e
- Update .gitlab-ci.yml · bbae69cc
  Wolfgang Knopki authored Oct 13, 2020
  
  bbae69cc
23 Sep, 2020 4 commits
- Merge branch 'patch-1' into 'testing' · f3340cf2
  Wolfgang Knopki authored Sep 23, 2020
```
Update headfoot.js, typofix

See merge request !58
```
  f3340cf2
- Update headfoot.js, typofix · 9e07533f
  Wolfgang Knopki authored Sep 23, 2020
  
  9e07533f
- Merge branch 'partplat' into 'testing' · 51c3be7a
  Wolfgang Knopki authored Sep 23, 2020
```
added info page partizipation platform

See merge request !57
```
  51c3be7a
- added info page partizipation platform · fcddd111
  Wolfgang Knopki authored Sep 23, 2020
  
  fcddd111
18 Sep, 2020 6 commits
- Merge branch 'patch-1' into 'testing' · 5e49c1f1
  Wolfgang Knopki authored Sep 18, 2020
```
Update headfoot.js

See merge request !56
```
  5e49c1f1
- Update headfoot.js · 7fde9702
  Wolfgang Knopki authored Sep 18, 2020
  
  7fde9702
- Merge branch 'patch-1' into 'testing' · ca1aba2a
  Wolfgang Knopki authored Sep 18, 2020
```
Update headfoot.js fixed typo URL

See merge request !55
```
  ca1aba2a
- Update headfoot.js fixed typo URL · f30db7b3
  Wolfgang Knopki authored Sep 18, 2020
  
  f30db7b3
- Merge branch 'partplatform' into 'testing' · f9065e40
  Wolfgang Knopki authored Sep 18, 2020
```
Update headfoot.js

See merge request !54
```
  f9065e40
- Update headfoot.js · fd983ed5
  Wolfgang Knopki authored Sep 18, 2020
  
  fd983ed5
28 Aug, 2020 3 commits
- Merge branch 'prepare_production' into 'master' · eff4d145
  Wolfgang Knopki authored Aug 28, 2020
```
Prepare production

See merge request !53
```
  eff4d145
- Merge branch 'intermediate' into 'prepare_production' · 2f7d51cb
  Wolfgang Knopki authored Aug 28, 2020
```
Intermediate

See merge request !52
```
  2f7d51cb
- Merge branch 'prepare_production' into 'intermediate' · afedb536
  Wolfgang Knopki authored Aug 28, 2020
```
# Conflicts:
#   js/headfoot.js
```
  afedb536
20 Jul, 2020 2 commits
- Merge branch 'MLAB-258' into 'testing' · e6dd8c28
  Wolfgang Knopki authored Jul 20, 2020
```
opening help and helptopics in new tab

See merge request !49
```
  e6dd8c28
- opening help and helptopics in new tab · 3cd0cee8
  Wolfgang Knopki authored Jul 20, 2020
  
  3cd0cee8
16 Jul, 2020 4 commits
- Merge branch 'MLAB-258' into 'testing' · 7e0c7c7e
  Wolfgang Knopki authored Jul 16, 2020
```
Mlab 258

See merge request !48
```
  7e0c7c7e
- fixed text projectlogo · 34ef30e1
  Wolfgang Knopki authored Jul 16, 2020
  
  34ef30e1
- Merge branch 'MLAB-258' of transfer.hft-stuttgart.de:root/m4lab_landing_page into MLAB-258 · 9135e37c
  Wolfgang Knopki authored Jul 16, 2020
  
  9135e37c
- added manual gitlab-pages template · ec4f0d6b
  Wolfgang Knopki authored Jul 16, 2020
  
  ec4f0d6b