Merge requests · Summer Marshall / NWEN304 Group Project

Merge trains

Removed .iml

!26 · created Oct 25, 2022 by Jude Snee
- Merged
updated Oct 25, 2022
Cart1.0

!25 · created Oct 25, 2022 by Jude Snee
- Merged
updated Oct 25, 2022
hopefully last firebase commit

!24 · created Oct 22, 2022 by Jude Snee
- Merged
updated Oct 22, 2022
Rest

!23 · created Oct 22, 2022 by Jude Snee
- Merged
updated Oct 22, 2022
Rest

!21 · created Oct 22, 2022 by Jude Snee integrationtest
- Merged
updated Oct 22, 2022
Firebase2.0

!20 · created Oct 22, 2022 by Jude Snee
- Merged
updated Oct 22, 2022
more firebase

!19 · created Oct 21, 2022 by Jude Snee firebase2.0
- Merged
updated Oct 21, 2022
Rest

!18 · created Oct 20, 2022 by Jude Snee
- Merged
updated Oct 20, 2022
Products

!17 · created Oct 20, 2022 by Jude Snee REST
- Merged
updated Oct 20, 2022
O auth

!16 · created Oct 18, 2022 by Jude Snee
- Merged
updated Oct 18, 2022
Cookies+login/logout

!15 · created Oct 16, 2022 by Jude Snee
- Merged
updated Oct 16, 2022
added Anne's stuff to the pages that lost it during the merge + a tiny bit of other stuff

!14 · created Oct 04, 2022 by Jude Snee
- Merged
updated Oct 04, 2022
Main with Anne's (at long last)

!13 · created Oct 04, 2022 by Jude Snee
- Merged
updated Oct 04, 2022
Adding my branch to main

!12 · created Oct 04, 2022 by Jude Snee
- Merged
updated Oct 04, 2022
Trying to upload my changes

!10 · created Oct 03, 2022 by Jude Snee Jude2.0
- Merged
updated Oct 03, 2022
Revert "Merge branch 'integration' into 'Anne'"

!7 · created Oct 03, 2022 by Jude Snee
- Merged
updated Oct 03, 2022
Jude2.0

!5 · created Oct 03, 2022 by Jude Snee
- Merged
updated Oct 03, 2022
Gitignore and package.json fixes

!4 · created Sep 28, 2022 by Summer Marshall
updated Sep 28, 2022
added very basic ejs + server functionality

!3 · created Sep 23, 2022 by Jude Snee
- Merged
updated Sep 23, 2022
Initital Framework setup completed

!2 · created Sep 22, 2022 by Jude Snee
- Merged
updated Sep 22, 2022