Code

Merge into multiplayer branch#216

Code

Merged

Pelayori merged 64 commits intomultiplayer-bugs-fixingArquisoft/wiq_es04b:multiplayer-bugs-fixingfrom developArquisoft/wiq_es04b:developCopy head branch name to clipboardApr 26, 2024

+1,540-648

Commits

Commits on Apr 6, 2024

• New geography question template: Area

  RicardoDiNu

  committed
  f483f14

  Copy full SHA for f483f14

• New geography question template: Currency

  RicardoDiNu

  committed
  9f26f04

  Copy full SHA for 9f26f04

• New geography question template: Population

  RicardoDiNu

  committed
  6d1b749

  Copy full SHA for 6d1b749

• New geography question category: History

  RicardoDiNu

  committed
  8983649

  Copy full SHA for 8983649

• Revert "New geography question category: History"

  Show description for 3f41285
  RicardoDiNu

  committed
  3f41285

  Copy full SHA for 3f41285

• New history question template: Artifact

  RicardoDiNu

  committed
  2888e2d

  Copy full SHA for 2888e2d

• New history question template: Battle

  RicardoDiNu

  committed
  6d67b5e

  Copy full SHA for 6d67b5e

• New history question template: Dynasty

  RicardoDiNu

  committed
  760b15a

  Copy full SHA for 760b15a

• New history question template: Event

  RicardoDiNu

  committed
  53c1dff

  Copy full SHA for 53c1dff

• New history question template: Invention

  RicardoDiNu

  committed
  d559d2a

  Copy full SHA for d559d2a

• New history question template: Leader

  RicardoDiNu

  committed
  277b862

  Copy full SHA for 277b862

• New history question template: Period

  RicardoDiNu

  committed
  983432a

  Copy full SHA for 983432a

• InsertSampleDataService updated with new question templates

  RicardoDiNu

  committed
  4ccf348

  Copy full SHA for 4ccf348

• Fix - Add new question category: History

  RicardoDiNu

  committed
  5b978a5

  Copy full SHA for 5b978a5

• Add new question category and templates: Science

  RicardoDiNu

  committed
  79cbfb5

  Copy full SHA for 79cbfb5

• Add new question category and templates: Art

  RicardoDiNu

  committed
  8fe0cac

  Copy full SHA for 8fe0cac

• Fix generators

  RicardoDiNu

  committed
  41b2333

  Copy full SHA for 41b2333

• Add new question category and templates: Movie

  RicardoDiNu

  committed
  61ec4bf

  Copy full SHA for 61ec4bf

• Update InsertSampleDataService with the new templates

  RicardoDiNu

  committed
  f7080ce

  Copy full SHA for f7080ce

Commits on Apr 15, 2024

• Undo CategoryServiceImpl and InsertSampleDataService changes to only add the new generators classes and don't affect the current code

  RicardoDiNu

  committed
  5aaa8db

  Copy full SHA for 5aaa8db

Commits on Apr 24, 2024

• Remove old commented code

  Pelayori

  committed
  e603718

  Copy full SHA for e603718

• First version of the base JSON done

  uo287545

  committed
  1688771

  Copy full SHA for 1688771

• Added statements for the capital question

  uo287545

  committed
  48fe605

  Copy full SHA for 48fe605

• Add table and dropdown to user management

  Pelayori

  committed
  0c7930b

  Copy full SHA for 0c7930b

• Added currency question

  uo287545

  committed
  f8374a8

  Copy full SHA for f8374a8

Commits on Apr 25, 2024

• Initial implementation of the new question generator

  uo287545

  committed
  11f09d3

  Copy full SHA for 11f09d3

• First part of the request system

  uo287545

  committed
  e5a6f37

  Copy full SHA for e5a6f37

• Added question and answer placeholders to the JSON

  uo287545

  committed
  8a8ef29

  Copy full SHA for 8a8ef29

• Added statement generation based on language

  uo287545

  committed
  e319116

  Copy full SHA for e319116

• First version of the question generator finished

  uo287545

  committed
  28e1068

  Copy full SHA for 28e1068

