Commits · eff4d145357f3ad88836dba1df98d8610c267f65 · Administrator / m4lab_landing_page

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
13 Jul, 2020 2 commits
- mailinglist documentation finished · 48e4bd55
  Wolfgang Knopki authored Jul 13, 2020
  
  48e4bd55
- mailinglist documentation finished · 8078bf95
  Wolfgang Knopki authored Jul 13, 2020
  
  8078bf95
10 Jul, 2020 1 commit
- configured help section according to feedback from meeting today · fc1951ab
  Wolfgang Knopki authored Jul 10, 2020
  
  fc1951ab
09 Jul, 2020 1 commit
- second chapter · dd098f17
  Wolfgang Knopki authored Jul 09, 2020
  
  dd098f17
08 Jul, 2020 1 commit
- first chapter documentation gitlab pages · d012215a
  Wolfgang Knopki authored Jul 08, 2020
  
  d012215a
03 Jul, 2020 4 commits
- Merge branch 'MLAB-212' into 'testing' · 81af750d
  Varun Srivastava authored Jul 03, 2020
```
corrected the link on homepage

See merge request !47
```
  81af750d
- corrected the link on homepage · fa4c5d32
  Varun Srivastava authored Jul 03, 2020
  
  fa4c5d32
- Merge branch 'MLAB-133' into 'testing' · aaddf812
  Wolfgang Knopki authored Jul 03, 2020
```
added images for email signature

See merge request !46
```
  aaddf812
- added images for email signature · e7e60029
  Wolfgang Knopki authored Jul 03, 2020
  
  e7e60029
02 Jul, 2020 3 commits
- Merge branch 'MLAB-253' into 'testing' · 91a7617f
  Rosanny Sihombing authored Jul 02, 2020
```
Mlab 253

See merge request !45
```
  91a7617f
- MLAB-253: replace bootstrap.css with m4lab.css · 3a615fc7
  Rosanny Sihombing authored Jul 02, 2020
  
  3a615fc7
- MLAB-253: (ToBeDeleted) boostrap.css · e0cda5b8
  Rosanny Sihombing authored Jul 02, 2020
  
  e0cda5b8
01 Jul, 2020 2 commits
- Merge branch 'MLAB-253' into 'testing' · 80f33119
  Wolfgang Knopki authored Jul 01, 2020
```
Upload New File

See merge request !44
```
  80f33119
- Upload New File · 88a87653
  Wolfgang Knopki authored Jul 01, 2020
  
  88a87653
22 Jun, 2020 5 commits
- Merge branch 'MLAB-26-fix' into 'testing' · 914bd261
  Wolfgang Knopki authored Jun 22, 2020
```
Update .gitlab-ci.yml, removed includes directory from deploymnet script

See merge request !43
```
  914bd261
- Update .gitlab-ci.yml, removed includes directory from deploymnet script · 907628d0
  Wolfgang Knopki authored Jun 22, 2020
  
  907628d0
- Merge branch 'MLAB-26' into 'testing' · 8abec09c
  Wolfgang Knopki authored Jun 22, 2020
```
Mlab 26

See merge request !42
```
  8abec09c
- removed unneeded files in M4_LAB_Project images folder · 6ecf5afe
  Wolfgang Knopki authored Jun 22, 2020
  
  6ecf5afe
- removed unneeded files (images etc.) · a4bb7deb
  Wolfgang Knopki authored Jun 22, 2020
  
  a4bb7deb
27 May, 2020 2 commits
- Merge branch 'MLAB-229' into 'testing' · 6d1b6bf2
  Wolfgang Knopki authored May 27, 2020
```
MLAB-229: sticky footer

See merge request !41
```
  6d1b6bf2
- MLAB-229: sticky footer · 0c2f42a3
  Rosanny Sihombing authored May 27, 2020
  
  0c2f42a3
26 May, 2020 2 commits
- Merge branch 'patch-1' into 'master' · f658a0f8
  Wolfgang Knopki authored May 26, 2020
```
Update headfoot.js

See merge request !40
```
  f658a0f8
- Update headfoot.js · bb039fc3
  Wolfgang Knopki authored May 26, 2020
  
  bb039fc3
19 May, 2020 8 commits
- Merge branch 'patch-1' into 'master' · 7357b866
  Wolfgang Knopki authored May 19, 2020
```
Update headfoot.js, removed alertdiv

See merge request !39
```
  7357b866
- Update headfoot.js, removed alertdiv · 2dc495e8
  Wolfgang Knopki authored May 19, 2020
  
  2dc495e8
- Merge branch 'patch-1' into 'master' · 0090a90f
  Wolfgang Knopki authored May 19, 2020
```
Update headfoot.js, hotfix: removed disclaimer in production version

See merge request !38
```
  0090a90f
- Update headfoot.js, hotfix: removed disclaimer in production version · 57ba0350
  Wolfgang Knopki authored May 19, 2020
  
  57ba0350
- Merge branch 'patch-1' into 'master' · 28e1b00d
  Wolfgang Knopki authored May 19, 2020
```
Patch 1

See merge request !37
```
  28e1b00d
- Upload New File · 41234892
  Wolfgang Knopki authored May 19, 2020
  
  41234892
- Upload New File · 8e551e5d
  Wolfgang Knopki authored May 19, 2020
  
  8e551e5d
- Merge branch 'patch-1' into 'master' · 25e7f3cc
  Wolfgang Knopki authored May 19, 2020
```
Update styles.css hitfix: added button-red and button-margin

See merge request !36
```
  25e7f3cc