Commits · IT19041926 · 2022-158 / 2022-158

06 Nov, 2022 15 commits
- Merge branch 'master' into 'IT19041926' · 998ccc4f
  Onella Natalie P.A.D. authored Nov 07, 2022
```
Master

See merge request !119
```
  998ccc4f
- Merge branch 'IT19070704' into 'master' · d2366814
  Weerasinghe D.N.H authored Nov 07, 2022
```
It19070704

See merge request !118
```
  d2366814
- BACKEND : Merge conflict fixed · 5d4ba196
  Weerasinghe D.N.H authored Nov 07, 2022
  
  5d4ba196
- BACKEND: updated database · c20fbbe4
  Weerasinghe D.N.H authored Nov 07, 2022
  
  c20fbbe4
- BACKEND: update - source folder of the backend · 0d5a4364
  Weerasinghe D.N.H authored Nov 07, 2022
  
  0d5a4364
- Merge branch 'revert-675bfe4e' into 'master' · c0a2b07e
  Weerasinghe D.N.H authored Nov 06, 2022
```
Revert "Merge branch 'IT19070704' into 'master'"

See merge request !117
```
  c0a2b07e
- Revert "Merge branch 'IT19070704' into 'master'" · f3f4c6c4
  Weerasinghe D.N.H authored Nov 06, 2022
```
This reverts merge request !113
```
  f3f4c6c4
- Merge branch 'revert-6310c941' into 'master' · 5f88aa7d
  Weerasinghe D.N.H authored Nov 06, 2022
```
Revert "Merge branch 'IT19070704' into 'master'"

See merge request !116
```
  5f88aa7d
- Revert "Merge branch 'IT19070704' into 'master'" · 2bc6a00a
  Weerasinghe D.N.H authored Nov 06, 2022
```
This reverts merge request !114
```
  2bc6a00a
- Merge branch 'IT19070704' into 'master' · 6310c941
  Weerasinghe D.N.H authored Nov 06, 2022
```
It19070704

See merge request !114
```
  6310c941
- UPDATE : source folder updated · ed1b6e0f
  Weerasinghe D.N.H authored Nov 06, 2022
  
  ed1b6e0f
- Merge branch 'IT19070704' into 'master' · 675bfe4e
  Weerasinghe D.N.H authored Nov 06, 2022
```
It19070704

See merge request !113
```
  675bfe4e
- Merge branch 'master' of http://gitlab.sliit.lk/2022-158/2022-158 into IT19070704 · 79578314
  Weerasinghe D.N.H authored Nov 06, 2022
  
  79578314
- UPDATE : updated methods of class_diagram_class_detection_service methods with comments · 162baed2
  Weerasinghe D.N.H authored Nov 06, 2022
  
  162baed2
- Onella: Brunch · eb95e62d
  OnellaNatalie authored Nov 06, 2022
  
  eb95e62d
13 Oct, 2022 1 commit
- BACKEND : Method definitions added for class_diagram_class_detection_service.py · bcfcfb57
  Weerasinghe D.N.H authored Oct 13, 2022
  
  bcfcfb57
10 Oct, 2022 4 commits
- db commit · ceb44915
  Weerasinghe D.N.H authored Oct 10, 2022
  
  ceb44915
- db commit · 13c5bbf2
  Weerasinghe D.N.H authored Oct 10, 2022
  
  13c5bbf2
- Merge remote-tracking branch 'origin/IT19076362' into IT19070704 · c709d5ff
  Weerasinghe D.N.H authored Oct 10, 2022
```
# Conflicts:
#	backend/backend/database.db
```
  c709d5ff
- db commit · cf517367
  Weerasinghe D.N.H authored Oct 10, 2022
  
  cf517367
09 Oct, 2022 20 commits
- Merge branch 'IT19076362' into 'master' · 2e179154
  Thiwanka K.A.T authored Oct 10, 2022
```
It19076362

See merge request !110
```
  2e179154
- CREATE: register comp created · c5011a16
  Thushara Thiwanka authored Oct 10, 2022
  
  c5011a16
- merge in to master branch · a68ec64c
  Weerasinghe D.N.H authored Oct 10, 2022
  
  a68ec64c
- Merge branch 'master' into 'IT19076362' · 74305be8
  Thiwanka K.A.T authored Oct 10, 2022
```
Master

See merge request !107
```
  74305be8
- BACKEND : backend is replaced · 465e776c
  Weerasinghe D.N.H authored Oct 09, 2022
  
  465e776c
- Merge branch 'IT19076362' into 'master' · 7bcede41
  Thiwanka K.A.T authored Oct 09, 2022
```
UPDATE: variable name changes

See merge request !104
```
  7bcede41
- UPDATE: variable name changes · c04ae0a6
  Thushara Thiwanka authored Oct 09, 2022
  
  c04ae0a6
- BACKEND : merge conflicts resolved · 7d930a87
  Weerasinghe D.N.H authored Oct 09, 2022
  
  7d930a87
- BACKEND : merge conflict issue resolved · 3c385a39
  Weerasinghe D.N.H authored Oct 09, 2022
  
  3c385a39
- Merge branch 'IT19076362' into 'master' · f7d51f08
  Thiwanka K.A.T authored Oct 09, 2022
```
UPDATE: variable name changes

See merge request !103
```
  f7d51f08
- UPDATE: variable name changes · fac17323
  Thushara Thiwanka authored Oct 09, 2022
  
  fac17323
- restate the master · 94ee541c
  Jayasith H.B.C authored Oct 09, 2022
  
  94ee541c
- Merge branch 'revert-2fe6ad38' into 'master' · 4f2fb7ce
  Weerasinghe D.N.H authored Oct 09, 2022
```
Revert "Merge branch 'IT19041926' into 'master'"

See merge request !102
```
  4f2fb7ce
- Revert "Merge branch 'IT19041926' into 'master'" · a0b409d9
  Weerasinghe D.N.H authored Oct 09, 2022
```
This reverts merge request !98
```
  a0b409d9
- BACKEND : db file changes updated · 74bc3bd2
  Weerasinghe D.N.H authored Oct 09, 2022
  
  74bc3bd2
- Merge branch 'IT19041926' into 'master' · 2fe6ad38
  Onella Natalie P.A.D. authored Oct 09, 2022
```
It19041926

See merge request !98
```
  2fe6ad38
- Merge branch 'master' of http://gitlab.sliit.lk/2022-158/2022-158 into IT19041926 · 3cad21a7
  OnellaNatalie authored Oct 09, 2022
```
# Conflicts:
#	backend/database.db
#	backend/models/attribute_model.py
#	backend/models/class_component_model.py
#	backend/routes/submission_routes.py
#	backend/services/class_model_detection_service.py
```
  3cad21a7
- Merge branch 'IT19070704' into 'master' · 704c5c1a
  Weerasinghe D.N.H authored Oct 09, 2022
```
FRONTEND : Student components updated

See merge request !99
```
  704c5c1a
- FRONTEND : Student components updated · a3686902
  Weerasinghe D.N.H authored Oct 09, 2022
  
  a3686902
- db · 96a8c049
  OnellaNatalie authored Oct 09, 2022
  
  96a8c049