Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Discarded by Alberto #155

Closed
wants to merge 73 commits into from
Closed

Discarded by Alberto #155

wants to merge 73 commits into from

Commits on Mar 12, 2024

  1. Merge pull request #133 from Arquisoft/master 

    Merging master into develop to start deliverable 3.
    @alagoconde
    alagoconde authored Mar 12, 2024
    Configuration menu
    Copy the full SHA
    faf62ef View commit details
    Browse the repository at this point in the history

  2. Updating the README to match actual services

    @alagoconde
    alagoconde committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    eabf5c1 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2024

  1. Corrected the logout system and the responsive navbar.

    @alagoconde
    alagoconde committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    6d4eecb View commit details
    Browse the repository at this point in the history

  2. Corrected the user validation systems.

    @alagoconde
    alagoconde committed Mar 16, 2024
    Configuration menu
    Copy the full SHA
    a261ee9 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Added statistics model

    @uo289689
    uo289689 committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    9f37274 View commit details
    Browse the repository at this point in the history

  2. Added route for statistics

    @uo289689
    uo289689 committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    94ae87c View commit details
    Browse the repository at this point in the history

  3. Added API for statistics

    @uo289689
    uo289689 committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    0ff2eb0 View commit details
    Browse the repository at this point in the history

  4. Updated game to adapt it to a user statistics table

    @uo289689
    uo289689 committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    bd73323 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. Merge branch 'develop_samuel' into develop

    @uo289689
    uo289689 committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    9529fd0 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. Corrected register test in webapp

    @uo288543
    uo288543 committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    10f4c18 View commit details
    Browse the repository at this point in the history

  2. Actualizacion del enviroment y dependencias

    @uo288543
    uo288543 committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    5b6e18b View commit details
    Browse the repository at this point in the history

  3. Fixed errors

    @uo288543
    uo288543 committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    9603bfd View commit details
    Browse the repository at this point in the history

  4. Un successfull changes in enviroment

    @uo288543
    uo288543 committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    580ecb9 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. Reordered docker containers creation

    @uo288347
    uo288347 committed Mar 22, 2024
    Configuration menu
    Copy the full SHA
    be5876c View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2024

  1. Comment enviroment

    @uo288543
    uo288543 committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    6f07684 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into develop-hugo

    @uo288543
    uo288543 committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    b6bd984 View commit details
    Browse the repository at this point in the history

  3. Resolve README conflicts

    @uo288543
    uo288543 committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    c187cea View commit details
    Browse the repository at this point in the history

  4. Added countdown timer

    @uo288543
    uo288543 committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    cc12b85 View commit details
    Browse the repository at this point in the history

  5. Timer now resets correctly

    @uo288543
    uo288543 committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    9d1e888 View commit details
    Browse the repository at this point in the history

  6. Stopping countdown when required

    @uo288543
    uo288543 committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    8d12556 View commit details
    Browse the repository at this point in the history

  7. User fails answer if time ends

    @uo288543
    uo288543 committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    25d3b40 View commit details
    Browse the repository at this point in the history

  8. Minor fixes

    @uo288543
    uo288543 committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    a06c7fd View commit details
    Browse the repository at this point in the history

  9. Added historial progress bar

    @uo288543
    uo288543 committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    30dbb9c View commit details
    Browse the repository at this point in the history

  10. Incorporated a link in the footer

    @alagoconde
    alagoconde committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    13ea445 View commit details
    Browse the repository at this point in the history

  11. IMPORTANT FIX!!

    @alagoconde
    alagoconde committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    6db493e View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2024

  1. Advanced in group joining functionality.

    @alagoconde
    alagoconde committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    3ee85c1 View commit details
    Browse the repository at this point in the history

  2. Added confetti when game is won

    @uo288347
    uo288347 committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    2f17b4f View commit details
    Browse the repository at this point in the history

  3. Merge with hugo's branch

    @uo288347
    uo288347 committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    f9ffa9c View commit details
    Browse the repository at this point in the history

  4. Trying to improve question queries structure

    @uo288347
    uo288347 committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    b15f684 View commit details
    Browse the repository at this point in the history

  5. Not working questions yet

    @uo288347
    uo288347 committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    71838ed View commit details
    Browse the repository at this point in the history

  6. Question structure reorganised

    @uo288347
    uo288347 committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    86db0e1 View commit details
    Browse the repository at this point in the history

  7. Internationalizing questions structure

    @uo288347
    uo288347 committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    574ff4c View commit details
    Browse the repository at this point in the history

  8. Starting questions tests

    @uo288347
    uo288347 committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    a72c7d1 View commit details
    Browse the repository at this point in the history

  9. More advances in joining groups (uncompleted)

    @alagoconde
    alagoconde committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    2478bb2 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. First attemps of testing

    @uo288347
    uo288347 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    8fc9909 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #146 from Arquisoft/develop-hugo 

    Add question countdown timer and current game question history
    @uo289689
    uo289689 authored Mar 26, 2024
    Configuration menu
    Copy the full SHA
    529ef72 View commit details
    Browse the repository at this point in the history

  3. Game.test and Homepage.test done. First attemp

    @uo288347
    uo288347 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    fa852c9 View commit details
    Browse the repository at this point in the history

  4. Testing e2e questions

    @uo288347
    uo288347 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    6f89c92 View commit details
    Browse the repository at this point in the history

  5. Add page statistics

    @uo289689
    uo289689 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    11a08c4 View commit details
    Browse the repository at this point in the history

  6. Fixing nomenclatures

    @uo289689
    uo289689 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    a455eba View commit details
    Browse the repository at this point in the history

  7. Fixing statistics imports

    @uo289689
    uo289689 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    899ccf9 View commit details
    Browse the repository at this point in the history

  8. Pause button added

    @uo288347
    uo288347 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    de77bb9 View commit details
    Browse the repository at this point in the history

  9. Added icons play/pause

    @uo288347
    uo288347 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    18c5e95 View commit details
    Browse the repository at this point in the history

  10. Fixing local deployment bug

    @uo289689
    uo289689 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    0347781 View commit details
    Browse the repository at this point in the history

  11. Beauty statistics view

    @uo289689
    uo289689 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    38e8d8c View commit details
    Browse the repository at this point in the history

  12. Fixing statistics view bug

    @uo289689
    uo289689 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    80feab5 View commit details
    Browse the repository at this point in the history

  13. Started improving the groups list (couldn't finish it).

    @alagoconde
    alagoconde committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    2050c9b View commit details
    Browse the repository at this point in the history

  14. Fixing statistics update bug on game

    @uo289689
    uo289689 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    168d574 View commit details
    Browse the repository at this point in the history

  15. Beauty statistics view

    @uo289689
    uo289689 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    0e4eaaa View commit details
    Browse the repository at this point in the history

  16. Modify tests of user-service to adapt them to the MariaDB database

    @uo289689
    uo289689 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    a7f84d5 View commit details
    Browse the repository at this point in the history

  17. Changed and extended the groups menu pages

    @alagoconde
    alagoconde committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    65841ae View commit details
    Browse the repository at this point in the history

  18. Prettified the groups list and removed gateway duplicated errors code.

    @alagoconde
    alagoconde committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    ccaafa0 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. Added pagination to the groups list.

    @alagoconde
    alagoconde committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    f000e55 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #147 from Arquisoft/develop_samuel 

    Develop samuel
    @uo288347
    uo288347 authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    662ffb0 View commit details
    Browse the repository at this point in the history

  3. Fixing import confetti error

    @uo288347
    uo288347 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    3c3862b View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/develop' into develop-teresa

    @uo288347
    uo288347 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    a187122 View commit details
    Browse the repository at this point in the history

  5. Merge with develop

    @uo288347
    uo288347 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    ad91256 View commit details
    Browse the repository at this point in the history

  6. Minor change question.json file

    @uo288347
    uo288347 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    8110b83 View commit details
    Browse the repository at this point in the history

  7. Fixing bug in questions-routes

    @uo288347
    uo288347 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    53d7c38 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #152 from Arquisoft/develop-teresa 

    Develop teresa
    @uo289689
    uo289689 authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    5520454 View commit details
    Browse the repository at this point in the history

  9. Adjusted user registration tests to use an in-memory SQLite database

    @uo289689
    uo289689 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    b6eeb86 View commit details
    Browse the repository at this point in the history

  10. The new test case "Usuario already exists" has been added

    @uo289689
    uo289689 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    cef32ed View commit details
    Browse the repository at this point in the history

  11. Merge branch 'develop' into develop_samuel

    @uo289689
    uo289689 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    6d00ab1 View commit details
    Browse the repository at this point in the history

  12. test package refactor

    @uo289689
    uo289689 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    b96adfa View commit details
    Browse the repository at this point in the history

  13. Fixing deplyment bug with NODE_ENV='test'

    @uo289689
    uo289689 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    7693157 View commit details
    Browse the repository at this point in the history

  14. Added tests for statistics

    @uo289689
    uo289689 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    a306e40 View commit details
    Browse the repository at this point in the history

  15. Added tests for the statistics API

    @uo289689
    uo289689 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    e374b89 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #154 from Arquisoft/develop_samuel 

    Added in-memory database for Users testing
    @uo288347
    uo288347 authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    106842e View commit details
    Browse the repository at this point in the history

  17. Added group members view.

    @alagoconde
    alagoconde committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    35cb13c View commit details
    Browse the repository at this point in the history

  18. FINISHED GROUPS SERVICE LFG!! (gotta test it now).

    @alagoconde
    alagoconde committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    93d8dff View commit details
    Browse the repository at this point in the history

  19. Added some comments and corrected a couple of things.

    @alagoconde
    alagoconde committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    62d9d9a View commit details
    Browse the repository at this point in the history

  20. Merge branch 'develop' into develop-alberto

    @alagoconde
    alagoconde committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    77cdffe View commit details
    Browse the repository at this point in the history

  21. Solved conflicts in the previous merge.

    @alagoconde
    alagoconde committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    d577981 View commit details
    Browse the repository at this point in the history