Commits · 30549259d2bdbee58f8d7cc1e46fe4200767dd37 · 2021-049 / 2021-049

20 Nov, 2021 2 commits
- Merge branch 'IT18063288' into 'master' · 30549259
  Hasitha Samarasekara authored Nov 20, 2021
```
It18063288

See merge request !19
```
  30549259
- Add class view popup and student request to class with db request · 5fdf3eef
  Hasitha Samarasekara authored Nov 20, 2021
  
  5fdf3eef
18 Nov, 2021 11 commits
- Top advertisement added · 7bc7617b
  Hasitha Samarasekara authored Nov 18, 2021
  
  7bc7617b
- Merge remote-tracking branch 'origin/master' · dd4940a7
  Hasitha Samarasekara authored Nov 18, 2021
  
  dd4940a7
- Home Page advertismenet added · 58d0e534
  Hasitha Samarasekara authored Nov 18, 2021
  
  58d0e534
- Merge branch 'IT18063288' into 'master' · 98164579
  Hasitha Samarasekara authored Nov 18, 2021
```
It18063288

See merge request !18
```
  98164579
- resolved merge conflicts · 76c2c708
  Hasitha Samarasekara authored Nov 18, 2021
  
  76c2c708
- Merge remote-tracking branch 'origin/master' · 945846ed
  Hasitha Samarasekara authored Nov 18, 2021
```
# Conflicts:
#	WebFrontEnd/smartcoach-frontend/package-lock.json
#	WebFrontEnd/smartcoach-frontend/package.json
```
  945846ed
- Optimize the home page · e7f90597
  Hasitha Samarasekara authored Nov 18, 2021
  
  e7f90597
- Merge branch 'IT18058338' into 'master' · 48f1d587
  Hasitha Samarasekara authored Nov 18, 2021
```
It18058338

See merge request !17
```
  48f1d587
- Merge branch 'master' into 'IT18058338' · 9da8448b
  Hasitha Samarasekara authored Nov 18, 2021
```
# Conflicts:
#   BackEnd/WebBackEnd/server.js
```
  9da8448b
- Merge branch 'IT18050240' into 'master' · f0f44d55
  Hasitha Samarasekara authored Nov 18, 2021
```
It18050240

See merge request !16
```
  f0f44d55
- Merge branch 'it18049114' into 'master' · f14423bd
  Hasitha Samarasekara authored Nov 18, 2021
```
It18049114

See merge request !15
```
  f14423bd
17 Nov, 2021 2 commits
- fix automatic_question · 274a44c9
  Devinda authored Nov 17, 2021
  
  274a44c9
- Amendments done · 014bee6f
  Gihan76 authored Nov 17, 2021
  
  014bee6f
15 Nov, 2021 1 commit
- add automatic_question/ lessonandexampage page · 7302e815
  Devinda authored Nov 15, 2021
  
  7302e815
17 Oct, 2021 2 commits
- Merge remote-tracking branch 'origin/master' · 77c08e17
  Hasitha Samarasekara authored Oct 17, 2021
  
  77c08e17
- Add Filter options to Home Page · dbeb12ff
  Hasitha Samarasekara authored Oct 17, 2021
  
  dbeb12ff
14 Oct, 2021 1 commit
- Create User Login - Tutor DashBoard - 2 · e46eca11
  Hasitha Samarasekara authored Oct 14, 2021
  
  e46eca11
13 Oct, 2021 15 commits
- Link question bank page and lesson page · 8ad7b64d
  Devinda authored Oct 14, 2021
  
  8ad7b64d
- Merge remote-tracking branch 'origin/master' · 402157f6
  Devinda authored Oct 13, 2021
```
# Conflicts:
#	WebFrontEnd/smartcoach-frontend/src/App.js
```
  402157f6
- fix errors automatic_question/ lessonandexampage/question_bank/lessonupload · 847a6825
  Devinda authored Oct 13, 2021
  
  847a6825
- Merge remote-tracking branch 'origin/master' · 39d604a3
  Hansaka97 authored Oct 13, 2021
  
  39d604a3
- Android project modify commit · a97b097b
  Hansaka97 authored Oct 13, 2021
  
  a97b097b
- Merge remote-tracking branch 'origin/master' · f7e15942
  Gihan76 authored Oct 13, 2021
```
# Conflicts:
#	WebFrontEnd/smartcoach-frontend/src/Components/Admin/Dashboard.js
```
  f7e15942
- Student performance details route and model adding done · 83c1a9e0
  Gihan76 authored Oct 13, 2021
  
  83c1a9e0
- Student performance details adding done · 338bc956
  Gihan76 authored Oct 13, 2021
  
  338bc956
- Merge branch 'IT18063288' into 'master' · 09e07a18
  Hasitha Samarasekara authored Oct 13, 2021
```
Create User Login - Tutor DashBoard

See merge request !14
```
  09e07a18
- Create User Login - Tutor DashBoard · 477ad330
  Hasitha Samarasekara authored Oct 13, 2021
  
  477ad330
- Merge branch 'IT18063288' into 'master' · 4b5e5bdb
  Hasitha Samarasekara authored Oct 13, 2021
```
It18063288

See merge request !13
```
  4b5e5bdb
- Merge remote-tracking branch 'origin/master' · 3fbdd6ff
  Hasitha Samarasekara authored Oct 13, 2021
  
  3fbdd6ff
- Create User Login - functions · 5fccce74
  Hasitha Samarasekara authored Oct 13, 2021
  
  5fccce74
- Merge branch 'IT18063288' into 'master' · 90d14588
  Hasitha Samarasekara authored Oct 13, 2021
```
It18063288

See merge request !12
```
  90d14588
- Student requests · bed0e292
  Hasitha Samarasekara authored Oct 13, 2021
  
  bed0e292
09 Oct, 2021 2 commits
- Merge remote-tracking branch 'origin/master' · 1dc8d6b5
  Hasitha Samarasekara authored Oct 09, 2021
  
  1dc8d6b5
- Create tutors profile rating and review section and tutor class details. Tutor... · d92ee9aa
  Hasitha Samarasekara authored Oct 09, 2021
```
Create tutors profile rating and review section and tutor class details. Tutor dashboard class details
```
  d92ee9aa
02 Oct, 2021 4 commits

add lesson upload page and route · 3491792d
Devinda authored Oct 03, 2021

3491792d

Merge remote-tracking branch 'origin/master' · 244d3fbd

Devinda authored Oct 02, 2021

# Conflicts:
#	BackEnd/WebBackEnd/package-lock.json
#	BackEnd/WebBackEnd/package.json
#	BackEnd/WebBackEnd/server.js
#	WebFrontEnd/smartcoach-frontend/src/App.js

244d3fbd

update question create function · c7af3456
Devinda authored Oct 02, 2021

c7af3456

Merge remote-tracking branch 'origin/master' · a3a0d659

Gihan76 authored Oct 02, 2021

# Conflicts:
#	WebFrontEnd/smartcoach-frontend/package-lock.json
#	WebFrontEnd/smartcoach-frontend/package.json
#	WebFrontEnd/smartcoach-frontend/src/Components/Admin/Dashboard.js

a3a0d659