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 |
|
Henry Dugmore
|
b4aa7d72cf
|
Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20
|
2020-05-01 12:50:13 +01:00 |
|
Henry Dugmore
|
3e1050863a
|
Fixed //comments in code to fit SE.QA.09
fixed comment formatting to fit SE.QA.09
|
2020-05-01 12:49:18 +01:00 |
|
osp1
|
41461980f9
|
Updated langSwitch icon to more info
|
2020-05-01 12:35:40 +01:00 |
|
law39
|
e169118c3a
|
Removed depreciated no longer used code from Screen Switch class
Removed depreciated code from Screen Switch class related to the code method of switching scene from the Application Class
|
2020-05-01 12:30:34 +01:00 |
|
law39
|
76fce85de7
|
sceneEnum has been refactored to sceneType. Issue #15
|
2020-05-01 12:28:59 +01:00 |
|
law39
|
4f33ec150e
|
Translation Assessment use 2 textboxes currently broken
|
2020-05-01 12:27:52 +01:00 |
|
law39
|
757b53f756
|
Reverted Match the meaning and Six meanings to two text boxes
Match the meaning and Six meanings now use two textboxes to display running score
|
2020-05-01 12:06:54 +01:00 |
|
osp1
|
5b72ce6c2b
|
Fixed MatchTheMeaning so words don't trail
|
2020-05-01 11:53:15 +01:00 |
|
top19
|
4827e13dfe
|
Update addword controller to include events for the welsh character buttons.
|
2020-05-01 11:50:26 +01:00 |
|
top19
|
3c3db4202b
|
Merge branch 'master' of https://gitlab.dcs.aber.ac.uk/ncw/gp20
|
2020-05-01 11:31:38 +01:00 |
|
top19
|
a8d54c065c
|
Added buttons for welsh characters to addword.fxml
|
2020-05-01 11:31:08 +01:00 |
|
law39
|
67d511f111
|
Updated Assessment Controllers and FXML. Correct issue #31
Correct And Total answers are now displayed, the number and text are now displayed in the same text label to reduce issues with Screen Scaling
|
2020-05-01 11:08:16 +01:00 |
|
law39
|
5686d30859
|
Removed erroneous print of list size from Assessment Generator
|
2020-05-01 11:03:20 +01:00 |
|
top19
|
5138e5d5a7
|
Changed Question to be non case sensitive when comparing answers.
|
2020-05-01 10:47:59 +01:00 |
|
osp1
|
64ae98b86d
|
Fixed scalling with MatchTheMeaning
|
2020-05-01 10:44:22 +01:00 |
|
top19
|
2e942e0619
|
Fixed flashcard text not fitting within the card.
|
2020-05-01 10:32:01 +01:00 |
|
top19
|
00523646d8
|
Changed addwordcontroller to prevent you from adding words that consist of spaces only
|
2020-05-01 10:09:22 +01:00 |
|
top19
|
31936e7ff4
|
Fixed issue where 10 tests werent being generated.
|
2020-05-01 09:56:22 +01:00 |
|
top19
|
2129fc016b
|
Updated addwordcontroller.
|
2020-05-01 09:51:39 +01:00 |
|
top19
|
5dcafb889f
|
Fixed issue where you can add words with empty boxes.
|
2020-05-01 09:50:30 +01:00 |
|
top19
|
ea4dc91914
|
Fixed the issue where you can add the same word twice.
|
2020-05-01 09:36:48 +01:00 |
|
osp1
|
0bcd37a860
|
Removed headers on Dictionary and PracticeList.
|
2020-04-30 22:13:39 +01:00 |
|
maj83
|
277278377f
|
"Fix" with overlapping text
|
2020-04-30 22:09:51 +01:00 |
|
law39
|
acaeac8f86
|
Updated ScreenSwitch
Screen Switch now uses the resources in the new cs221 package
|
2020-04-30 20:43:19 +01:00 |
|
law39
|
67e9ddd0b7
|
Moved resources
Moved resources to the cs221 directory
|
2020-04-30 20:42:34 +01:00 |
|
law39
|
dbf5d74ee8
|
Updated Translation Controller
Translation Controller now uses 3 space tabbing consistently
|
2020-04-30 19:09:42 +01:00 |
|
law39
|
6b5cf0e457
|
Updated ScreenSwitch Class
ScreenSwitch Class now uses 3 space tabbing consistently
|
2020-04-30 19:07:14 +01:00 |
|
law39
|
4198844932
|
Six meanings fxml updated
Six meanings fxml now references the refactored Controller name
|
2020-04-30 19:00:27 +01:00 |
|