oysteikt-skolearbeid/IT1901
0
0
Fork 0
Code Issues Pull Requests Releases Activity
115 Commits 1 Branch 0 Tags
fcf0cd577950ee1268f900b1def90e722b2eebc3
Commit Graph

115 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hanne Lindbäck Fyrand fcf0cd5779 Merge branch '56-fix-checkstyle-erros-for-javafx-application-flashy' into 'master' 
Resolve "Fix checkstyle erros for JavaFX application Flashy"

Closes #56

See merge request it1901/groups-2021/gr2141/gr2141!40
 2021-11-12 09:08:58 +00:00
oysteikt 0dadf02703 Merge branch '57-add-build-declarations-for-nix' into 'master' 
Resolve "Add build declarations for Nix"

Closes #57

See merge request it1901/groups-2021/gr2141/gr2141!41
 2021-11-10 15:33:09 +00:00
oysteikt a21cd45129 Add nix files 2021-11-10 16:23:07 +01:00
Øystein Martinussen 142c74d92b fixed all checkstyle warnings 2021-11-10 16:10:11 +01:00
oysteikt 22826bdd3b Merge branch '50-last-minute-bug-fix' into 'master' 
Resolve "Last minute bug fix"

Closes #50

See merge request it1901/groups-2021/gr2141/gr2141!39
 2021-10-22 13:51:11 +00:00
oysteikt a9300155f9 Initialize carddeck before launch 2021-10-22 15:50:36 +02:00
oysteikt bda08d156c Merge branch '40-fill-out-previous-methods-classes-and-packages-with-javadocs' into 'master' 
Resolve "Fill out previous methods, classes and packages with Javadocs"

Closes #40

See merge request it1901/groups-2021/gr2141/gr2141!37
 2021-10-22 13:44:08 +00:00
oysteikt 11e92de3e6 Resolve "Fill out previous methods, classes and packages with Javadocs" 2021-10-22 13:44:08 +00:00
Hanne Lindbäck Fyrand b92b9f481b Merge branch '49-add-updated-userstory-and-report2' into 'master' 
Resolve "Add Updated UserStory and Report2"

Closes #49

See merge request it1901/groups-2021/gr2141/gr2141!38
 2021-10-22 13:28:36 +00:00
Øystein Martinussen c1564031b9 Resolve "Add Updated UserStory and Report2" 2021-10-22 13:28:35 +00:00
Øystein Martinussen 58f0b99026 Merge branch '45-add-plantuml-to-readme' into 'master' 
Resolve "Add plantUML to readme"

Closes #45

See merge request it1901/groups-2021/gr2141/gr2141!33
 2021-10-22 10:40:36 +00:00
Hallvard Henriksen f7c73e5963 Resolve "Add plantUML to readme" 2021-10-22 10:40:36 +00:00
Hallvard Henriksen c832aaba2e Merge branch '47-write-tests-for-ui-java-classes-new' into 'master' 
Resolve "Write tests for ui java classes NEW"

Closes #47

See merge request it1901/groups-2021/gr2141/gr2141!35
 2021-10-22 10:17:08 +00:00
Øystein Martinussen 7a246c9835 Resolve "Write tests for ui java classes NEW" 2021-10-22 10:17:08 +00:00
Øystein Martinussen 875c57b635 Merge branch '48-flashcardprovider-not-found' into 'master' 
Resolve "FlashcardProvider not found"

Closes #48

See merge request it1901/groups-2021/gr2141/gr2141!36
 2021-10-20 18:52:29 +00:00
oysteikt 2c5c19bd65 Rename all instances/methods of FlashcardProvider 2021-10-20 20:47:58 +02:00
oysteikt 86116cb694 Merge branch '43-write-tests-for-updated-classes-in-core' 2021-10-20 20:34:53 +02:00
oysteikt f898931b0b Add tests for CardDeckStorage 2021-10-20 20:14:48 +02:00
oysteikt 6800afb4c5 Merge branch '46-split-up-fxml-files-and-add-communications-between-them-maybe-add-design' into 'master' 
Resolve "Split up FXML files and add communications between them (maybe add design)"

Closes #46

See merge request it1901/groups-2021/gr2141/gr2141!34
 2021-10-20 14:10:54 +00:00
Øystein Martinussen fc2bec6025 Resolve "Split up FXML files and add communications between them (maybe add design)" 2021-10-20 14:10:53 +00:00
oysteikt 2a5ab4bc35 Merge branch '41-write-tests-for-cardcontent-carddeck-and-flashcard-java-classes-in-core' into 'master' 
Resolve "Write tests for CardContent, CardDeck and Flashcard java classes in core"

Closes #41

See merge request it1901/groups-2021/gr2141/gr2141!28
 2021-10-20 12:40:17 +00:00
