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

email template #241

Open
wants to merge 160 commits into
base: feat/cron-email
Choose a base branch
from
Open

email template #241

wants to merge 160 commits into from

Commits on Aug 1, 2023

  1. completed sidebar and search frame on admin/users page

    B Phan authored and B Phan committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    5ec97a1 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. implemented data table without sort and filter

    B Phan authored and B Phan committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    878b38a View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2023

  1. implemented data table

    B Phan authored and B Phan committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    9b59de0 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2023

  1. made api calls to set up data

    B Phan authored and B Phan committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    345f808 View commit details
    Browse the repository at this point in the history

  2. implementing role filtering

    B Phan authored and B Phan committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    5f26164 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. Temp commit

    Ayush Roy authored and Ayush Roy committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    9e1cbf5 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2023

  1. added role filter feature

    B Phan authored and B Phan committed Aug 13, 2023
    Configuration menu
    Copy the full SHA
    7157174 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin' into 228-fixadmin-users-page

    B Phan authored and B Phan committed Aug 13, 2023
    Configuration menu
    Copy the full SHA
    4478ca6 View commit details
    Browse the repository at this point in the history

  3. completed frontend for admin/users page

    B Phan authored and B Phan committed Aug 13, 2023
    Configuration menu
    Copy the full SHA
    50b9132 View commit details
    Browse the repository at this point in the history

  4. removed unnecessary code

    B Phan authored and B Phan committed Aug 13, 2023
    Configuration menu
    Copy the full SHA
    de72cc1 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2023

  1. completed users page

    B Phan authored and B Phan committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    7a814ec View commit details
    Browse the repository at this point in the history

  2. fixed conflicts

    B Phan authored and B Phan committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    671d154 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2023

  1. Merge remote-tracking branch 'origin' into 228-fixadmin-users-page

    B Phan authored and B Phan committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    366c806 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2023

  1. return merge fixes

    Ayush Roy authored and Ayush Roy committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    e646775 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/UofA-Blueprint/DishZero int… 

    …o fix/return
    Ayush Roy authored and Ayush Roy committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    b45e4e4 View commit details
    Browse the repository at this point in the history

  3. worked on admin apis

    B Phan authored and B Phan committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    88a9e36 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2023

  1. tried running the app

    B Phan authored and B Phan committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    209250c View commit details
    Browse the repository at this point in the history

  2. email template route

    @GurveerSohal
    GurveerSohal committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    6c795ec View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into feat/email-template

    @GurveerSohal
    GurveerSohal committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    79ff5ac View commit details
    Browse the repository at this point in the history

  4. temporarily made unused stuff allowed

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

  5. removed credentials log

    @GurveerSohal
    GurveerSohal committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    432d452 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. reset button

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

  2. email endpoint

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

  3. send email function

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

  4. get template

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

  5. get overdue users

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

  6. Merge branch 'feat/cron-email' into feat/email-template

    @GurveerSohal
    GurveerSohal committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    06e9cb0 View commit details
    Browse the repository at this point in the history

  7. testing admin apis

    B Phan authored and B Phan committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    42bb3a4 View commit details
    Browse the repository at this point in the history

  8. pulled main

    B Phan authored and B Phan committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    665209d View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2023

  1. Merge branch 'main' of https://github.com/UofA-Blueprint/DishZero int… 

    …o fix/return
    Ayush Roy authored and Ayush Roy committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    7e8a2d0 View commit details
    Browse the repository at this point in the history

  2. new branch + connected to backend

    @Aaron383
    Aaron383 committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    a2af9cb View commit details
    Browse the repository at this point in the history

  3. fix: fetch dish using qid

    @ArmaanKatyal
    ArmaanKatyal committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    67355e0 View commit details
    Browse the repository at this point in the history

  4. fix: updated readme

    @ArmaanKatyal
    ArmaanKatyal committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    a34333d View commit details
    Browse the repository at this point in the history

  5. fix: updated readme

    @ArmaanKatyal
    ArmaanKatyal committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    652e35e View commit details
    Browse the repository at this point in the history

  6. Merge pull request #244 from UofA-Blueprint/fix/fetch-dish-qid 

    fix: fetch dish using qid
    @royayush1
    royayush1 authored Sep 1, 2023
    Configuration menu
    Copy the full SHA
    4d70f8a View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2023

  1. Merge branch 'main' of https://github.com/UofA-Blueprint/DishZero int… 

    …o fix/return
    Ayush Roy authored and Ayush Roy committed Sep 2, 2023
    Configuration menu
    Copy the full SHA
    e5f6751 View commit details
    Browse the repository at this point in the history

  2. working return via scan and text and working notification

    Ayush Roy authored and Ayush Roy committed Sep 2, 2023
    Configuration menu
    Copy the full SHA
    08c600f View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2023

  1. fixed camera viewport ui and notification popup ui

    Ayush Roy authored and Ayush Roy committed Sep 3, 2023
    Configuration menu
    Copy the full SHA
    185496a View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2023

  1. notification pop up goes away and loading screen upon submit disables… 

    … anything else from happening
    Ayush Roy authored and Ayush Roy committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    a6988b5 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2023

  1. camera glitch and multiple api call fix

    Ayush Roy authored and Ayush Roy committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    fefde3b View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2023

  1. Merge remote-tracking branch 'origin' into 228-fixadmin-users-page

    B Phan authored and B Phan committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    9d3790c View commit details
    Browse the repository at this point in the history

  2. re-upload code

    B Phan authored and B Phan committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    a232b4d View commit details
    Browse the repository at this point in the history

  3. tried changing get dish api

    B Phan authored and B Phan committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    0fbbe0b View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2023

  1. changed api url for get dish

    B Phan authored and B Phan committed Sep 16, 2023
    Configuration menu
    Copy the full SHA
    bcd5ac1 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. feat: implemented borrow functionality from wix redirect

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

  2. user by id

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