• Added name only constructor for category

  uo287545

  committed
  b812a5f

  Copy full SHA for b812a5f

• Removed old templates

  uo287545

  committed
  a079a21

  Copy full SHA for a079a21

• Test controller and temporary comments on some classes that used the old question generation system

  uo287545

  committed
  4ac734a

  Copy full SHA for 4ac734a

• New question generator tested and working

  uo287545

  committed
  bd06490

  Copy full SHA for bd06490

• Removed unused method from the question generator interface

  uo287545

  committed
  3f4c703

  Copy full SHA for 3f4c703

• Added new question and improved the queries

  uo287545

  committed
  d0c2200

  Copy full SHA for d0c2200

• Added the fourth question

  uo287545

  committed
  51f41d8

  Copy full SHA for 51f41d8

• Started implementation of the QuestionGeneratorService with scheduling for the question generation

  uo287545

  committed
  7a27e6e

  Copy full SHA for 7a27e6e

• Added stack to store all the different types of questions along with their category

  uo287545

  committed
  d829ec9

  Copy full SHA for d829ec9

• Deleted deprecated class

  uo287545

  committed
  7865da5

  Copy full SHA for 7865da5

• Scheduled question generation working

  uo287545

  committed
  9659f1b

  Copy full SHA for 9659f1b

• Fixed correct question not being associated with the question

  uo287545

  committed
  e848907

  Copy full SHA for e848907

• Fixed SampleDataService and tests

  uo287545

  committed
  5346fe0

  Copy full SHA for 5346fe0

• Merge branch 'develop' into add-question-templates

  Show description for fb1d726
  uo287545

  committed
  fb1d726

  Copy full SHA for fb1d726

• Fixed unit tests

  uo287545

  committed
  047bf0f

  Copy full SHA for 047bf0f

• All tests working

  uo287545

  committed
  8f4f72d

  Copy full SHA for 8f4f72d

• Removed unused code

  uo287545

  committed
  62f5618

  Copy full SHA for 62f5618

Commits on Apr 26, 2024

• Trying to fix the game controller test

  uo287545

  committed
  a49cc53

  Copy full SHA for a49cc53

• Finish user management

  Pelayori

  committed
  ee0ae97

  Copy full SHA for ee0ae97

• Start adding question management

  Pelayori

  committed
  afa0bbe

  Copy full SHA for afa0bbe

• Merge branch 'add-question-templates' into admin-view

  Show description for 8c1a4ae
  Pelayori

  committed
  8c1a4ae

  Copy full SHA for 8c1a4ae

• Question management mostly done

  Pelayori

  committed
  2776571

  Copy full SHA for 2776571

• Modify so question generation starts over with new JSON

  Pelayori

  committed
  89a6352

  Copy full SHA for 89a6352

• Fix sticky footer

  Pelayori

  committed
  da799e9

  Copy full SHA for da799e9

• Fix code hotspot

  Pelayori

  committed
  ddf24c3

  Copy full SHA for ddf24c3

• Fix nav

  Pelayori

  committed
  78cde1b

  Copy full SHA for 78cde1b

• Fix nav in small widths

  Pelayori

  committed
  6dbbd28

  Copy full SHA for 6dbbd28

• Added new scheduled method to regenerate the questions each 24 hours

  uo287545

  committed
  33fdce6

  Copy full SHA for 33fdce6

• User management integration tests

  Pelayori

  committed
  3725378

  Copy full SHA for 3725378

• Question management integration tests

  Pelayori

  committed
  6b8b6dc

  Copy full SHA for 6b8b6dc

• Merge pull request #210 from Arquisoft/add-question-templates

  Show description for eec984f
  Pelayori

  authored
  eec984f

  Copy full SHA for eec984f

• Merge branch 'develop' into admin-view

  Pelayori

  authored
  35ecb0f

  Copy full SHA for 35ecb0f

• Merge pull request #211 from Arquisoft/admin-view

  Show description for 8d6c06e
  Pelayori

  authored
  8d6c06e

  Copy full SHA for 8d6c06e

• Fix sonarcloud issues

  Pelayori

  committed
  88ccb95

  Copy full SHA for 88ccb95