Commits · master · 21-22J-035 / 21-22J-035

25 Apr, 2022 8 commits
- Merge branch 'IT18230666' into 'master' · b0a1ad7a
  M.P Dewalegama authored Apr 25, 2022
```
EmoPlay backend function implemented

See merge request !31
```
  b0a1ad7a
- EmoPlay backend function implemented · 4366db84
  A.D.S de Zoysa authored Apr 25, 2022
  
  4366db84
- Merge branch 'dev' into 'master' · 0a467b21
  M.P Dewalegama authored Apr 25, 2022
```
Dev

See merge request !30
```
  0a467b21
- Merge branch 'IT18226324' into 'dev' · 1d011ccc
  D.M.J.C Dissanayake authored Apr 25, 2022
```
It18226324

See merge request !29
```
  1d011ccc
- deployee configuration setup · 2603dc5d
  D.M.J.C Dissanayake authored Apr 25, 2022
  
  2603dc5d
- repo clean up · 5c361ddc
  D.M.J.C Dissanayake authored Apr 25, 2022
  
  5c361ddc
- Merge branch 'master' of http://gitlab.sliit.lk/21-22j-035/21-22j-035 into IT18226324 · 94ee1c76
  D.M.J.C Dissanayake authored Apr 25, 2022
  
  94ee1c76
- Project clean up and set hosting configuration · 35a491ac
  D.M.J.C Dissanayake authored Apr 25, 2022
  
  35a491ac
24 Apr, 2022 3 commits
- Merge branch 'dev' into 'master' · c42797a4
  M.P Dewalegama authored Apr 24, 2022
```
Driver distraction detection enhancements

See merge request !28
```
  c42797a4
- Merge branch 'IT18229080' into 'dev' · 0f487635
  M.P Dewalegama authored Apr 24, 2022
```
Driver distraction detection service enhancements

See merge request !27
```
  0f487635
- Driver distraction detection service enhacements · 97dda74f
  M.P Dewalegama authored Apr 24, 2022
  
  97dda74f
23 Apr, 2022 3 commits
- Merge branch 'dev' into 'master' · 9ae27747
  M.P Dewalegama authored Apr 23, 2022
```
enhancing forgotten item detection system

See merge request !26
```
  9ae27747
- Merge branch 'IT18258240' into 'dev' · b2f0139b
  L.M Kodikara authored Apr 23, 2022
```
enhancing forgotten item detection system

See merge request !25
```
  b2f0139b
- enhancing the forgotten item detection system · 00c24208
  L.M Kodikara authored Apr 23, 2022
  
  00c24208
20 Apr, 2022 6 commits
- Merge branch 'dev' into 'master' · 49434af1
  M.P Dewalegama authored Apr 20, 2022
```
forgotten item implemented

See merge request !24
```
  49434af1
- Merge branch 'IT18258240' into 'dev' · f2cabe6c
  L.M Kodikara authored Apr 20, 2022
```
Forgotten item detector implemented

See merge request !23
```
  f2cabe6c
- Fogotten item detector implemented · fdee05b4
  L.M Kodikara authored Apr 20, 2022
  
  fdee05b4
- Merge branch 'dev' into 'master' · 26cdb311
  M.P Dewalegama authored Apr 20, 2022
```
apply some changes to overall project

See merge request !22
```
  26cdb311
- Merge branch 'IT18229080' into 'dev' · 81b76e8c
  M.P Dewalegama authored Apr 20, 2022
```
Driver distraction detection service implemented

See merge request !21
```
  81b76e8c
- driver distraction detection service implemented · 51f11ed6
  M.P Dewalegama authored Apr 20, 2022
  
  51f11ed6
23 Mar, 2022 6 commits
- git ignore changes · bc2c73a4
  D.M.J.C Dissanayake authored Mar 24, 2022
  
  bc2c73a4
- Merge branch 'dev' into 'master' · 73d244b5
  M.P Dewalegama authored Mar 24, 2022
```
Merging Dev wit the Master

See merge request !20
```
  73d244b5
- Merge branch 'dev' of http://gitlab.sliit.lk/21-22j-035/21-22j-035 into dev · 010a3ed5
  M.P Dewalegama authored Mar 24, 2022
  
  010a3ed5
- Merge branch 'IT18230666' into 'dev' · c0990e84
  M.P Dewalegama authored Mar 24, 2022
```
Initialized face emotion detection backend

See merge request !19
```
  c0990e84
- Merge branch 'dev' into 'IT18230666' · 74f9ccd3
  M.P Dewalegama authored Mar 24, 2022
```
# Conflicts:
#   back-end/.gitignore
#   back-end/app.py
```
  74f9ccd3
- Initialized face emotion detection backend · 18177140
  A.D.S de Zoysa authored Mar 24, 2022
  
  18177140
17 Mar, 2022 8 commits
- Merge branch 'dev' into 'master' · 18e10141
  M.P Dewalegama authored Mar 18, 2022
```
Merge branch 'IT18226324' into 'dev'

See merge request !18
```
  18e10141
- Merge branch 'IT18226324' into 'dev' · 1f1e0ffa
  D.M.J.C Dissanayake authored Mar 18, 2022
```
It18226324 in to dev

See merge request !17
```
  1f1e0ffa
- Merge branch 'dev' into 'master' · 3fe34e09
  M.P Dewalegama authored Mar 18, 2022
```
Merge branch 'IT18226324' into 'dev' into master

See merge request !16
```
  3fe34e09
- Merge branch 'IT18226324' into 'dev' · a1f71ea3
  D.M.J.C Dissanayake authored Mar 18, 2022
```
intialized flask server and implemeted the voice emotion detection api

See merge request !15
```
  a1f71ea3
- Merge branch 'dev' into 'master' · 2e508e9b
  M.P Dewalegama authored Mar 18, 2022
```
Dev merge into master

See merge request !14
```
  2e508e9b
- Merge branch 'IT18226324' into 'master' · 7bbdfd76
  M.P Dewalegama authored Mar 18, 2022
```
Initialized flask server and implemented the voice emotion detection api

See merge request !13
```
  7bbdfd76
- Merge branch 'IT18230666' into 'dev' · e7998f3d
  M.P Dewalegama authored Mar 18, 2022
```
Improvement of Android player

See merge request !12
```
  e7998f3d
- intialized flask server and implemeted the voice emotion detection api · 36444dee
  D.M.J.C Dissanayake authored Mar 18, 2022
  
  36444dee
08 Jan, 2022 2 commits
- Home screen UI changed · 70e427a2
  A.D.S de Zoysa authored Jan 09, 2022
  
  70e427a2
- Music player splash screen added · 7da4c730
  A.D.S de Zoysa authored Jan 08, 2022
  
  7da4c730
05 Jan, 2022 4 commits
- Merge branch 'dev' into 'master' · 57ef0a44
  M.P Dewalegama authored Jan 05, 2022
```
dev branch merge into master

See merge request !6
```
  57ef0a44
- Navigation component (map) implemented · 06f68810
  A.D.S de Zoysa authored Jan 05, 2022
  
  06f68810
- Home screen buttons implemented · 56d8e660
  A.D.S de Zoysa authored Jan 05, 2022
  
  56d8e660
- Home screen implemented · 083c2c19
  A.D.S de Zoysa authored Jan 05, 2022
  
  083c2c19