Commits · e759ee3d64434c0fc20a0e9f08a287c563eaad7e · Administrator / m4lab_landing_page

15 May, 2020 1 commit
- Merge branch 'testing' into 'MLAB-201' · e759ee3d
  Wolfgang Knopki authored May 15, 2020
```
# Conflicts:
#   videoconference.html
```
  e759ee3d
14 May, 2020 1 commit
- Changed colors in Videoconferences and Landingpage to more likely HFT colors · 0e4a5efd
  Christine Kraus authored May 14, 2020
  
  0e4a5efd
09 May, 2020 2 commits
- Merge branch 'MLAB-198' into 'testing' · ded53d36
  Varun Srivastava authored May 09, 2020
```
Mlab 198

See merge request !20
```
  ded53d36
- contact link fixed · 2d8fc7eb
  Varun Srivastava authored May 09, 2020
  
  2d8fc7eb
07 May, 2020 3 commits
- Merge branch 'MLAB-176' into 'testing' · c7c35a4a
  Wolfgang Knopki authored May 07, 2020
```
Mlab 176

See merge request !19
```
  c7c35a4a
- copied js over from user-account · 46c7d8f7
  Wolfgang Knopki authored May 07, 2020
  
  46c7d8f7
- copied js over from user-account · 81fcf22f
  Wolfgang Knopki authored May 07, 2020
  
  81fcf22f
27 Apr, 2020 13 commits
- Merge branch 'MLAB-167-fix' into 'testing' · 59947311
  Wolfgang Knopki authored Apr 27, 2020
```
changed alignment ol

See merge request !18
```
  59947311
- changed alignment ol · 3fd63774
  Wolfgang Knopki authored Apr 27, 2020
  
  3fd63774
- Merge branch 'patch-1' into 'testing' · abb8c381
  Wolfgang Knopki authored Apr 27, 2020
```
Update videoconference.html

See merge request !17
```
  abb8c381
- Update videoconference.html · af7b9736
  Wolfgang Knopki authored Apr 27, 2020
  
  af7b9736
- Merge branch 'patch-1' into 'testing' · 3859e72f
  Wolfgang Knopki authored Apr 27, 2020
```
Update videoconference.html

See merge request !16
```
  3859e72f
- Update videoconference.html · ab1a214e
  Wolfgang Knopki authored Apr 27, 2020
  
  ab1a214e
- Merge branch 'MLAB-167' into 'testing' · 24977e28
  Wolfgang Knopki authored Apr 27, 2020
```
updated the jitsi help text

See merge request !15
```
  24977e28
- Merge branch 'testing' into 'MLAB-167' · c27416d1
  Wolfgang Knopki authored Apr 27, 2020
```
# Conflicts:
#   videoconference.html
```
  c27416d1
- updated the jitsi help text · 082d9c8e
  Varun Srivastava authored Apr 27, 2020
  
  082d9c8e
- Merge branch 'MLAB-159-fix' into 'testing' · a1af0021
  Wolfgang Knopki authored Apr 27, 2020
```
links adapted, removed additional navbar

See merge request !14
```
  a1af0021
- links adapted, removed additional navbar · 01189886
  Wolfgang Knopki authored Apr 27, 2020
  
  01189886
- Merge branch 'MLAB-159' into 'testing' · fce52226
  Wolfgang Knopki authored Apr 27, 2020
```
Mlab-159

See merge request !13
```
  fce52226
- Videoconference-Page: Aligned Buttons · 9b276204
  Christine Kraus authored Apr 27, 2020
  
  9b276204
21 Apr, 2020 4 commits
- Merge branch 'loginpage_new' into 'testing' · 30e806c9
  Wolfgang Knopki authored Apr 21, 2020
```
added css for Login form

See merge request !12
```
  30e806c9
- added css for Login form · b5710b05
  Wolfgang Knopki authored Apr 21, 2020
  
  b5710b05
- Merge branch 'loginpage_new' into 'testing' · 5ff60e5b
  Wolfgang Knopki authored Apr 21, 2020
```
added images for new landing page

See merge request !11
```
  5ff60e5b
- added images for new landing page · 5670b159
  Wolfgang Knopki authored Apr 21, 2020
  
  5670b159
17 Apr, 2020 2 commits
- added Link to GitLab in "Informationen bereitstellen" on Landing-Page · 49ff53e1
  Christine Kraus authored Apr 17, 2020
  
  49ff53e1
- Home page: remove line break between "Daten, " and "Dokumentationen" - deleted · b1e1046f
  Christine Kraus authored Apr 17, 2020
  
  b1e1046f
09 Apr, 2020 6 commits
- Merge branch 'mailinglists_downloads' into 'testing' · 2e84d63e
  Wolfgang Knopki authored Apr 09, 2020
```
link style matched

See merge request !10
```
  2e84d63e
- link style matched · d1a63f3f
  Wolfgang Knopki authored Apr 09, 2020
  
  d1a63f3f
- Merge branch 'mailinglists_downloads' into 'testing' · 8feead47
  Wolfgang Knopki authored Apr 09, 2020
```
added link to landingpage button zur Projektübersicht

See merge request !9
```
  8feead47
- added link to landingpage button zur Projektübersicht · 18df2bb8
  Wolfgang Knopki authored Apr 09, 2020
  
  18df2bb8
- Merge branch 'mailinglists_downloads' into 'testing' · cf600d70
  Wolfgang Knopki authored Apr 09, 2020
```
added downloads for new mailinglists

See merge request !8
```
  cf600d70
- added downloads for new mailinglists · 9e847d70
  Wolfgang Knopki authored Apr 09, 2020
  
  9e847d70
06 Apr, 2020 8 commits
- Merge branch 'contact_mailinglist_assets' into 'testing' · 20283432
  Wolfgang Knopki authored Apr 06, 2020
```
typo contact/ impressum url

See merge request !7
```
  20283432
- typo contact/ impressum url · 4198b881
  Wolfgang Knopki authored Apr 06, 2020
  
  4198b881
- Merge branch 'contact_mailinglist_assets' into 'testing' · 7117fc1c
  Wolfgang Knopki authored Apr 06, 2020
```
added fontawesome css

See merge request !5
```
  7117fc1c
- added fontawesome css · 6b5810fc
  Wolfgang Knopki authored Apr 06, 2020
  
  6b5810fc
- Merge branch 'contact_mailinglist_assets' into 'testing' · bef546b1
  Wolfgang Knopki authored Apr 06, 2020
```
Contact mailinglist assets

See merge request !4
```
  bef546b1
- fixed typo headfoot.js · 20a35dd5
  Wolfgang Knopki authored Apr 06, 2020
  
  20a35dd5
- added assets for mailinglists and contact page · 72fe54a4
  Wolfgang Knopki authored Apr 06, 2020
  
  72fe54a4
- Merge branch 'new_landing_vc' into 'testing' · 55f06f76
  Wolfgang Knopki authored Apr 06, 2020
```
New landing vc

See merge request !3
```
  55f06f76