Commits · 92a6649f4e6d619e2521a55c0066012d790d1630 · m4lab_tv1 / User Account

18 Jun, 2020 3 commits
- Merge branch 'devel' of https://transfer.hft-stuttgart.de/gitlab/m4lab_tv1/user-account into devel · 92a6649f
  Rosanny Sihombing authored Jun 18, 2020
  
  92a6649f
- set configuration · f3ab2841
  Rosanny Sihombing authored Jun 18, 2020
  
  f3ab2841
- Merge branch 'master' into 'devel' · d1e3cf60
  Rosanny Sihombing authored Jun 18, 2020
```
Master

See merge request !38
```
  d1e3cf60
18 May, 2020 8 commits
- Merge branch 'prepare_production' into 'master' · 4c993c49
  Wolfgang Knopki authored May 18, 2020
```
Prepare production

See merge request !33
```
  4c993c49
- Merge branch 'master' into 'prepare_production' · edc8354b
  Wolfgang Knopki authored May 18, 2020
```
# Conflicts:
#   config/config.js
```
  edc8354b
- Update config.js, adapted paths · 6da9a2ad
  Wolfgang Knopki authored May 18, 2020
  
  6da9a2ad
- Merge branch 'MLAB-224' into 'testing' · ece9da9c
  Wolfgang Knopki authored May 18, 2020
```
changed image of projecttraeger in M4_Lab dependent sidebar

See merge request !32
```
  ece9da9c
- changed image of projecttraeger in M4_Lab dependent sidebar · c76b2c97
  Wolfgang Knopki authored May 18, 2020
  
  c76b2c97
- Merge branch 'prepare_prdoucton' into 'master' · e0199f9d
  Wolfgang Knopki authored May 18, 2020
```
Prepare prdoucton

See merge request !31
```
  e0199f9d
- Update config.js, db links und idp links updated · fc41f1cd
  Wolfgang Knopki authored May 18, 2020
  
  fc41f1cd
- Update .gitlab-ci.yml, added section for master · df55a9cc
  Wolfgang Knopki authored May 18, 2020
  
  df55a9cc
15 May, 2020 22 commits
- MLAB-129: 20200515 · e744c3d1
  Rosanny Sihombing authored May 15, 2020
  
  e744c3d1
- MLAB-129: delete unused files · 9bb69860
  Rosanny Sihombing authored May 15, 2020
  
  9bb69860
- sync with testing branch · 3549aadf
  Rosanny Sihombing authored May 15, 2020
  
  3549aadf
- update link to localhost · ac4f21e3
  Rosanny Sihombing authored May 15, 2020
  
  ac4f21e3
- Merge branch 'testing' of... · 0f5aaaf7
  Rosanny Sihombing authored May 15, 2020
```
Merge branch 'testing' of https://transfer.hft-stuttgart.de/gitlab/m4lab_tv1/user-account into devel
```
  0f5aaaf7
- Merge branch 'MLAB-221' into 'testing' · e5a8e657
  Varun Srivastava authored May 15, 2020
```
corrected typo error

See merge request !30
```
  e5a8e657
- corrected typo error · 38af91cf
  Varun Srivastava authored May 15, 2020
  
  38af91cf
- delete unused files · 5ed27b69
  Rosanny Sihombing authored May 15, 2020
  
  5ed27b69
- Merge branch 'MLAB-202a' into 'testing' · 7383def8
  Wolfgang Knopki authored May 15, 2020
```
fixed indentation errors

See merge request !29
```
  7383def8
- Merge branch 'testing' into 'MLAB-202a' · da38b06d
  Wolfgang Knopki authored May 15, 2020
```
# Conflicts:
#   views/DE/project/mailinglists.pug
```
  da38b06d
- fixed indentation errors · 11641953
  Wolfgang Knopki authored May 15, 2020
  
  11641953
- Merge branch 'patch-1' into 'testing' · 02af2dac
  Wolfgang Knopki authored May 15, 2020
```
Update mailinglists.pug break inside <a> removed

See merge request !28
```
  02af2dac
- Update mailinglists.pug break inside <a> removed · bf964484
  Wolfgang Knopki authored May 15, 2020
  
  bf964484
- Merge branch 'patch-1' into 'testing' · f3edc10b
  Wolfgang Knopki authored May 15, 2020
```
Update mailinglists.pug, wrong encoding quotation marks

See merge request !27
```
  f3edc10b
- Update mailinglists.pug, wrong encoding quotation marks · 3f1af3e0
  Wolfgang Knopki authored May 15, 2020
  
  3f1af3e0
- Merge branch 'MLAB-202a' into 'testing' · ded76893
  Wolfgang Knopki authored May 15, 2020
```
Changed colors, Table headers and Buttons (name and order)

See merge request !26
```
  ded76893
- Changed colors, Table headers and Buttons (name and order) · 3a50b277
  Wolfgang Knopki authored May 15, 2020
  
  3a50b277
- Merge branch 'MLAB-221' into 'testing' · 121f12e1
  Varun Srivastava authored May 15, 2020
```
rescale the icons

See merge request !25
```
  121f12e1
- rescale the icons · 5c7b312c
  Varun Srivastava authored May 15, 2020
  
  5c7b312c
- Merge branch 'MLAB-221' into 'testing' · 26313c63
  Varun Srivastava authored May 15, 2020
```
changed the page layout

See merge request !24
```
  26313c63
- changed the page layout · 2e2b75c4
  Varun Srivastava authored May 15, 2020
  
  2e2b75c4
- Merge branch 'MLAB-206' into 'testing' · 17eda78a
  Wolfgang Knopki authored May 15, 2020
```
MLAB-206: Account page responsive design

See merge request !23
```
  17eda78a
14 May, 2020 1 commit
- MLAB-206: Account page responsive design · f46f8ffe
  Rosanny Sihombing authored May 14, 2020
  
  f46f8ffe
04 May, 2020 2 commits
- Merge branch 'MLAB-158' into 'testing' · 6451d414
  Wolfgang Knopki authored May 04, 2020
```
MLAB-158

See merge request !22
```
  6451d414
- single header file in project-simplified.html · d9c2581c
  Wolfgang Knopki authored May 04, 2020
  
  d9c2581c
30 Apr, 2020 2 commits
- MLAB-187 · d108a6be
  Rosanny Sihombing authored Apr 30, 2020
  
  d108a6be
- MLAB-158 · 906f9075
  Rosanny Sihombing authored Apr 30, 2020
  
  906f9075
29 Apr, 2020 2 commits
- Merge branch 'patch-1' into 'testing' · e4d6cae7
  Wolfgang Knopki authored Apr 29, 2020
```
hotfix: removed target from form, preventiing opening in new tab.

See merge request !20
```
  e4d6cae7
- hotfix: removed target from form, preventiing opening in new tab. · 5acb33d4
  Wolfgang Knopki authored Apr 29, 2020
  
  5acb33d4