osp1
|
e6be4d3f50
|
Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20
|
2020-05-01 15:15:42 +01:00 |
|
osp1
|
a46b60bb8e
|
Removed unused tests
|
2020-05-01 15:15:34 +01:00 |
|
maj83
|
0e5a99f9e8
|
Update for comboboxes
|
2020-05-01 15:14:43 +01:00 |
|
law39
|
fa4f9759f7
|
Fixed Merge conflict bug
|
2020-05-01 15:07:41 +01:00 |
|
maj83
|
a2f1c5f9cb
|
Update for comboboxes
|
2020-05-01 15:04:13 +01:00 |
|
top19
|
2b161741db
|
Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20
|
2020-05-01 15:01:18 +01:00 |
|
top19
|
cf7351e9d3
|
Documented six meanings.
|
2020-05-01 15:00:52 +01:00 |
|
law39
|
ec32188200
|
Merge remote-tracking branch 'origin/master'
|
2020-05-01 14:54:30 +01:00 |
|
law39
|
5843e21591
|
AssessmentGenerator fixed merge conflict bug
|
2020-05-01 14:54:25 +01:00 |
|
top19
|
d904fadcad
|
Updated documentation for JSONTest.java.
Addressed issue #44.
|
2020-05-01 14:52:01 +01:00 |
|
law39
|
1a8d956a7d
|
Merge remote-tracking branch 'origin/master'
|
2020-05-01 14:48:20 +01:00 |
|
law39
|
edd26247fc
|
Updated Application to comply with SE.QA.09. Issue #35
|
2020-05-01 14:48:09 +01:00 |
|
law39
|
9b741d90db
|
Improved DictionaryEntry Equals method
|
2020-05-01 14:40:53 +01:00 |
|
top19
|
afb645e7c2
|
Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20
|
2020-05-01 14:40:39 +01:00 |
|
top19
|
155dee3a55
|
Updated documentation for JSONText.java.
Addressed issue #44
|
2020-05-01 14:40:15 +01:00 |
|
osp1
|
2a11c4a1fe
|
Commenting for Dictionary and Practice List
Issue #47
Issue #37
|
2020-05-01 14:39:31 +01:00 |
|
law39
|
4b43632364
|
Reformatted comments DictionaryEntry #52
|
2020-05-01 14:38:46 +01:00 |
|
law39
|
800c1445e7
|
Changed JavaDoc DictionaryEntry #52
|
2020-05-01 14:34:43 +01:00 |
|
maj83
|
5d4ed5441b
|
Update with comboboxes
|
2020-05-01 14:28:57 +01:00 |
|
maj83
|
99049dc5b9
|
Update with comboboxes
|
2020-05-01 14:28:08 +01:00 |
|
top19
|
96d9722cf8
|
Updated documentation for FlashcardController.java.
Addressed issue #41.
|
2020-05-01 14:25:53 +01:00 |
|
top19
|
7a1a1965ab
|
Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20
|
2020-05-01 14:21:13 +01:00 |
|
top19
|
19fcf162ee
|
Updated documentation for SharedCodeController.java.
Addressed issue #49.
|
2020-05-01 14:20:47 +01:00 |
|
kab74
|
232a629fe2
|
Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20
|
2020-05-01 14:18:30 +01:00 |
|
kab74
|
b7df7c1a1b
|
Made selfassessment comply with QA 9
|
2020-05-01 14:17:43 +01:00 |
|
law39
|
ea9619366d
|
Merge remote-tracking branch 'origin/master'
|
2020-05-01 13:56:48 +01:00 |
|
law39
|
96d073f0cf
|
Updated ScreenSwitch corrected JavaDoc. Issue #48
Addressed issue #48
SE.QA.09 5.1 - added notice
SE.QA.09 5.2 - added all users to javadoc.
SE.QA.09 5.4 - corrected comments.
|
2020-05-01 13:56:03 +01:00 |
|
top19
|
430cbcebad
|
Updated documentation for FlashcardController.
Addressed issue #41.
|
2020-05-01 13:55:41 +01:00 |
|
law39
|
3574bfca8e
|
Merge remote-tracking branch 'origin/master'
|
2020-05-01 13:46:13 +01:00 |
|
law39
|
2666eb9702
|
Fixed Tom Perry name
Replaced top1 with top19
|
2020-05-01 13:46:09 +01:00 |
|
kab74
|
6de32a77c0
|
Fixed issues with selfAssessment package
|
2020-05-01 13:44:31 +01:00 |
|
Henry Dugmore
|
f4a81a51ec
|
Fixed issue 36 addwordcontroller
The merge when I pulled last time deleted what I'd done I think so here it actually is
|
2020-05-01 13:41:24 +01:00 |
|
osp1
|
125f59f09a
|
Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20
|
2020-05-01 13:34:32 +01:00 |
|
top19
|
a70e33d972
|
Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20
|
2020-05-01 13:33:57 +01:00 |
|
osp1
|
1c9e73be8e
|
JavaDoc for PracticeList, Issue #47
|
2020-05-01 13:33:53 +01:00 |
|
top19
|
59cac89fba
|
Updated documentation of DictionaryEntry as requested in Issue #38.
|
2020-05-01 13:33:21 +01:00 |
|
law39
|
bbd9caa498
|
Merge remote-tracking branch 'origin/master'
|
2020-05-01 13:33:15 +01:00 |
|
law39
|
74540757b7
|
Now saves when the Application is closed
Practice list persists
|
2020-05-01 13:33:07 +01:00 |
|
kab74
|
9d4eb318f1
|
Fixed issues with selfassessment package
|
2020-05-01 13:31:43 +01:00 |
|
Brad Corbett
|
0340fc0038
|
Removed unnecessary test classes TranslationControllerTest and FlashcardControllerTest.
|
2020-05-01 13:30:10 +01:00 |
|
osp1
|
d11b4579d4
|
Fixed clipping issue in Translation and SixMeaning
|
2020-05-01 13:25:19 +01:00 |
|
law39
|
e95a8a9159
|
Added JavaDoc to JsonProcessing class. Issue #39
|
2020-05-01 13:21:32 +01:00 |
|
law39
|
b0a3b95d70
|
Re-indented Json processing to 3 spaces issue #39
|
2020-05-01 13:07:00 +01:00 |
|
law39
|
b17a689341
|
Merge remote-tracking branch 'origin/master'
|
2020-05-01 13:04:27 +01:00 |
|
law39
|
a4f7b7f577
|
Removed unneeded param tags in Dictionary Controller
|
2020-05-01 13:04:22 +01:00 |
|
top19
|
1f734ca50c
|
Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20
|
2020-05-01 13:02:25 +01:00 |
|
top19
|
280930aa7f
|
Changed the dictionary entry's equals method so no two words of the same type and language can be added.
|
2020-05-01 13:01:21 +01:00 |
|
law39
|
d83f9e6da1
|
Added JavaDoc to the Dictionary Controller. Issue #37
|
2020-05-01 13:01:02 +01:00 |
|
Henry Dugmore
|
c43d7184ae
|
Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20
|
2020-05-01 12:52:25 +01:00 |
|
top19
|
56c8aff326
|
Addressed issues with Application's documentation.
|
2020-05-01 12:50:29 +01:00 |
|