Commits · a4220404dddc0dec483b495b5e69ae1a35376f71 · Administrator / m4lab_landing_page

18 May, 2020 2 commits
- Merge branch 'MLAB-224' into 'testing' · a4220404
  Wolfgang Knopki authored May 18, 2020
```
Upload New File

See merge request !33
```
  a4220404
- Upload New File · f48d9e16
  Wolfgang Knopki authored May 18, 2020
  
  f48d9e16
15 May, 2020 11 commits
- Merge branch 'patch-1' into 'testing' · b9a1b396
  Wolfgang Knopki authored May 15, 2020
```
Update headfoot.js - fixed relative links

See merge request !31
```
  b9a1b396
- Update headfoot.js - fixed relative links · 5bc88988
  Wolfgang Knopki authored May 15, 2020
  
  5bc88988
- Merge branch 'MLAB-197' into 'testing' · 515351cf
  Varun Srivastava authored May 15, 2020
```
Mlab 197

See merge request !30
```
  515351cf
- rescaled the sandclock icon · dfab1413
  Varun Srivastava authored May 15, 2020
  
  dfab1413
- Merge branch 'MLAB-202' into 'testing' · 23491dc3
  Wolfgang Knopki authored May 15, 2020
```
Mlab 202

See merge request !25
```
  23491dc3
- Merge branch 'MLAB-197' into 'testing' · dde3c738
  Varun Srivastava authored May 15, 2020
```
added images and icons for project page

See merge request !26
```
  dde3c738
- added images and icons for project page · 703dd65e
  Varun Srivastava authored May 15, 2020
  
  703dd65e
- Fixed links on Landing-Page · a88cc05b
  Christine Kraus authored May 15, 2020
  
  a88cc05b
- Merge branch 'MLAB-205' into 'testing' · 6a8f4332
  Wolfgang Knopki authored May 15, 2020
```
Mlab 205

See merge request !23
```
  6a8f4332
- Merge branch 'MLAB-201' into 'testing' · 43e88f0e
  Wolfgang Knopki authored May 15, 2020
```
Mlab 201

See merge request !22
```
  43e88f0e
- Merge branch 'testing' into 'MLAB-201' · e759ee3d
  Wolfgang Knopki authored May 15, 2020
```
# Conflicts:
#   videoconference.html
```
  e759ee3d
14 May, 2020 4 commits
- MLAB-205: update images and positioning · e857d332
  Rosanny Sihombing authored May 14, 2020
  
  e857d332
- to develop and test headfoot.js · d45b7fcf
  Rosanny Sihombing authored May 14, 2020
  
  d45b7fcf
- MLAB-205: add pictures from Presseabteilung · 1015d1f8
  Rosanny Sihombing authored May 14, 2020
  
  1015d1f8
- Changed colors in Videoconferences and Landingpage to more likely HFT colors · 0e4a5efd
  Christine Kraus authored May 14, 2020
  
  0e4a5efd
13 May, 2020 2 commits
- MLAB-205 · 2598cda0
  Rosanny Sihombing authored May 13, 2020
  
  2598cda0
- for development and test only · aacee851
  Rosanny Sihombing authored May 13, 2020
  
  aacee851
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 3 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