Commits · c71772b16531cc48496329c8da057ebc0c9ecb87 · m4lab_tv1 / User Account

06 May, 2021 3 commits
- rename routes-account into account · c71772b1
  Rosanny Sihombing authored May 06, 2021
  
  c71772b1
- rename and delete · 51ee0abe
  Rosanny Sihombing authored May 06, 2021
  
  51ee0abe
- set env back to testing · 902048b0
  Rosanny Sihombing authored May 06, 2021
  
  902048b0
05 May, 2021 11 commits
- restructure the routes · 2af9ff58
  Rosanny Sihombing authored May 05, 2021
  
  2af9ff58
- add new constants · fb8c91ca
  Rosanny Sihombing authored May 05, 2021
  
  fb8c91ca
- cosmetic correction · 6bdfe76e
  Rosanny Sihombing authored May 05, 2021
  
  6bdfe76e
- remove unused variables · 1f659fc8
  Rosanny Sihombing authored May 05, 2021
  
  1f659fc8
- small cosmetic correction · 74e11d71
  Rosanny Sihombing authored May 05, 2021
  
  74e11d71
- restructure the project · ed62b6df
  Rosanny Sihombing authored May 05, 2021
  
  ed62b6df
- add a new route · 3000c768
  Rosanny Sihombing authored May 05, 2021
  
  3000c768
- delete unused files · ea1e33a1
  Rosanny Sihombing authored May 05, 2021
  
  ea1e33a1
- remove an obsolete method · da61fe34
  Rosanny Sihombing authored May 05, 2021
  
  da61fe34
- Merge branch 'MLAB-501' into 'testing' · 3dbef16c
  Rosanny Sihombing authored May 05, 2021
```
Mlab 501

See merge request !80
```
  3dbef16c
- small updates & add German wordings · dd0965d8
  Rosanny Sihombing authored May 05, 2021
  
  dd0965d8
30 Apr, 2021 5 commits
- add /deleteProject · e0da3a30
  Rosanny Sihombing authored Apr 30, 2021
  
  e0da3a30
- add deleteProjectById function · 1ea9adf8
  Rosanny Sihombing authored Apr 30, 2021
  
  1ea9adf8
- add a new package · cee2980f
  Rosanny Sihombing authored Apr 30, 2021
  
  cee2980f
- update delete section · 83bf3ffa
  Rosanny Sihombing authored Apr 30, 2021
  
  83bf3ffa
- add button and confirmation to delete a website · 9b8c1a67
  Rosanny Sihombing authored Apr 30, 2021
  
  9b8c1a67
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 11 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