Commits on Sep 21, 2023

  1. fixing admin api calls

    B Phan authored and B Phan committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    67fe803 View commit details
    Browse the repository at this point in the history

  2. fixing bugs in admin api calls

    B Phan authored and B Phan committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    3549b02 View commit details
    Browse the repository at this point in the history

  3. fixing bugs in admin api calls

    B Phan authored and B Phan committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    50f911b View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2023

  1. fixing admin api calls

    B Phan authored and B Phan committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    21bf306 View commit details
    Browse the repository at this point in the history

  2. fix

    @GurveerSohal
    GurveerSohal committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    bdbc40a View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2023

  1. change model

    @GurveerSohal
    GurveerSohal committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    01a7176 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feat/cron-email' into feat/email-template

    @GurveerSohal
    GurveerSohal committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    64d839a View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2023

  1. Merge pull request #245 from UofA-Blueprint/userbyid 

    user by id
    @royayush1
    royayush1 authored Sep 24, 2023
    Configuration menu
    Copy the full SHA
    37e7a58 View commit details
    Browse the repository at this point in the history

  2. update according to new document structure

    @GurveerSohal
    GurveerSohal committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    f9dc953 View commit details
    Browse the repository at this point in the history

  3. every 5 seconds

    @GurveerSohal
    GurveerSohal committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    de28a52 View commit details
    Browse the repository at this point in the history

  4. update cron through backend

    @GurveerSohal
    GurveerSohal committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    f15040b View commit details
    Browse the repository at this point in the history

  5. added loader and fixed api route in admin/users

    B Phan authored and B Phan committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    0f1637d View commit details
    Browse the repository at this point in the history

  6. setting cron expression etc through frontend

    @GurveerSohal
    GurveerSohal committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    0e8ec16 View commit details
    Browse the repository at this point in the history

  7. completed admin/users page

    B Phan authored and B Phan committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    e968e3f View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'origin' into 228-fixadmin-users-page

    B Phan authored and B Phan committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    e16dd52 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2023

  1. styling

    @GurveerSohal
    GurveerSohal committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    3b59e46 View commit details
    Browse the repository at this point in the history

  2. fixed getting emails and search bar

    @Aaron383
    Aaron383 committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    56b9477 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2023

  1. frontend

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

  2. disable

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

  3. remove comments

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

  4. disable

    @GurveerSohal
    GurveerSohal committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    85cd47f View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. install eslint, move deps to dev

    @kira-m
    kira-m committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    0ea169c View commit details
    Browse the repository at this point in the history

  2. fix eslint config

    @kira-m
    kira-m committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    1ef57a2 View commit details
    Browse the repository at this point in the history

  3. lint fixes

    @kira-m
    kira-m committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    e3d84ea View commit details
    Browse the repository at this point in the history

  4. Merge pull request #248 from UofA-Blueprint/km-eslint 

    eslint configuration & dependency fixes
    @royayush1
    royayush1 authored Sep 28, 2023
    Configuration menu
    Copy the full SHA
    9b87f9d View commit details
    Browse the repository at this point in the history

  5. fix: borrow not working on type

    @jdrco
    jdrco committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    30c67b8 View commit details
    Browse the repository at this point in the history

  6. add borrowed at

    @GurveerSohal
    GurveerSohal committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    8dcb20a View commit details
    Browse the repository at this point in the history

  7. fixed search and in use in admin/users

    B Phan authored and B Phan committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    6314041 View commit details
    Browse the repository at this point in the history

  8. get overdues

    B Phan authored and B Phan committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    2180a61 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #246 from UofA-Blueprint/feat/borrow-redirect-func… 

    …tionality

