Commits · 9c928de9f072d5d5a2a6dc0499d235eabfbd1d23 · m4lab_tv1 / User Account

21 Apr, 2021 3 commits
- Merge branch 'MLAB-383' into 'testing' · 9c928de9
  Rosanny Sihombing authored Apr 21, 2021
```
Mlab 383

See merge request !79
```
  9c928de9
- handle new gitlab users · c39c5090
  Rosanny Sihombing authored Apr 21, 2021
  
  c39c5090
- update test unit · 2a084f63
  Rosanny Sihombing authored Apr 21, 2021
  
  2a084f63
01 Apr, 2021 7 commits
- Merge branch 'MLAB-383' into 'testing' · 99ea4cb3
  Rosanny Sihombing authored Apr 01, 2021
```
Mlab 383

See merge request !78
```
  99ea4cb3
- add default logo · 6447e044
  Rosanny Sihombing authored Apr 01, 2021
  
  6447e044
- update name parameters · 6e6719ea
  Rosanny Sihombing authored Apr 01, 2021
  
  6e6719ea
- Merge branch 'MLAB-383' of... · 2d9e96d4
  Rosanny Sihombing authored Apr 01, 2021
```
Merge branch 'MLAB-383' of https://transfer.hft-stuttgart.de/gitlab/m4lab_tv1/user-account into MLAB-383
```
  2d9e96d4
- small update · f60bc142
  Rosanny Sihombing authored Apr 01, 2021
  
  f60bc142
- update user feedback after creating and updating a website · f17ea394
  Rosanny Sihombing authored Apr 01, 2021
  
  f17ea394
- Merge branch 'testing' into 'MLAB-383' · 4c358f6d
  Rosanny Sihombing authored Apr 01, 2021
```
Update branch MLAB-383

See merge request !77
```
  4c358f6d
31 Mar, 2021 14 commits
- Merge branch '92srva1mst-testing-patch-55838' into 'testing' · 5647eac9
  Varun Srivastava authored Mar 31, 2021
```
Update profile.pug to resolve merge conflict

See merge request !76
```
  5647eac9
- Update profile.pug to resolve merge conflict · 56db797f
  Varun Srivastava authored Mar 31, 2021
  
  56db797f
- Merge branch '92srva1mst-testing-patch-40401' into 'testing' · 3c72a9ca
  Varun Srivastava authored Mar 31, 2021
```
Update contact.pug to resolve conflict

See merge request !75
```
  3c72a9ca
- Update contact.pug to resolve conflict · 6a2249e8
  Varun Srivastava authored Mar 31, 2021
  
  6a2249e8
- Merge branch 'devel_varun' into 'testing' · 4cfb29e6
  Varun Srivastava authored Mar 31, 2021
```
Devel varun

See merge request !74
```
  4cfb29e6
- Merge branch 'testing' into 'devel_varun' · 73489e78
  Varun Srivastava authored Mar 31, 2021
```
# Conflicts:
#   views/DE/account/contact.pug
#   views/DE/account/home.pug
#   views/DE/account/profile.pug
#   views/DE/account/security.pug
#   views/DE/account/services.pug
```
  73489e78
- styling changes · 2a9191f5
  Varun Srivastava authored Mar 31, 2021
  
  2a9191f5
- Merge branch 'MLAB-486' into 'testing' · 0b65d201
  Rosanny Sihombing authored Mar 31, 2021
```
Mlab 486

See merge request !73
```
  0b65d201
- delete loggedInUser (global variable) and add getLoggedInUserData(email) · cc3ae6c5
  Rosanny Sihombing authored Mar 31, 2021
  
  cc3ae6c5
- rewrite getUserByEmail using mysql2 · 698c4aea
  Rosanny Sihombing authored Mar 31, 2021
  
  698c4aea
- DB connection using mysql2 · 20c2aa0b
  Rosanny Sihombing authored Mar 31, 2021
  
  20c2aa0b
- delete unused codes · 7f16213d
  Rosanny Sihombing authored Mar 31, 2021
  
  7f16213d
- libs update · 0b5fb9db
  Rosanny Sihombing authored Mar 31, 2021
  
  0b5fb9db
- path update · 4fead12b
  Rosanny Sihombing authored Mar 31, 2021
  
  4fead12b
26 Mar, 2021 2 commits
- Merge branch 'MLAB-383' into 'testing' · 4f914c95
  Rosanny Sihombing authored Mar 26, 2021
```
Mlab 383

See merge request !72
```
  4f914c95
- test: gitlab user id · a9b7d1c8
  Rosanny Sihombing authored Mar 26, 2021
  
  a9b7d1c8
25 Mar, 2021 6 commits
- update README · 932aed28
  Rosanny Sihombing authored Mar 25, 2021
  
  932aed28
- DE translation · ed99c33d
  Rosanny Sihombing authored Mar 25, 2021
  
  ed99c33d
- Merge branch 'MLAB-383' into 'testing' · b1da71f2
  Rosanny Sihombing authored Mar 25, 2021
```
MLAB-383: fix broken links

See merge request !71
```
  b1da71f2
- fix broken links · c40a4119
  Rosanny Sihombing authored Mar 25, 2021
  
  c40a4119
- Merge branch 'MLAB-383' into 'testing' · 8361c2c4
  Rosanny Sihombing authored Mar 25, 2021
```
Mlab 383

See merge request !70
```
  8361c2c4
- remove unused codes · 16289931
  Rosanny Sihombing authored Mar 25, 2021
  
  16289931
24 Mar, 2021 3 commits
- update unit test · 4447a18e
  Rosanny Sihombing authored Mar 24, 2021
  
  4447a18e
- functionality updates · 344319f5
  Rosanny Sihombing authored Mar 24, 2021
  
  344319f5
- cosmetic update · a2d207dc
  Rosanny Sihombing authored Mar 24, 2021
  
  a2d207dc
08 Mar, 2021 1 commit
- update unit test · 70638bdb
  Rosanny Sihombing authored Mar 08, 2021
  
  70638bdb
04 Mar, 2021 3 commits
- minor updates · 908416f6
  Rosanny Sihombing authored Mar 04, 2021
  
  908416f6
- add breadcrumb · b0e45392
  Rosanny Sihombing authored Mar 04, 2021
  
  b0e45392
- add path and breadcrumb · c26edde1
  Rosanny Sihombing authored Mar 04, 2021
  
  c26edde1
03 Mar, 2021 1 commit
- minor updates · 3a75a617
  Rosanny Sihombing authored Mar 03, 2021
  
  3a75a617