Code

Marcos/edit member infov3#69

Code

Open

MarcosH28 wants to merge 61 commits intomaincalblueprint/berkeley-student-cooperative:mainfrom marcos/editMemberInfov3calblueprint/berkeley-student-cooperative:marcos/editMemberInfov3Copy head branch name to clipboard

+2,491-970

Commits

Commits on Dec 4, 2022

• nothing changed

  christianjc

  committed
  2e0e2d3

  Copy full SHA for 2e0e2d3

Commits on Feb 8, 2023

• Merge branch 'main' of github.com:calblueprint/berkeley-student-cooperative

  christianjc

  committed
  ac7be92

  Copy full SHA for ac7be92

• husky installed

  christianjc

  committed
  4b43807

  Copy full SHA for 4b43807

Commits on Feb 27, 2023

• pulled changes from github

  christianjc

  committed
  7859d93

  Copy full SHA for 7859d93

• fixed packet.json file

  christianjc

  committed
  545e4a4

  Copy full SHA for 545e4a4

• updated package.json

  christianjc

  committed
  ffe7d0e

  Copy full SHA for ffe7d0e

Commits on Feb 28, 2023

• setting up Redux and RTK Query. I have set up the redux store and I am working on seting up the createApi slide for the project

  christianjc

  committed
  e5b8073

  Copy full SHA for e5b8073

Commits on Mar 1, 2023

• fixed consoled error, and still wokring on redux and RTK Query

  christianjc

  committed
  6a1ae94

  Copy full SHA for 6a1ae94

• set up main apiSlice and shiftsApiSlice

  christianjc

  committed
  a324a8c

  Copy full SHA for a324a8c

• mereged changes from christian's branch to dev/redux with the basic redux set up

  christianjc

  committed
  00b3949

  Copy full SHA for 00b3949

• Set basic redux set up as well as the main apiSlide and the shift controllers. Fixed the warning message on the console regarding the nesting of the elements. fixed most of the typescript errors a…

  Show description for 2da2fb2
  christianjc

  committed
  2da2fb2

  Copy full SHA for 2da2fb2

• Merge branch 'christian/redux' into dev/redux

  christianjc

  committed
  6eea657

  Copy full SHA for 6eea657

• fixed the filtering for unassigned users

  christianjc

  committed
  b7a3bcd

  Copy full SHA for b7a3bcd

• woring on unassign and created usersApiSlices

  christianjc

  committed
  9c35cf9

  Copy full SHA for 9c35cf9

Commits on Mar 2, 2023

• added redux api for users

  christianjc

  committed
  91de215

  Copy full SHA for 91de215

• Merge branch 'christian/redux' into dev/redux

  christianjc

  committed
  7bd6216

  Copy full SHA for 7bd6216

• added some notes

  gregoriiaaa

  committed
  b0945fe

  Copy full SHA for b0945fe

• merged dev/redux into dev/main and resolved conflicts

  gregoriiaaa

  committed
  dfeb1a1

  Copy full SHA for dfeb1a1

Commits on Mar 4, 2023

• fixing apiSlice errors

  gregoriiaaa

  committed
  19c0aa5

  Copy full SHA for 19c0aa5

• hold up

  gregoriiaaa

  committed
  50bf0eb

  Copy full SHA for 50bf0eb

Commits on Mar 6, 2023

• npm i

  gregoriiaaa

  committed
  b464713

  Copy full SHA for b464713

• merged main onto branch

  gregoriiaaa

  committed
  d9c52d8

  Copy full SHA for d9c52d8

• pull from github

  christianjc

  committed
  2f31cb4

  Copy full SHA for 2f31cb4

• setting up testing component for redux

  christianjc

  committed
  4bedefa

  Copy full SHA for 4bedefa

• getshift is working

  christianjc

  committed
  eb0e6ae

  Copy full SHA for eb0e6ae

• updated testing readux file

  christianjc

  committed
  6689e09

  Copy full SHA for 6689e09

• Merge branch 'main' of github.com:calblueprint/berkeley-student-cooperative into greg/fixing-api-bugs

  gregoriiaaa

  committed
  f9e75e9

  Copy full SHA for f9e75e9

• Merge branch 'greg/fixing-api-bugs' into dev/redux-update

  christianjc

  committed
  8a24672

  Copy full SHA for 8a24672