feat: implemented borrow functionality from wix redirect
    @royayush1
    royayush1 authored Sep 28, 2023
    Configuration menu
    Copy the full SHA
    2d85320 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #251 from UofA-Blueprint/overduedish 

    add borrowed at
    @royayush1
    royayush1 authored Sep 28, 2023
    Configuration menu
    Copy the full SHA
    3efc8bc View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2023

  1. user by id

    @GurveerSohal
    GurveerSohal authored and Ayush Roy committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    dcaca5b View commit details
    Browse the repository at this point in the history

  2. fix

    @GurveerSohal
    GurveerSohal authored and Ayush Roy committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    dbc4fb6 View commit details
    Browse the repository at this point in the history

  3. change model

    @GurveerSohal
    GurveerSohal authored and Ayush Roy committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    9e05263 View commit details
    Browse the repository at this point in the history

  4. install eslint, move deps to dev

    @kira-m
    kira-m authored and Ayush Roy committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    08e0992 View commit details
    Browse the repository at this point in the history

  5. fix eslint config

    @kira-m
    kira-m authored and Ayush Roy committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    0e09844 View commit details
    Browse the repository at this point in the history

  6. lint fixes

    @kira-m
    kira-m authored and Ayush Roy committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    355c851 View commit details
    Browse the repository at this point in the history

  7. feat: implemented borrow functionality from wix redirect

    @jdrco
    jdrco authored and Ayush Roy committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    5b5b296 View commit details
    Browse the repository at this point in the history

  8. fix: borrow not working on type

    @jdrco
    jdrco authored and Ayush Roy committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    a68708e View commit details
    Browse the repository at this point in the history

  9. add borrowed at

    @GurveerSohal
    GurveerSohal authored and Ayush Roy committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    f4c259a View commit details
    Browse the repository at this point in the history

  10. fixed bugs

    @Aaron383
    Aaron383 committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    b9a39a1 View commit details
    Browse the repository at this point in the history

  11. fixed overdue in admin/users

    B Phan authored and B Phan committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    2f1e9b0 View commit details
    Browse the repository at this point in the history

  12. fix conflicts

    B Phan authored and B Phan committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    ba487b0 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'main' into feat/email-template

    @GurveerSohal
    GurveerSohal committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    16e51d0 View commit details
    Browse the repository at this point in the history

  14. fixed merge conflicts

    B Phan authored and B Phan committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    2dbecd0 View commit details
    Browse the repository at this point in the history

  15. fixed overdue logic

    B Phan authored and B Phan committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    e1b6da7 View commit details
    Browse the repository at this point in the history

  16. Report v1

    Ayush Roy authored and Ayush Roy committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    a6881da View commit details
    Browse the repository at this point in the history

  17. Fix eslint errors

    Ayush Roy authored and Ayush Roy committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    f2316a0 View commit details
    Browse the repository at this point in the history

  18. pulled main

    B Phan authored and B Phan committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    e00c0e4 View commit details
    Browse the repository at this point in the history

  19. pulled main

    B Phan authored and B Phan committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    c523283 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2023

  1. Merge pull request #233 from UofA-Blueprint/228-fixadmin-users-page 

    228 fixadmin users page
    @royayush1
    royayush1 authored Sep 30, 2023
    Configuration menu
    Copy the full SHA
    4be19b5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat/Admin-Homepage

    @Aaron383
    Aaron383 committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    1f7e5c2 View commit details
    Browse the repository at this point in the history

  3. fixed errors

    @Aaron383
    Aaron383 committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    0015d5b View commit details
    Browse the repository at this point in the history

  4. fix

    @GurveerSohal
    GurveerSohal committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    4ab4fd1 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #249 from UofA-Blueprint/feat/Admin-Homepage 

    Feat/admin homepage
    @royayush1
    royayush1 authored Sep 30, 2023
    Configuration menu
    Copy the full SHA
    57c4862 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #256 from UofA-Blueprint/fix/transactions 

    fix
    @royayush1
    royayush1 authored Sep 30, 2023
    Configuration menu
    Copy the full SHA
    9e02a56 View commit details
    Browse the repository at this point in the history

  7. package lock

    Ayush Roy authored and Ayush Roy committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    beeb4a5 View commit details
    Browse the repository at this point in the history

  8. Return completed

    Ayush Roy authored and Ayush Roy committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    1d7ed36 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #257 from UofA-Blueprint/fix/return 

    Fix/return
    @royayush1
    royayush1 authored Sep 30, 2023
    Configuration menu
    Copy the full SHA
    b0d40d5 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2023

  1. fixed url to admin page

    @Aaron383
    Aaron383 committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    28fc4ff View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2023

  1. Eslint fix

    Ayush Roy authored and Ayush Roy committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    77612dc View commit details
    Browse the repository at this point in the history

  2. Merge pull request #258 from UofA-Blueprint/feat/Admin-Homepage 

    fixed url to admin page
    @royayush1
    royayush1 authored Oct 8, 2023
    Configuration menu
    Copy the full SHA
    6116d61 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2023

  1. eslint errors in admin.tsx

    Ayush Roy authored and Ayush Roy committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    00474e2 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2023

  1. in progress

    @GurveerSohal
    GurveerSohal committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    e7ae962 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat/email-template

    @GurveerSohal
    GurveerSohal committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    4627318 View commit details
    Browse the repository at this point in the history

  3. think it works

    @GurveerSohal
    GurveerSohal committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    cbe3e3f View commit details
    Browse the repository at this point in the history

  4. fix homepage error

    @kira-m
    kira-m committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    9365b5b View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

  1. fix backend calls

    @kira-m
    kira-m committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    dbc8e20 View commit details
    Browse the repository at this point in the history

  2. fix other api calls

    @kira-m
    kira-m committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    3136187 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #260 from UofA-Blueprint/km-fix-homepage 

    fix homepage
    @royayush1
    royayush1 authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    c0566f8 View commit details
    Browse the repository at this point in the history

  4. backend baseURL fix

    Ayush Roy authored and Ayush Roy committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    0d8dd3b View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2023

  1. initial jest setup 

    # Conflicts:
