Commit graph

578 commits

Author SHA1 Message Date
law39
1d444a5d93 Added copyright notice @ Question 2020-05-01 15:27:16 +01:00
osp1
5939a92199 Fixed warnings about javafx version 2020-05-01 15:27:14 +01:00
Henry Dugmore
16598c8a0b Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-05-01 15:26:40 +01:00
law39
ef9f84b00b Added copyright notice @ MatchTheMeaningQuestion 2020-05-01 15:26:31 +01:00
law39
dc9958bc88 Added copyright notice @ AssessmentGenerator 2020-05-01 15:25:12 +01:00
Henry Dugmore
6e27ea7bea Issue #46 fixed copyright notice
fixed copyright notice on addwordcontroller and questiontest
2020-05-01 15:25:11 +01:00
law39
bb7890f715 Moved copyright notice above package @ jsonProcessing 2020-05-01 15:24:02 +01:00
law39
88ac365b33 Moved Copyright notice above package @ScreenSwitch 2020-05-01 15:23:07 +01:00
law39
d0ce117ac4 Corrected copyright notice @ matchmeaningcontroller 2020-05-01 15:21:31 +01:00
law39
679caace98 Moved copyright notice above package @ matchmeaning controller 2020-05-01 15:20:52 +01:00
law39
c8ae7da11b Merge remote-tracking branch 'origin/master' 2020-05-01 15:17:50 +01:00
law39
1311bd5c0d Corrected version number @ Translation Controller 2020-05-01 15:17:44 +01:00
law39
96546c7419 Updated translation controller SE.QA.09 Issues #51 2020-05-01 15:16:52 +01:00
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