Commit graph

498 commits

Author SHA1 Message Date
law39
0dd12a9192 Fixed QuestionTest and changed Copyright notice @ AssessmentGenTest 2020-05-01 15:57:01 +01:00
osp1
1f425811ae Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-05-01 15:55:10 +01:00
osp1
a14d871055 Fixed fxml files 2020-05-01 15:54:51 +01:00
law39
06b1029829 Made resetScore in Question Public 2020-05-01 15:51:00 +01:00
law39
e8b9b465b1 Corrected copyright notices. Issue #55 2020-05-01 15:48:42 +01:00
osp1
6e2db7e1dc Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-05-01 15:45:17 +01:00
osp1
0cdd059698 JavaDoc for AssessmentGenerator
- Issue #42
2020-05-01 15:44:15 +01:00
law39
08a084c773 Merge remote-tracking branch 'origin/master' 2020-05-01 15:40:54 +01:00
law39
9b045a92f1 Corrected copyright notice in SharedCodeController 2020-05-01 15:40:44 +01:00
top19
e49f675bd3 Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-05-01 15:38:53 +01:00
top19
ed3360b9d2 Updated documentation for SixMeaningsController.java.
Addressed issue #50
2020-05-01 15:38:16 +01:00
law39
b4db0f49cc Merge remote-tracking branch 'origin/master' 2020-05-01 15:38:05 +01:00
law39
bb42bdb947 Translation question now checks if an answer is entered 2020-05-01 15:37:56 +01:00
osp1
738f7ed663 DictionaryEntryTest fixed indentation and date
- Issue #43
2020-05-01 15:35:01 +01:00
law39
1baeecb7fd Update copyright notice to today's date @ all 2020-05-01 15:32:36 +01:00
osp1
fb394cc8af DictionaryEntryTest fixed author and header
- Issue #43
2020-05-01 15:32:30 +01:00
law39
e53b0a4687 Added copyright notice @ TranslationQuestion 2020-05-01 15:29:34 +01:00
law39
852cf326ae Added copyright notice @ SixMeaningsQuestion 2020-05-01 15:28:41 +01:00
law39
8210e2e824 Merge remote-tracking branch 'origin/master' 2020-05-01 15:27:31 +01:00
osp1
f0327fbbfc Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20 2020-05-01 15:27:26 +01:00
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