#	app/package-lock.json
#	app/package.json
    @kira-m
    kira-m committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    f4a1434 View commit details
    Browse the repository at this point in the history

  2. working on typescript for react 

    # Conflicts:
#	app/package-lock.json
    @kira-m
    kira-m committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    8d99459 View commit details
    Browse the repository at this point in the history

  3. initial AuthContext tests

    @kira-m
    kira-m committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    191effb View commit details
    Browse the repository at this point in the history

  4. update readme

    @kira-m
    kira-m committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    1f45b28 View commit details
    Browse the repository at this point in the history

  5. fix tests

    @kira-m
    kira-m committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    76ca971 View commit details
    Browse the repository at this point in the history

  6. change prettier to warn instead of error 

    # Conflicts:
#	app/.eslintrc.js
    @kira-m
    kira-m committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    b459955 View commit details
    Browse the repository at this point in the history

  7. initial AuthContext tests

    @kira-m
    kira-m committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    51fa57b View commit details
    Browse the repository at this point in the history

  8. fix build

    @kira-m
    kira-m committed Nov 4, 2023
    Configuration menu
    Copy the full SHA
    1d7765f View commit details
    Browse the repository at this point in the history

  9. Merge pull request #264 from UofA-Blueprint/km-jest 

    Frontend test setup
    @royayush1
    royayush1 authored Nov 4, 2023
    Configuration menu
    Copy the full SHA
    faa438c View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2023

  1. cors fix

    Ayush Roy authored and Ayush Roy committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    77ec75b View commit details
    Browse the repository at this point in the history

  2. cors fix 2

    Ayush Roy authored and Ayush Roy committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    2e57025 View commit details
    Browse the repository at this point in the history

  3. cors fix 3

    Ayush Roy authored and Ayush Roy committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    71f7573 View commit details
    Browse the repository at this point in the history

  4. change

    @GurveerSohal
    GurveerSohal committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    0812ad4 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2023

  1. updated without auth issues

    Ayush Roy authored and Ayush Roy committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    341551c View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

  1. Admin User Page tests

    Ayush Roy authored and Ayush Roy committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    1bfeacc View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. Merge branch 'main' into feat/email-template

    @GurveerSohal
    GurveerSohal committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    7dc160b View commit details
    Browse the repository at this point in the history

  2. users page comments

    Ayush Roy authored and Ayush Roy committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    f73e43a View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2023

  1. start from firebase

    @GurveerSohal
    GurveerSohal committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    281eb15 View commit details
    Browse the repository at this point in the history

  2. stop email cron through request

    @GurveerSohal
    GurveerSohal committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    d0ed4f6 View commit details
    Browse the repository at this point in the history

  3. start cron with request

    @GurveerSohal
    GurveerSohal committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    1b7627a View commit details
    Browse the repository at this point in the history

  4. start and stop cron when expression changed

    @GurveerSohal
    GurveerSohal committed Nov 19, 2023
    Configuration menu
    Copy the full SHA
    4ee5ea2 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. delete old tests

    @GurveerSohal
    GurveerSohal committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    325afc0 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. Update app/src/admin/users.tsx 

    Co-authored-by: Kira Muhlbauer <[email protected]>
    @royayush1 @kira-m
    royayush1 and kira-m authored Nov 22, 2023
    Configuration menu
    Copy the full SHA
    3162b2b View commit details
    Browse the repository at this point in the history

  2. Update app/src/admin/users.tsx 

    Co-authored-by: Kira Muhlbauer <[email protected]>
    @royayush1 @kira-m
    royayush1 and kira-m authored Nov 22, 2023
    Configuration menu
    Copy the full SHA
    0aa05db View commit details
    Browse the repository at this point in the history

  3. Update app/src/test/adminUsers.test.tsx 

    Co-authored-by: Kira Muhlbauer <[email protected]>
    @royayush1 @kira-m
    royayush1 and kira-m authored Nov 22, 2023
    Configuration menu
    Copy the full SHA
    397009f View commit details
    Browse the repository at this point in the history

  4. Update app/src/test/adminUsers.test.tsx 

    Co-authored-by: Kira Muhlbauer <[email protected]>
    @royayush1 @kira-m
    royayush1 and kira-m authored Nov 22, 2023
    Configuration menu
    Copy the full SHA
    8c7a7ac View commit details
    Browse the repository at this point in the history

  5. Update app/src/test/adminUsers.test.tsx 

    Co-authored-by: Kira Muhlbauer <[email protected]>
    @royayush1 @kira-m
    royayush1 and kira-m authored Nov 22, 2023
    Configuration menu
    Copy the full SHA
    718bac9 View commit details
    Browse the repository at this point in the history

  6. Update app/src/test/adminUsers.test.tsx 

    Co-authored-by: Kira Muhlbauer <[email protected]>
    @royayush1 @kira-m
    royayush1 and kira-m authored Nov 22, 2023
    Configuration menu
    Copy the full SHA
    55415b9 View commit details
    Browse the repository at this point in the history

  7. Update app/src/test/adminUsers.test.tsx 

    Co-authored-by: Kira Muhlbauer <[email protected]>
    @royayush1 @kira-m
    royayush1 and kira-m authored Nov 22, 2023
    Configuration menu
    Copy the full SHA
    95f6746 View commit details
    Browse the repository at this point in the history

  8. Update app/src/test/adminUsers.test.tsx 

    Co-authored-by: Kira Muhlbauer <[email protected]>
    @royayush1 @kira-m
    royayush1 and kira-m authored Nov 22, 2023
    Configuration menu
    Copy the full SHA
    86032bb View commit details
    Browse the repository at this point in the history

  9. Update app/src/test/adminUsers.test.tsx 

    Co-authored-by: Kira Muhlbauer <[email protected]>
    @royayush1 @kira-m
    royayush1 and kira-m authored Nov 22, 2023
    Configuration menu
    Copy the full SHA
    66d3093 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2023

  1. comments

    @GurveerSohal
    GurveerSohal committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    1f37b3e View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2023

  1. UI Enhancements of PopUp, bottomTextInput and qrCodeBack

    @yashjha123
    yashjha123 committed Nov 26, 2023
    Configuration menu
    Copy the full SHA
    fd2b583 View commit details
    Browse the repository at this point in the history

  2. Report Done

    @yashjha123
    yashjha123 committed Nov 26, 2023
    Configuration menu
    Copy the full SHA
    afb5a78 View commit details
    Browse the repository at this point in the history

  3. Added slide animation

    @yashjha123
    yashjha123 committed Nov 26, 2023
    Configuration menu
    Copy the full SHA
    28bad82 View commit details
    Browse the repository at this point in the history

  4. users fix

    Ayush Roy authored and Ayush Roy committed Nov 26, 2023
    Configuration menu
    Copy the full SHA
    aa2156b View commit details
    Browse the repository at this point in the history

  5. Merge pull request #267 from UofA-Blueprint/fix/adminUsers 

    Fix/admin users
    @royayush1
    royayush1 authored Nov 26, 2023
    Configuration menu
    Copy the full SHA
    5d0b04e View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Merge pull request #271 from UofA-Blueprint/ui-fixes-return-page 

    UI/Style: Return Page - Front-end Enhancements and Bug Fixes
    @royayush1
    royayush1 authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    0e3891b View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. allow them to set time and sender email

    @GurveerSohal
    GurveerSohal committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    c829deb View commit details
    Browse the repository at this point in the history

  2. start and stop cron job from frontend

    @GurveerSohal
    GurveerSohal committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    78abd83 View commit details
    Browse the repository at this point in the history

  3. eslint errors

    @GurveerSohal
    GurveerSohal committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    c32bae6 View commit details
    Browse the repository at this point in the history

  4. uncomment email sending

    @GurveerSohal
    GurveerSohal committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    8429b30 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into feat/email-template

    @GurveerSohal
    GurveerSohal committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    fa8487e View commit details
    Browse the repository at this point in the history