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

Feature/create reservations #998

Open
wants to merge 91 commits into
base: develop
Choose a base branch
from
Open

Feature/create reservations #998

wants to merge 91 commits into from

Commits on Nov 13, 2022

  1. Merge branch 'feature/library-occupation' into feature/library-rooms

    @jlcrodrigues
    jlcrodrigues committed Nov 13, 2022
    Configuration menu
    Copy the full SHA
    6e3221e View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2022

  1. feat: library reservations fetcher

    @jlcrodrigues
    jlcrodrigues committed Nov 14, 2022
    Configuration menu
    Copy the full SHA
    3077511 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2022

  1. Display reserved library rooms

    @jlcrodrigues
    jlcrodrigues committed Dec 11, 2022
    Configuration menu
    Copy the full SHA
    c23cf3d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/library-occupation' into feature/library-rooms

    @jlcrodrigues
    jlcrodrigues committed Dec 11, 2022
    Configuration menu
    Copy the full SHA
    5ed8089 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/library-rooms'

    @jlcrodrigues
    jlcrodrigues committed Dec 11, 2022
    Configuration menu
    Copy the full SHA
    cfec53e View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2023

  1. Merge branch feature/library-occupation

    @jlcrodrigues
    jlcrodrigues committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    83d9e1a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/library-occupation' of github.com:NIAEFEUP/proj… 

    …ect-schrodinger into feature/library-rooms
    @jlcrodrigues
    jlcrodrigues committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    057e001 View commit details
    Browse the repository at this point in the history

  3. Added library reservations card to main page

    @jlcrodrigues
    jlcrodrigues committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    76cfe79 View commit details
    Browse the repository at this point in the history

  4. Added tabs to library page

    @jlcrodrigues
    jlcrodrigues committed Jan 30, 2023
    Configuration menu
    Copy the full SHA
    36980a7 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2023

  1. Reworked library data flow

    @jlcrodrigues
    jlcrodrigues committed Feb 12, 2023
    Configuration menu
    Copy the full SHA
    fc95928 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop'

    @jlcrodrigues
    jlcrodrigues committed Feb 12, 2023
    Configuration menu
    Copy the full SHA
    6ce563e View commit details
    Browse the repository at this point in the history

  3. Fix merge conflicts

    @jlcrodrigues
    jlcrodrigues committed Feb 12, 2023
    Configuration menu
    Copy the full SHA
    af78294 View commit details
    Browse the repository at this point in the history

  4. Made changes to reserved rooms card

    @jlcrodrigues
    jlcrodrigues committed Feb 12, 2023
    Configuration menu
    Copy the full SHA
    c2ecf16 View commit details
    Browse the repository at this point in the history

  5. Reworked library reservations' view

    @jlcrodrigues
    jlcrodrigues committed Feb 12, 2023
    Configuration menu
    Copy the full SHA
    7e4b925 View commit details
    Browse the repository at this point in the history

  6. Added custom reservations route

    @jlcrodrigues
    jlcrodrigues committed Feb 12, 2023
    Configuration menu
    Copy the full SHA
    53c2859 View commit details
    Browse the repository at this point in the history

  7. Small changes to library reservations

    @jlcrodrigues
    jlcrodrigues committed Feb 12, 2023
    Configuration menu
    Copy the full SHA
    1aa923b View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop'

    @jlcrodrigues
    jlcrodrigues committed Feb 12, 2023
    Configuration menu
    Copy the full SHA
    9fa6414 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into feature/library-rooms

    @jlcrodrigues
    jlcrodrigues authored Feb 12, 2023
    Configuration menu
    Copy the full SHA
    7cfd371 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2023

  1. Merge branch develop

    @jlcrodrigues
    jlcrodrigues committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    fd285b4 View commit details
    Browse the repository at this point in the history

  2. Fixed providers issues

    @jlcrodrigues
    jlcrodrigues committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    a86709b View commit details
    Browse the repository at this point in the history

  3. Refactored helper functions

    @jlcrodrigues
    jlcrodrigues committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    c2d0834 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. Made changes according to suggestions

    @jlcrodrigues
    jlcrodrigues committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    ea8af13 View commit details
    Browse the repository at this point in the history

  2. Finished requested changes

    @jlcrodrigues
    jlcrodrigues committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    aad69ab View commit details
    Browse the repository at this point in the history

  3. Fixed linter issues

    @jlcrodrigues
    jlcrodrigues committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    9723a9b View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2023

  1. Finished reservations

    @jlcrodrigues
    jlcrodrigues committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    7456117 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/library-rooms' of github.com:NIAEFEUP/project-s… 

    …chrodinger into feature/cancel-reservations
    @jlcrodrigues
    jlcrodrigues committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    71f8d92 View commit details
    Browse the repository at this point in the history

  3. Fixed linter issues

    @jlcrodrigues
    jlcrodrigues committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    6893993 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2023

  1. Removed nullable type from RoomList

    @jlcrodrigues
    jlcrodrigues committed May 9, 2023
    Configuration menu
    Copy the full SHA
    1a553fc View commit details
    Browse the repository at this point in the history

  2. Add a room reservation view

    @jlcrodrigues
    jlcrodrigues committed May 9, 2023
    Configuration menu
    Copy the full SHA
    5ca5ff3 View commit details
    Browse the repository at this point in the history

  3. Implemented reservation creation backend

    @jlcrodrigues
    jlcrodrigues committed May 9, 2023
    Configuration menu
    Copy the full SHA
    a29b308 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. Remove redundant reservation duration from db

    @jlcrodrigues
    jlcrodrigues committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    34aac72 View commit details
    Browse the repository at this point in the history

  2. Feature/library rooms (#658)

    @thePeras
    thePeras authored Jun 21, 2023
    Configuration menu
    Copy the full SHA
    e582cf7 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. Merge branch 'feature/library-reservations' of github.com:NIAEFEUP/pr… 

    …oject-schrodinger into feature/create-reservations
    @jlcrodrigues
    jlcrodrigues committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    d54fb12 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2023

  1. Added parser to reservation response

    @jlcrodrigues
    jlcrodrigues committed Aug 13, 2023
    Configuration menu
    Copy the full SHA
    d64114e View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

  1. Merge branch 'develop'

    @jlcrodrigues
    jlcrodrigues committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    30ef2c0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github.com:NIAEFEUP/project-schrodinger int… 

    …o feature/library-reservations
    @jlcrodrigues
    jlcrodrigues committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    c2aceee View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2023

  1. Merge branch 'develop'

    @jlcrodrigues
    jlcrodrigues committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    4c0f4b0 View commit details
    Browse the repository at this point in the history

  2. Merge branch feature/library-reservations

    @jlcrodrigues
    jlcrodrigues committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    c9c4a95 View commit details
    Browse the repository at this point in the history

  3. Made small adjustements to reservation cancelling

    @jlcrodrigues
    jlcrodrigues committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    37ab2c1 View commit details
    Browse the repository at this point in the history

  4. Worked on linter issues

    @jlcrodrigues
    jlcrodrigues committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    f64edb7 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2023

  1. Fixed linter issues

    @jlcrodrigues
    jlcrodrigues committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    7f68904 View commit details
    Browse the repository at this point in the history

  2. Formatted files

    @jlcrodrigues
    jlcrodrigues committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    47b39d6 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. Merge branch 'feature/cancel-reservations'

    @jlcrodrigues
    jlcrodrigues committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    520b683 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. Worked on linter issues

    @jlcrodrigues
    jlcrodrigues committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    bd16037 View commit details
    Browse the repository at this point in the history

  2. Worked on linter issues

    @jlcrodrigues
    jlcrodrigues committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    b2a2ffb View commit details
    Browse the repository at this point in the history

  3. Worked on linter issues

    @jlcrodrigues
    jlcrodrigues committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    9f417dd View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. Merge branch develop

    @jlcrodrigues
    jlcrodrigues committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    bc185b4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github.com:NIAEFEUP/project-schrodinger int… 

    …o feature/library-reservations
    @jlcrodrigues
    jlcrodrigues committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    3b10427 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/library-reservations'

    @jlcrodrigues
    jlcrodrigues committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    fc4980e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/library-reservations'

    @jlcrodrigues
    jlcrodrigues committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    9af2713 View commit details
    Browse the repository at this point in the history

  5. Added missing translations

    @jlcrodrigues
    jlcrodrigues committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    b50816f View commit details
    Browse the repository at this point in the history

  6. Fixed linter

    @jlcrodrigues
    jlcrodrigues committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    01e259a View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feature/cancel-reservations'

    @jlcrodrigues
    jlcrodrigues committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    62a1f5e View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2023

  1. Added reservation creating loading display

    @jlcrodrigues
    jlcrodrigues committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    2c349b9 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2023

  1. Improved reservation creation error handling

    @jlcrodrigues
    jlcrodrigues committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    1d65996 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2023

  1. Made small changes according to suggestions

    @jlcrodrigues
    jlcrodrigues committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    5ba9cfa View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop'

    @jlcrodrigues
    jlcrodrigues committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    b51abd8 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2023

  1. Merge branch 'feature/cancel-reservations'

    @jlcrodrigues
    jlcrodrigues committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    a031095 View commit details
    Browse the repository at this point in the history

  2. Fixed context errors in reservation cancel button

    @jlcrodrigues
    jlcrodrigues committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    ea9b0bc View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop'

    @jlcrodrigues
    jlcrodrigues committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    da5c3fe View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop'

    @jlcrodrigues
    jlcrodrigues committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    31624e4 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature/library-reservations' into feature/cancel-reser… 

    …vations
    @jlcrodrigues
    jlcrodrigues committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    4e6d45b View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. Merge branch 'develop'

    @jlcrodrigues
    jlcrodrigues committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    dc64cda View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/library-reservations'

    @jlcrodrigues
    jlcrodrigues committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    1768fb0 View commit details
    Browse the repository at this point in the history

  3. Remove new line from version file

    @jlcrodrigues
    jlcrodrigues committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    73f499e View commit details
    Browse the repository at this point in the history

  4. Linter fixes

    @jlcrodrigues
    jlcrodrigues committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    e6492a5 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2023

  1. Merge branch 'develop'

    @jlcrodrigues
    jlcrodrigues committed Dec 28, 2023
    Configuration menu
    Copy the full SHA
    2e61e75 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/library-reservations'

    @jlcrodrigues
    jlcrodrigues committed Dec 28, 2023
    Configuration menu
    Copy the full SHA
    97c4c1b View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2023

  1. Small lint fix

    @jlcrodrigues
    jlcrodrigues committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    1eff19f View commit details
    Browse the repository at this point in the history

  2. Lint fixes

    @jlcrodrigues
    jlcrodrigues committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    ca22148 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2024

  1. Merge branch 'develop' of github.com:NIAEFEUP/project-schrodinger int… 

    …o feature/library-reservations
    @jlcrodrigues
    jlcrodrigues committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    ee64b61 View commit details
    Browse the repository at this point in the history

  2. Removed leftover ignore

    @jlcrodrigues
    jlcrodrigues committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    eabde47 View commit details
    Browse the repository at this point in the history

  3. Generated translation files

    @jlcrodrigues
    jlcrodrigues committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    80df1bc View commit details
    Browse the repository at this point in the history

  4. Merged branch 'feature/library-reservations'

    @jlcrodrigues
    jlcrodrigues committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    f1e5c09 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature/cancel-reservations'

    @jlcrodrigues
    jlcrodrigues committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    72c872c View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. Reservation providers refactor

    @jlcrodrigues
    jlcrodrigues committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    98020d6 View commit details
    Browse the repository at this point in the history

  2. Added reservation row shimmer

    @jlcrodrigues
    jlcrodrigues committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    0ec0de0 View commit details
    Browse the repository at this point in the history

  3. Added translations to reservation creator

    @jlcrodrigues
    jlcrodrigues committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    d10e8a6 View commit details
    Browse the repository at this point in the history

  4. Refactor reservations creator

    @jlcrodrigues
    jlcrodrigues committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    2e99cfb View commit details
    Browse the repository at this point in the history

  5. Reset app version

    @jlcrodrigues
    jlcrodrigues committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    4c37685 View commit details
    Browse the repository at this point in the history

  6. Fixed library card page link

    @jlcrodrigues
    jlcrodrigues committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    97507c7 View commit details
    Browse the repository at this point in the history

  7. Reset app version

    @jlcrodrigues
    jlcrodrigues committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    85f81b4 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. Merge branch 'develop' of github.com:NIAEFEUP/project-schrodinger int… 

    …o feature/library-reservations
    @jlcrodrigues
    jlcrodrigues committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    a4e7a04 View commit details
    Browse the repository at this point in the history

  2. Reverted messages_all file, fixing tests

    @jlcrodrigues
    jlcrodrigues committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    eb601cd View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/library-reservations' of github.com:NIAEFEUP/pr… 

    …oject-schrodinger into feature/cancel-reservations
    @jlcrodrigues
    jlcrodrigues committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    e3e5630 View commit details
    Browse the repository at this point in the history

  4. Made changes according to suggestions

    @jlcrodrigues
    jlcrodrigues committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    0e8b516 View commit details
    Browse the repository at this point in the history

  5. Format files

    @jlcrodrigues
    jlcrodrigues committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    a4768ec View commit details
    Browse the repository at this point in the history

  6. Fixed reservation weekday

    @jlcrodrigues
    jlcrodrigues committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    65f3fe4 View commit details
    Browse the repository at this point in the history

  7. Merge branch feature/library-reservations

    @jlcrodrigues
    jlcrodrigues committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    8ccb573 View commit details
    Browse the repository at this point in the history

  8. Merge branch feature/cancel-reservations

    @jlcrodrigues
    jlcrodrigues committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    730ad4d View commit details
    Browse the repository at this point in the history

  9. Fixed app version

    @jlcrodrigues
    jlcrodrigues committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    3015163 View commit details
    Browse the repository at this point in the history