• Merge branch 'dev/redux-update' into dev/redux

  christianjc

  committed
  62df4ae

  Copy full SHA for 62df4ae

• added packages and added CustomFormikFields file

  christianjc

  committed
  d940885

  Copy full SHA for d940885

• updating schema

  gregoriiaaa

  committed
  6d34f42

  Copy full SHA for 6d34f42

• added skeleton of the ScheduledShift type

  gregoriiaaa

  committed
  51fba24

  Copy full SHA for 51fba24

• fixing shift form

  christianjc

  committed
  611d92c

  Copy full SHA for 611d92c

• updating ShiftForm file

  christianjc

  committed
  930b3da

  Copy full SHA for 930b3da

• Merge branch 'dev/updating-types' into dev/forms

  christianjc

  committed
  b3199d3

  Copy full SHA for b3199d3

• added functionality to add new shift, not fully tested

  christianjc

  committed
  11896e2

  Copy full SHA for 11896e2

• Merge branch 'dev/forms' into dev/redux-update

  christianjc

  committed
  a8221d1

  Copy full SHA for a8221d1

• getShifts and addNewShift works

  christianjc

  committed
  eabd1db

  Copy full SHA for eabd1db

• implemented providesTags which allows componets to update when data changes

  christianjc

  committed
  9aabee7

  Copy full SHA for 9aabee7

Commits on Mar 7, 2023

• made some small changes

  christianjc

  committed
  93dd843

  Copy full SHA for 93dd843

• Merge branch 'dev/redux-update' into dev/forms

  christianjc

  committed
  6894521

  Copy full SHA for 6894521

• editin shifts update

  christianjc

  committed
  d0011f4

  Copy full SHA for d0011f4

• Merge branch 'dev/forms' into dev/redux-update

  christianjc

  committed
  f9ab769

  Copy full SHA for f9ab769

Commits on Mar 8, 2023

• Fixed the selectShiftById

  christianjc

  committed
  1a80855

  Copy full SHA for 1a80855

• will change formik fields

  christianjc

  committed
  682fc07

  Copy full SHA for 682fc07

• Merge branch 'dev/redux-apiSlice' into dev/forms

  christianjc

  committed
  635e87b

  Copy full SHA for 635e87b

Commits on Mar 9, 2023

• fixed ShiftForm and formik filds

  christianjc

  committed
  44310b5

  Copy full SHA for 44310b5

• fixed Post bug

  christianjc

  committed
  6120855

  Copy full SHA for 6120855

• Merge branch 'dev/redux-apiSlice' into dev/forms

  christianjc

  committed
  45a93d3

  Copy full SHA for 45a93d3

• updated shiftForm

  christianjc

  committed
  6866ca0

  Copy full SHA for 6866ca0

• Merge branch 'dev/forms' of github.com:calblueprint/berkeley-student-cooperative into dev/main

  gregoriiaaa

  committed
  d3aeead

  Copy full SHA for d3aeead

• updated userApi

  christianjc

  committed
  a7422a7

  Copy full SHA for a7422a7

• fixed user Api

  christianjc

  committed
  c8bd4a1

  Copy full SHA for c8bd4a1

• updated the forms for users

  christianjc

  committed
  841d21a

  Copy full SHA for 841d21a

• added userForm and editUserCard

  christianjc

  committed
  b51f1ad

  Copy full SHA for b51f1ad

• added house api slice with fetch, update, and add queries

  danashimessele

  committed
  3ef7b29

  Copy full SHA for 3ef7b29

Commits on Mar 11, 2023

• Merge branch 'dev/reduxHosueApi' of github.com:calblueprint/berkeley-student-cooperative into dev/main

  gregoriiaaa

  committed
  aa58c36

  Copy full SHA for aa58c36

• fixed getHousesQuery

  danashimessele

  committed
  43f5588

  Copy full SHA for 43f5588

• greg stuff

  gregoriiaaa

  committed
  e31a249

  Copy full SHA for e31a249

• Merge branch 'Danashi/HouseUpdates' of github.com:calblueprint/berkeley-student-cooperative into dev/main

  gregoriiaaa

  committed
  4dffcc7

  Copy full SHA for 4dffcc7

• [feat] Edit User Card in Planner created to edit only the user's name and email

  

  Marcos Hernandez

  committed
  c1b65bf

  Copy full SHA for c1b65bf