Commits · 4558dc0a75f33ec70555b5380ce622c4f45bd14a · Sachith Fernando / 2020-101

22 Oct, 2020 12 commits
- Merge remote-tracking branch 'origin/QA_RELEASE' into db_and_monitoring_IT17097284 · 4558dc0a
  SohanDanushka authored Oct 22, 2020
  
  4558dc0a
- Committing minor changes in the index.html · ea2061f2
  SohanDanushka authored Oct 22, 2020
  
  ea2061f2
- Committing - backing up files · 36d2cbfa
  SohanDanushka authored Oct 22, 2020
  
  36d2cbfa
- Merge branch 'monitoring_student_behavior_IT17138000' into 'QA_RELEASE' · 65f5c691
  I.K Seneviratne authored Oct 22, 2020
```
Monitoring student behavior it17138000

See merge request !11
```
  65f5c691
- Merge remote-tracking branch 'origin/QA_RELEASE' into monitoring_student_behavior_IT17138000 · ca1b4798
  I.K Seneviratne authored Oct 22, 2020
  
  ca1b4798
- Committing the removal of unnecessary components in activity, emotion and gaze frontend pages. · 9ab5c758
  I.K Seneviratne authored Oct 22, 2020
  
  9ab5c758
- Merge branch 'monitoring_student_behavior_IT17138000' into 'QA_RELEASE' · 6cff7d6f
  I.K Seneviratne authored Oct 22, 2020
```
Monitoring student behavior it17138000

See merge request !8
```
  6cff7d6f
- Merge remote-tracking branch 'origin/QA_RELEASE' into monitoring_student_behavior_IT17138000 · e0f4843e
  I.K Seneviratne authored Oct 22, 2020
  
  e0f4843e
- Committing the change in the admin redirection path in views.py. · 7b3b5dd0
  I.K Seneviratne authored Oct 22, 2020
  
  7b3b5dd0
- Merge branch 'monitoring_student_behavior_IT17138000' into 'QA_RELEASE' · 1b776b39
  I.K Seneviratne authored Oct 22, 2020
```
Monitoring student behavior it17138000

See merge request !7
```
  1b776b39
- Merge remote-tracking branch 'origin/QA_RELEASE' into monitoring_student_behavior_IT17138000 · 23d79aeb
  I.K Seneviratne authored Oct 22, 2020
```
# Conflicts:
#	FirstApp/templates/FirstApp/template.html
```
  23d79aeb
- Committing a simple html element name change in activity.html. · d831404a
  I.K Seneviratne authored Oct 22, 2020
  
  d831404a
21 Oct, 2020 1 commit

Committing the addition of 401 page and full implementation of saving... · 539497be

I.K Seneviratne authored Oct 21, 2020

Committing the addition of 401 page and full implementation of saving activity, emotion and gaze estimations through a single process.

539497be

20 Oct, 2020 1 commit
- Committing the implementations of creating an admin user. · 745c0fb3
  I.K Seneviratne authored Oct 20, 2020
  
  745c0fb3
19 Oct, 2020 16 commits
- Committing - adjusting coding standards 2 · 3a6301d8
  SohanDanushka authored Oct 18, 2020
  
  3a6301d8
- Committing - adjusting coding standards 1 · 260dd841
  SohanDanushka authored Oct 18, 2020
  
  260dd841
- Commiting IT17098960's changes · aab59071
  LiniEisha authored Oct 18, 2020
  
  aab59071
- fixing issues in side menu · db24e45e
  LiniEisha authored Oct 18, 2020
  
  db24e45e
- Demo (for pp2) changes · 3e7cbd0a
  LiniEisha authored Oct 17, 2020
  
  3e7cbd0a
- db changes verifying in lecturer video - Committing a migration file · 5403772a
  SohanDanushka authored Oct 04, 2020
  
  5403772a
- db changes verifying in lecturer video · 5b1ec409
  SohanDanushka authored Oct 04, 2020
  
  5b1ec409
- db changes and lecturer video · 006dc258
  SohanDanushka authored Oct 02, 2020
  
  006dc258
- Demo (for pp2) changes · b03380b0
  LiniEisha authored Sep 24, 2020
  
  b03380b0
- IT17098960 is committing from IT17100908 user's branch. · a137dea7
  LiniEisha authored Sep 24, 2020
  
  a137dea7
- IT17098960 is committing from IT17100908 user's branch. · e9aaea3d
  LiniEisha authored Sep 23, 2020
  
  e9aaea3d
- FrontEnd · fd7543bd
  LiniEisha authored Sep 23, 2020
  
  fd7543bd
- Combining with old files · 229a6683
  LiniEisha authored Sep 23, 2020
  
  229a6683
- Models · f8449fa0
  LiniEisha authored Sep 23, 2020
  
  f8449fa0
- summary path · 1ebb516e
  LiniEisha authored Sep 22, 2020
  
  1ebb516e
- initial commit for summarizations · 1cd97a40
  LiniEisha authored Sep 22, 2020
  
  1cd97a40
18 Oct, 2020 10 commits
- Merge branch 'db_and_monitoring' into 'QA_RELEASE' · 865e853d
  I.K Seneviratne authored Oct 18, 2020
```
Db and monitoring

See merge request !6
```
  865e853d
- Committing - adjusting coding standards 2 · b30755ac
  SohanDanushka authored Oct 18, 2020
  
  b30755ac
- Merge branch 'QA_RELEASE' into db_and_monitoring · 0568d7fa
  SohanDanushka authored Oct 18, 2020
  
  0568d7fa
- Committing - adjusting coding standards 1 · 18054e0d
  SohanDanushka authored Oct 18, 2020
  
  18054e0d
- Merge branch 'monitoring_student_behavior_IT17138000' into 'QA_RELEASE' · e083d4cf
  Sachith Fernando authored Oct 18, 2020
```
Committing a sample text file to add the deleted local branch.

See merge request !5
```
  e083d4cf
- Committing a sample text file to add the deleted local branch. · 277c15f5
  I.K Seneviratne authored Oct 18, 2020
  
  277c15f5
- Merge branch 'IT17098960' into 'QA_RELEASE' · 8c07d56a
  I.K Seneviratne authored Oct 18, 2020
```
Commiting IT17098960's changes

See merge request !4
```
  8c07d56a
- Commiting IT17098960's changes · 933120ca
  LiniEisha authored Oct 18, 2020
  
  933120ca
- Merge branch 'summarization_changes' into 'QA_RELEASE' · 05ac3132
  I.K Seneviratne authored Oct 18, 2020
```
Summarization changes

See merge request !3
```
  05ac3132
- fixing issues in side menu · ade8f9f2
  LiniEisha authored Oct 18, 2020
  
  ade8f9f2