Øystein Martinussen e5dcc8592a Resolve "Write tests for CardContent, CardDeck and Flashcard java classes in core" 2021-10-20 12:40:17 +00:00
oysteikt 4fe00f0d48 Add tests for FlashcardProvider 2021-10-14 23:37:13 +02:00
oysteikt f0d59a1c7f Fix module-info locations 2021-10-14 23:15:38 +02:00
Øystein Martinussen 4894376aab Merge branch '42-store-button-states-in-settings' into 'master' 
Resolve "Store button states in settings"

Closes #42

See merge request it1901/groups-2021/gr2141/gr2141!29
 2021-10-13 10:48:35 +00:00
oysteikt 5e86ead120 Added button preferences 
Co-authored-by: hanne <hannelf@users.noreply.github.com>
 2021-10-13 12:40:28 +02:00
oysteikt 08a4f47dd5 Merge branch '38-move-card-choosing-logic-to-a-separate-class-in-core' into 'master' 
Resolve "Move card-choosing logic to a separate class in core"

Closes #38

See merge request it1901/groups-2021/gr2141/gr2141!25
 2021-10-13 09:55:55 +00:00
Hallvard Henriksen 6b793dae06 Merge branch '40-fill-out-previous-methods-classes-and-packages-with-javadocs' into 'master' 
Resolve "Fill out previous methods, classes and packages with Javadocs"

Closes #40

See merge request it1901/groups-2021/gr2141/gr2141!27
 2021-10-07 14:26:45 +00:00
oysteikt 6c4725f74e Resolve "Fill out previous methods, classes and packages with Javadocs" 2021-10-07 14:26:44 +00:00
Øystein Martinussen 020ee75826 Merge branch '39-inner-run-sh-is-not-executable' into 'master' 
Resolve "Inner run.sh is not executable"

Closes #39

See merge request it1901/groups-2021/gr2141/gr2141!26
 2021-10-07 12:13:53 +00:00
Øystein Martinussen b485f8fc62 Separated the logic 2021-10-07 14:11:32 +02:00
oysteikt e3a9f9e185 Make run.sh executable 2021-10-06 15:24:02 +02:00
Øystein Martinussen d79fc0a022 Merge branch '37-change-package-name' into 'master' 
Resolve "Change package name"

Closes #37

See merge request it1901/groups-2021/gr2141/gr2141!24
 2021-10-06 12:55:04 +00:00
hallviger 381c2bfc1c Co-authored-by: Øystein Martinussen <oystmar@users.noreply.github.com> 2021-10-06 14:48:42 +02:00
oysteikt 10644e2f6c Merge branch '31-add-story-board' into 'master' 
Resolve "Add story board"

Closes #31

See merge request it1901/groups-2021/gr2141/gr2141!23
 2021-10-01 07:54:26 +00:00
oysteikt 1d2d8da7a0 Update user story 2021-10-01 09:50:54 +02:00
Hallvard Henriksen fdd5e850bc Merge branch '29-polishing-the-app-before-delivery' into 'master' 
Resolve "Polishing the app before delivery"

Closes #29

See merge request it1901/groups-2021/gr2141/gr2141!21
 2021-09-30 16:09:15 +00:00
Øystein Martinussen 0610fc6f46 Resolve "Polishing the app before delivery" 2021-09-30 16:09:15 +00:00
oysteikt a19aacb7d9 Merge branch '3-readme' 2021-09-30 16:41:40 +02:00
oysteikt b4a0869a59 Revert "Merge branch '3-readme'" 
This reverts commit 8ab4581ca7.
 2021-09-30 15:51:03 +02:00
oysteikt 8ab4581ca7 Merge branch '3-readme' 2021-09-30 15:48:27 +02:00
oysteikt e0e0e529c8 Add updated setup instructions 2021-09-30 15:40:47 +02:00
oysteikt 329e81f1ca Add download badge 2021-09-30 15:18:58 +02:00
Øystein Martinussen abef3ca3d0 Merge branch '26-make-the-program-into-a-runnable-jar-file' into 'master' 
Resolve "Make the program into a runnable JAR file"

Closes #26

See merge request it1901/groups-2021/gr2141/gr2141!20
 2021-09-30 11:57:16 +00:00
oysteikt 7e937de226 Resolve "Make the program into a runnable JAR file" 2021-09-30 11:57:16 +00:00
Hallvard Henriksen c3d8b26332 Merge branch '25-make-app-use-models-as-implementation' into 'master' 
Resolve "Make app use models as implementation"

Closes #25

See merge request it1901/groups-2021/gr2141/gr2141!18
 2021-09-29 14:42:48 +00:00
Øystein Martinussen 3fc872416f Resolve "Make app use models as implementation" 2021-09-29 14:42:48 +00:00
oysteikt dbb80e98e3 Fix urls 2021-09-24 12:00:42 +02:00
oysteikt 93f05a5ee6 Move project README to inner project dir 2021-09-24 11:53:31 +02:00
oysteikt 68c8cb7b0f center previews 2021-09-24 10:38:36 +02:00