oysteikt-skolearbeid/IT1901
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Commit Graph

  • 6104f8afc6 Merge branch '62-write-tests-for-flutter' into 'master' master oysteikt 2021-11-28 23:51:02 +01:00
  • a189740afc Merge branch '75-fix-last-merge' into 'master' oysteikt 2021-11-28 23:46:15 +01:00
  • 0b7bd02749 Resolve conflicts oysteikt 2021-11-28 23:41:21 +01:00
  • c26da7665f Merge branch '62-write-tests-for-flutter' into 'master' oysteikt 2021-11-28 23:32:49 +01:00
  • 45972049f9 Squashed commit of the following: oysteikt 2021-11-28 23:28:46 +01:00
  • 291114ba43 Squashed commit of the following: oysteikt 2021-11-28 23:19:40 +01:00
  • 905bcf73ed Merge branch '67-fix-checkstyle-and-pmd' into 'master' Hallvard Henriksen 2021-11-28 21:49:37 +01:00
  • 76612e7d34 Add checkstyle to buildPlugins oysteikt 2021-11-28 21:28:00 +01:00
  • fb4d657c78 Merge branch '73-write-test-for-remote-flutter-and-add-docs' into 'master' Øystein Martinussen 2021-11-28 21:22:58 +01:00
  • 6848341d95 Resolve "Write test for remote flutter and add docs" Hallvard Henriksen 2021-11-28 21:22:58 +01:00
  • ffac9a90d3 Merge branch '67-fix-checkstyle-and-pmd' into 'master' Øystein Martinussen 2021-11-28 20:48:42 +01:00
  • fcacf6089d Resolve "Fix checkstyle and PMD" Hallvard Henriksen 2021-11-28 20:48:42 +01:00
  • bf41dd5920 Merge branch '71-update-userstories' into 'master' Øystein Martinussen 2021-11-28 20:39:32 +01:00
  • fd92ae164c Resolve "Update userstories" Hanne Lindbäck Fyrand 2021-11-28 20:39:32 +01:00
  • 9a65f83a52 Merge branch '70-api-docs' into 'master' oysteikt 2021-11-28 00:27:43 +01:00
  • 7e3524f6e2 Resolve "API docs" Øystein Martinussen 2021-11-28 00:27:43 +01:00
  • ac69e25f71 Merge branch '69-connect-together-websites-and-coverage-reports-for-flashy-and-flashy-client-in-pipeline' into 'master' Øystein Martinussen 2021-11-27 21:38:58 +01:00
  • 249ae06a53 Resolve "Connect together websites and coverage reports for flashy and flashy-client in pipeline" oysteikt 2021-11-27 21:38:58 +01:00
  • 59875c936b Merge branch '72-add-prebuild-steps-to-shell-nix-files' into 'master' Øystein Martinussen 2021-11-27 20:34:56 +01:00
  • 66ac2b3db4 Add prebuild steps oysteikt 2021-11-27 18:23:28 +01:00
  • 24d8e4c9c7 Merge branch '68-update-nix-dependency-hash-for-flashy' into 'master' Hallvard Henriksen 2021-11-27 17:03:23 +01:00
  • 5613179782 Resolve "Update nix dependency hash for Flashy" oysteikt 2021-11-27 17:03:23 +01:00
  • 8ac5e29fd1 Merge branch '64-flutter-in-gitpod' into 'master' Øystein Martinussen 2021-11-27 16:51:52 +01:00
  • 4fd9421283 Resolve "Flutter in gitpod" Hallvard Henriksen 2021-11-27 16:51:52 +01:00
  • 1ab84031d9 Merge branch '66-change-cardcontent-java-and-testapp-java-according-to-feedback2' into 'master' Øystein Martinussen 2021-11-27 16:51:16 +01:00
  • 418e55d91b added waitForFxEvent and changed setLines Hanne Fyrand 2021-11-27 16:44:11 +01:00
  • 740dbaab6b Merge branch '65-write-tests-for-the-api-in-the-javafx-app-flashy' into 'master' Hanne Lindbäck Fyrand 2021-11-27 15:50:07 +01:00
  • c31847691c Resolve "Write tests for the API in the javafx app Flashy" Øystein Martinussen 2021-11-27 15:50:07 +01:00
  • 4234851630 Merge branch '59-building-a-rest-api-that-is-offered-by-a-web-server' into 'master' Hallvard Henriksen 2021-11-25 20:12:19 +01:00
  • e6425ef079 Resolve "Building a REST-API that is offered by a web-server" Øystein Martinussen 2021-11-25 20:12:19 +01:00
  • a0fe55f4c1 Merge branch '62-write-tests-for-flutter' into 'master' Øystein Martinussen 2021-11-25 15:25:22 +01:00
  • 0df442f069 Resolve "Write tests for flutter" Hallvard Henriksen 2021-11-25 15:25:21 +01:00
  • 3884d7e5fa Merge branch '61-building-flashy-in-flutter' into 'master' Øystein Martinussen 2021-11-19 14:00:10 +01:00
  • b6d75dc87b Resolve "Building Flashy in Flutter" Hallvard Henriksen 2021-11-19 14:00:10 +01:00
  • fcf0cd5779 Merge branch '56-fix-checkstyle-erros-for-javafx-application-flashy' into 'master' Hanne Lindbäck Fyrand 2021-11-12 09:08:58 +00:00
  • 0dadf02703 Merge branch '57-add-build-declarations-for-nix' into 'master' oysteikt 2021-11-10 15:33:09 +00:00
  • a21cd45129 Add nix files oysteikt 2021-11-10 16:23:07 +01:00
  • 142c74d92b fixed all checkstyle warnings Øystein Martinussen 2021-11-10 16:10:11 +01:00
  • 22826bdd3b Merge branch '50-last-minute-bug-fix' into 'master' oysteikt 2021-10-22 13:51:11 +00:00
  • a9300155f9 Initialize carddeck before launch oysteikt 2021-10-22 15:50:36 +02:00
  • bda08d156c Merge branch '40-fill-out-previous-methods-classes-and-packages-with-javadocs' into 'master' oysteikt 2021-10-22 13:44:08 +00:00
  • 11e92de3e6 Resolve "Fill out previous methods, classes and packages with Javadocs" oysteikt 2021-10-22 13:44:08 +00:00
  • b92b9f481b Merge branch '49-add-updated-userstory-and-report2' into 'master' Hanne Lindbäck Fyrand 2021-10-22 13:28:36 +00:00
  • c1564031b9 Resolve "Add Updated UserStory and Report2" Øystein Martinussen 2021-10-22 13:28:35 +00:00
  • 58f0b99026 Merge branch '45-add-plantuml-to-readme' into 'master' Øystein Martinussen 2021-10-22 10:40:36 +00:00
  • f7c73e5963 Resolve "Add plantUML to readme" Hallvard Henriksen 2021-10-22 10:40:36 +00:00
  • c832aaba2e Merge branch '47-write-tests-for-ui-java-classes-new' into 'master' Hallvard Henriksen 2021-10-22 10:17:08 +00:00
  • 7a246c9835 Resolve "Write tests for ui java classes NEW" Øystein Martinussen 2021-10-22 10:17:08 +00:00
  • 875c57b635 Merge branch '48-flashcardprovider-not-found' into 'master' Øystein Martinussen 2021-10-20 18:52:29 +00:00
  • 2c5c19bd65 Rename all instances/methods of FlashcardProvider oysteikt 2021-10-20 20:47:58 +02:00
  • 86116cb694 Merge branch '43-write-tests-for-updated-classes-in-core' oysteikt 2021-10-20 20:34:53 +02:00
  • f898931b0b Add tests for CardDeckStorage oysteikt 2021-10-20 20:14:48 +02:00
  • 6800afb4c5 Merge branch '46-split-up-fxml-files-and-add-communications-between-them-maybe-add-design' into 'master' oysteikt 2021-10-20 14:10:54 +00:00
  • fc2bec6025 Resolve "Split up FXML files and add communications between them (maybe add design)" Øystein Martinussen 2021-10-20 14:10:53 +00:00
  • 2a5ab4bc35 Merge branch '41-write-tests-for-cardcontent-carddeck-and-flashcard-java-classes-in-core' into 'master' oysteikt 2021-10-20 12:40:17 +00:00
  • e5dcc8592a Resolve "Write tests for CardContent, CardDeck and Flashcard java classes in core" Øystein Martinussen 2021-10-20 12:40:17 +00:00
  • 4fe00f0d48 Add tests for FlashcardProvider oysteikt 2021-10-14 23:37:13 +02:00
  • f0d59a1c7f Fix module-info locations oysteikt 2021-10-14 23:15:38 +02:00
  • 4894376aab Merge branch '42-store-button-states-in-settings' into 'master' Øystein Martinussen 2021-10-13 10:48:35 +00:00
  • 5e86ead120 Added button preferences oysteikt 2021-10-13 12:40:28 +02:00
  • 08a4f47dd5 Merge branch '38-move-card-choosing-logic-to-a-separate-class-in-core' into 'master' oysteikt 2021-10-13 09:55:55 +00:00
  • 6b793dae06 Merge branch '40-fill-out-previous-methods-classes-and-packages-with-javadocs' into 'master' Hallvard Henriksen 2021-10-07 14:26:45 +00:00
  • 6c4725f74e Resolve "Fill out previous methods, classes and packages with Javadocs" oysteikt 2021-10-07 14:26:44 +00:00
  • 020ee75826 Merge branch '39-inner-run-sh-is-not-executable' into 'master' Øystein Martinussen 2021-10-07 12:13:53 +00:00
  • b485f8fc62 Separated the logic Øystein Martinussen 2021-10-07 14:11:32 +02:00
  • e3a9f9e185 Make run.sh executable oysteikt 2021-10-06 15:24:02 +02:00
  • d79fc0a022 Merge branch '37-change-package-name' into 'master' Øystein Martinussen 2021-10-06 12:55:04 +00:00
  • 381c2bfc1c Co-authored-by: Øystein Martinussen <oystmar@users.noreply.github.com> hallviger 2021-10-06 14:48:42 +02:00
  • 10644e2f6c Merge branch '31-add-story-board' into 'master' oysteikt 2021-10-01 07:54:26 +00:00
  • 1d2d8da7a0 Update user story oysteikt 2021-10-01 09:50:54 +02:00
  • fdd5e850bc Merge branch '29-polishing-the-app-before-delivery' into 'master' Hallvard Henriksen 2021-09-30 16:09:15 +00:00
  • 0610fc6f46 Resolve "Polishing the app before delivery" Øystein Martinussen 2021-09-30 16:09:15 +00:00
  • a19aacb7d9 Merge branch '3-readme' oysteikt 2021-09-30 16:41:40 +02:00
  • b4a0869a59 Revert "Merge branch '3-readme'" oysteikt 2021-09-30 15:51:03 +02:00
  • 8ab4581ca7 Merge branch '3-readme' oysteikt 2021-09-30 15:48:27 +02:00
  • e0e0e529c8 Add updated setup instructions oysteikt 2021-09-30 15:40:47 +02:00
  • 329e81f1ca Add download badge oysteikt 2021-09-30 15:18:58 +02:00
  • abef3ca3d0 Merge branch '26-make-the-program-into-a-runnable-jar-file' into 'master' Øystein Martinussen 2021-09-30 11:57:16 +00:00
  • 7e937de226 Resolve "Make the program into a runnable JAR file" oysteikt 2021-09-30 11:57:16 +00:00
  • c3d8b26332 Merge branch '25-make-app-use-models-as-implementation' into 'master' Hallvard Henriksen 2021-09-29 14:42:48 +00:00
  • 3fc872416f Resolve "Make app use models as implementation" Øystein Martinussen 2021-09-29 14:42:48 +00:00
  • dbb80e98e3 Fix urls oysteikt 2021-09-24 11:57:42 +02:00
  • 93f05a5ee6 Move project README to inner project dir oysteikt 2021-09-24 11:53:31 +02:00
  • 68c8cb7b0f center previews oysteikt 2021-09-24 10:38:36 +02:00
  • 29b5114d23 Fix centering oysteikt 2021-09-24 10:37:16 +02:00
  • d7343ecaa4 Add content oysteikt 2021-09-24 10:35:20 +02:00
  • fe9342e13c added badges Hallvard Henriksen 2021-09-23 15:17:27 +00:00
  • 97cb30d033 added badges Hallvard Henriksen 2021-09-23 15:00:48 +00:00
  • 5eda0b4e46 Make images visible oysteikt 2021-09-23 17:00:11 +02:00
  • 9907443c92 Merge branch '24-the-jacoco-report-shows-0-code-coverage' into 'master' oysteikt 2021-09-23 14:55:28 +00:00
  • 0f1b4406ae Remove the pluginManagement tag from root pom oysteikt 2021-09-23 16:52:05 +02:00
  • 9c10c954b4 update readme Hallvard Henriksen 2021-09-23 13:54:53 +00:00
  • cad4c08bb9 Merge branch '21-design-a-simple-fxml-for-needed-functionality' into 'master' oysteikt 2021-09-23 13:19:03 +00:00
  • 50889d5c31 Resolve "Design a simple FXML for needed functionality" Øystein Martinussen 2021-09-23 13:19:03 +00:00
  • 671be075e7 Merge branch '17-add-model-objects-for-flashcard-data' into 'master' Øystein Martinussen 2021-09-23 12:20:15 +00:00
  • 52efaf20a8 Resolve "Add model objects for flashcard data" oysteikt 2021-09-23 12:20:14 +00:00
  • 42136bcfa0 Merge branch '2-maven' into 'master' Hallvard Henriksen 2021-09-22 09:38:27 +00:00
  • 04c5c70a4a Merge branch '4-gitpod' into 'master' Øystein Martinussen 2021-09-22 09:36:10 +00:00
  • 29ac6d5adc Remove code quality template oysteikt 2021-09-21 15:01:33 +02:00
  • 1036e572db Add alias to service oysteikt 2021-09-20 18:03:39 +02:00