1. 28 Apr, 2022 8 commits
  2. 27 Apr, 2022 3 commits
  3. 26 Apr, 2022 5 commits
  4. 25 Apr, 2022 3 commits
  5. 24 Apr, 2022 5 commits
  6. 23 Apr, 2022 7 commits
  7. 22 Apr, 2022 9 commits
    • Eirik Elvestad's avatar
      baf849cc
    • Eirik Elvestad's avatar
    • Eirik Elvestad's avatar
      refactor: rearrange buttons · aa70e490
      Eirik Elvestad authored
      aa70e490
    • Leon Hesthaug's avatar
      Update .gitlab-ci.yml file · deb7723e
      Leon Hesthaug authored
      deb7723e
    • Leon Hesthaug's avatar
      Merge branch 'final-prod' into 'master' · 68b53d33
      Leon Hesthaug authored
      merge: final-prod into master
      
      See merge request !16
      68b53d33
    • Leonhest's avatar
      docs: generate javadoc · 4e508569
      Leonhest authored
      4e508569
    • Trym Gudvangen's avatar
      Merge remote-tracking branch 'origin/master' into final-prod · 7c026b90
      Trym Gudvangen authored
      # Conflicts:
      #	.gitlab-ci.yml
      #	.idea/compiler.xml
      #	.idea/encodings.xml
      #	.idea/misc.xml
      #	.idea/modules.xml
      #	finalprod/.gitignore
      #	finalprod/lib/hamcrest-core-1.3.jar
      #	finalprod/lib/junit-4.12.jar
      #	finalprod/pom.xml
      #	finalprod/src/main/java/edu/ntnu/idatt1002/g106/handballapp/finalprod/backend/Administrator.java
      #	finalprod/src/main/java/edu/ntnu/idatt1002/g106/handballapp/finalprod/backend/Match.java
      #	finalprod/src/main/java/edu/ntnu/idatt1002/g106/handballapp/finalprod/backend/Results.java
      #	finalprod/src/main/java/edu/ntnu/idatt1002/g106/handballapp/finalprod/backend/Team.java
      #	finalprod/src/main/java/edu/ntnu/idatt1002/g106/handballapp/finalprod/backend/TeamRegister.java
      #	finalprod/src/main/java/edu/ntnu/idatt1002/g106/handballapp/finalprod/backend/TournamentRegister.java
      #	finalprod/src/main/java/edu/ntnu/idatt1002/g106/handballapp/finalprod/backend/User.java
      #	finalprod/src/main/java/edu/ntnu/idatt1002/g106/handballapp/finalprod/controller/App.java
      #	finalprod/src/main/java/edu/ntnu/idatt1002/g106/handballapp/finalprod/controller/SetUpMatchesController.java
      #	finalprod/src/main/java/edu/ntnu/idatt1002/g106/handballapp/finalprod/controller/TeamRegisterController.java
      #	finalprod/src/main/resources/edu/ntnu/idatt1002/g106/handballapp/finalprod/TournamentPictures/Asker_komm_nytt_våpen.png
      #	finalprod/src/main/resources/edu/ntnu/idatt1002/g106/handballapp/finalprod/TournamentPictures/Stavanger_komm.svg.png
      #	finalprod/src/main/resources/edu/ntnu/idatt1002/g106/handballapp/finalprod/TournamentPictures/TableOfMatches.png
      #	finalprod/src/main/resources/edu/ntnu/idatt1002/g106/handballapp/finalprod/TournamentPictures/oslobyvapen.png
      #	finalprod/src/main/resources/edu/ntnu/idatt1002/g106/handballapp/finalprod/TournamentPictures/standard_trondheim.png
      #	finalprod/src/test/java/edu/ntnu/idatt1002/g106/handballapp/finalprod/backend/AdministratorTest.java
      #	finalprod/src/test/java/edu/ntnu/idatt1002/g106/handballapp/finalprod/backend/MatchTest.java
      #	finalprod/src/test/java/edu/ntnu/idatt1002/g106/handballapp/finalprod/backend/ResultsTest.java
      #	finalprod/src/test/java/edu/ntnu/idatt1002/g106/handballapp/finalprod/backend/TeamRegisterTest.java
      #	finalprod/src/test/java/edu/ntnu/idatt1002/g106/handballapp/finalprod/backend/TeamTest.java
      #	finalprod/src/test/java/edu/ntnu/idatt1002/g106/handballapp/finalprod/backend/TournamentRegisterTest.java
      #	finalprod/src/test/java/edu/ntnu/idatt1002/g106/handballapp/finalprod/backend/TournamentTest.java
      #	finalprod/src/test/java/edu/ntnu/idatt1002/g106/handballapp/finalprod/backend/UserTest.java
      #	finalprod/src/test/java/edu/ntnu/idatt1002/g106/handballapp/finalprod/controller/SetUpMatchesControllerTest.java
      7c026b90
    • Leon Hesthaug's avatar
      Deleted mvp/.idea/codeStyles/Project.xml,... · 77e2275d
      Leon Hesthaug authored
      Deleted mvp/.idea/codeStyles/Project.xml, mvp/.idea/codeStyles/codeStyleConfig.xml, mvp/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml, mvp/.idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml, mvp/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml, mvp/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml, mvp/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_1.xml, mvp/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml, mvp/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml, mvp/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml, mvp/.idea/libraries/lib.xml, mvp/.idea/.gitignore, mvp/.idea/compiler.xml, mvp/.idea/encodings.xml, mvp/.idea/jarRepositories.xml, mvp/.idea/misc.xml, mvp/.idea/modules.xml, mvp/.idea/vcs.xml, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/class-use/Administrator.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/class-use/AlertBox.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/class-use/Match.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/class-use/Results.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/class-use/SwitchScene.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/class-use/Team.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/class-use/TeamRegister.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/class-use/Tournament.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/class-use/TournamentRegister.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/class-use/User.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/Administrator.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/AlertBox.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/Match.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/Results.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/SwitchScene.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/Team.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/TeamRegister.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/Tournament.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/TournamentRegister.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/User.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/package-summary.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/package-tree.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/package-use.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/class-use/App.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/class-use/CupListController.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/class-use/FrontPageController.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/class-use/HandballApplication.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/class-use/MainPageController.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/class-use/RegisterResultController.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/class-use/SetUpMatchesController.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/class-use/SetUpTournamentController.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/App.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/CupListController.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/FrontPageController.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/HandballApplication.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/MainPageController.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/RegisterResultController.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/SetUpMatchesController.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/SetUpTournamentController.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/package-summary.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/package-tree.html, mvp/javadoc/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/package-use.html, mvp/javadoc/legal/ADDITIONAL_LICENSE_INFO, mvp/javadoc/legal/ASSEMBLY_EXCEPTION, mvp/javadoc/legal/LICENSE, mvp/javadoc/legal/jquery.md, mvp/javadoc/legal/jqueryUI.md, mvp/javadoc/resources/glass.png, mvp/javadoc/resources/x.png, mvp/javadoc/script-dir/images/ui-bg_glass_55_fbf9ee_1x400.png, mvp/javadoc/script-dir/images/ui-bg_glass_65_dadada_1x400.png, mvp/javadoc/script-dir/images/ui-bg_glass_75_dadada_1x400.png, mvp/javadoc/script-dir/images/ui-bg_glass_75_e6e6e6_1x400.png, mvp/javadoc/script-dir/images/ui-bg_glass_95_fef1ec_1x400.png, mvp/javadoc/script-dir/images/ui-bg_highlight-soft_75_cccccc_1x100.png, mvp/javadoc/script-dir/images/ui-icons_222222_256x240.png, mvp/javadoc/script-dir/images/ui-icons_2e83ff_256x240.png, mvp/javadoc/script-dir/images/ui-icons_454545_256x240.png, mvp/javadoc/script-dir/images/ui-icons_888888_256x240.png, mvp/javadoc/script-dir/images/ui-icons_cd0a0a_256x240.png, mvp/javadoc/script-dir/jquery-3.5.1.min.js, mvp/javadoc/script-dir/jquery-ui.min.css, mvp/javadoc/script-dir/jquery-ui.min.js, mvp/javadoc/script-dir/jquery-ui.structure.min.css, mvp/javadoc/allclasses-index.html, mvp/javadoc/allpackages-index.html, mvp/javadoc/element-list, mvp/javadoc/index-all.html, mvp/javadoc/index.html, mvp/javadoc/javadoc.sh, mvp/javadoc/jquery-ui.overrides.css, mvp/javadoc/member-search-index.js, mvp/javadoc/module-search-index.js, mvp/javadoc/options, mvp/javadoc/overview-summary.html, mvp/javadoc/overview-tree.html, mvp/javadoc/package-search-index.js, mvp/javadoc/packages, mvp/javadoc/script.js, mvp/javadoc/search.js, mvp/javadoc/stylesheet.css, mvp/javadoc/tag-search-index.js, mvp/javadoc/type-search-index.js, mvp/lib/hamcrest-core-1.3.jar, mvp/lib/junit-4.12.jar, mvp/src/main/java/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/Administrator.java, mvp/src/main/java/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/AlertBox.java, mvp/src/main/java/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/Match.java, mvp/src/main/java/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/Results.java, mvp/src/main/java/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/SwitchScene.java, mvp/src/main/java/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/Team.java, mvp/src/main/java/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/TeamRegister.java, mvp/src/main/java/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/Tournament.java, mvp/src/main/java/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/TournamentRegister.java, mvp/src/main/java/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/User.java, mvp/src/main/java/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/App.java, mvp/src/main/java/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/CupListController.java, mvp/src/main/java/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/FrontPageController.java, mvp/src/main/java/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/HandballApplication.java, mvp/src/main/java/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/MainPageController.java, mvp/src/main/java/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/RegisterResultController.java, mvp/src/main/java/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/SetUpMatchesController.java, mvp/src/main/java/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/SetUpTournamentController.java, mvp/src/main/java/.gitkeep, mvp/src/main/resources/TournamentPictures/Asker_komm_nytt_våpen.png, mvp/src/main/resources/TournamentPictures/Stavanger_komm.svg.png, mvp/src/main/resources/TournamentPictures/TableOfMatches.png, mvp/src/main/resources/TournamentPictures/oslobyvapen.png, mvp/src/main/resources/TournamentPictures/standard_trondheim.png, mvp/src/main/resources/edu/ntnu/idatt1002/g106/handballapp/mvp/view/CupList.fxml, mvp/src/main/resources/edu/ntnu/idatt1002/g106/handballapp/mvp/view/FrontPage.fxml, mvp/src/main/resources/edu/ntnu/idatt1002/g106/handballapp/mvp/view/MainPage.fxml, mvp/src/main/resources/edu/ntnu/idatt1002/g106/handballapp/mvp/view/RegisterResult.fxml, mvp/src/main/resources/edu/ntnu/idatt1002/g106/handballapp/mvp/view/SetUpMatches.fxml, mvp/src/main/resources/edu/ntnu/idatt1002/g106/handballapp/mvp/view/SetUpTournament.fxml, mvp/src/test/java/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/AdministratorTest.java, mvp/src/test/java/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/MatchTest.java, mvp/src/test/java/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/ResultsTest.java, mvp/src/test/java/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/TeamRegisterTest.java, mvp/src/test/java/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/TeamTest.java, mvp/src/test/java/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/TournamentRegisterTest.java, mvp/src/test/java/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/TournamentTest.java, mvp/src/test/java/edu/ntnu/idatt1002/g106/handballapp/mvp/backend/UserTest.java, mvp/src/test/java/edu/ntnu/idatt1002/g106/handballapp/mvp/controller/SetUpMatchesControllerTest.java, mvp/.gitignore, mvp/.gitkeep, mvp/handballapp-mvp.iml, mvp/pom.xml, .idea/codeStyles/Project.xml, .idea/codeStyles/codeStyleConfig.xml, .idea/libraries/Maven__commons_codec_commons_codec_1_11.xml, .idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml, .idea/libraries/Maven__org_hamcrest_hamcrest_2_2.xml, .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml, .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml, .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_1.xml, .idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml, .idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml, .idea/libraries/Maven__org_openjfx_javafx_base_17_0_2.xml, .idea/libraries/Maven__org_openjfx_javafx_base_mac_aarch64_17_0_2.xml, .idea/libraries/Maven__org_openjfx_javafx_controls_17_0_2.xml, .idea/libraries/Maven__org_openjfx_javafx_controls_mac_aarch64_17_0_2.xml, .idea/libraries/Maven__org_openjfx_javafx_fxml_17_0_2.xml, .idea/libraries/Maven__org_openjfx_javafx_fxml_mac_aarch64_17_0_2.xml, .idea/libraries/Maven__org_openjfx_javafx_graphics_17_0_2.xml, .idea/libraries/Maven__org_openjfx_javafx_graphics_mac_aarch64_17_0_2.xml, .idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml, .idea/.gitignore, .idea/compiler.xml, .idea/encodings.xml, .idea/idatt-1002-2022-1-06.iml, .idea/jarRepositories.xml, .idea/misc.xml, .idea/modules.xml, .idea/uiDesigner.xml, .idea/vcs.xml, .DS_Store, .gitlab-ci.yml
      77e2275d
    • Leonhest's avatar
      fix: wrong merge method chosen · 672c4a46
      Leonhest authored
      672c4a46