Code

Firebase conflict reosulutions#179

Code

Merged

AlexanderWangY merged 8 commits intofirebase-admin-refactorufosc/OSC-Proximity-Chat-App:firebase-admin-refactorfrom firebase-conflict-reosulutionsufosc/OSC-Proximity-Chat-App:firebase-conflict-reosulutionsCopy head branch name to clipboardFeb 25, 2024

+3-3

Commits

Commits on Feb 19, 2024

• Made error case for email in use display correctly in front end

  Phantom0110

  committed
  99b7894

  Copy full SHA for 99b7894

Commits on Feb 20, 2024

• Made error case for email in use display correctly in front end (#158)

  Phantom0110

  authored
  1dc43e9

  Copy full SHA for 1dc43e9

Commits on Feb 22, 2024

• Merge branch 'ufosc:main' into main

  Phantom0110

  authored
  b7e065e

  Copy full SHA for b7e065e

• Cleaned up useEffect function #159

  Phantom0110

  committed
  2fa62a8

  Copy full SHA for 2fa62a8

Commits on Feb 23, 2024

• Merge pull request #170 from Phantom0110/clean-location-use-effect

  Show description for bf930a4
  AlexanderWangY

  authored
  bf930a4

  Copy full SHA for bf930a4

• Added testing pipeline (#175)

  Show description for 752c1a3
  AlexanderWangY

  authored
  752c1a3

  Copy full SHA for 752c1a3

Commits on Feb 25, 2024

• User Context and User Type created and wrapped chat screen (#131)

  Show description for 1bd5642
  

  AaronGibson2

  and

  h1divp

  authored
  1bd5642

  Copy full SHA for 1bd5642

• Merge branch 'main' into firebase-conflict-reosulutions

  AlexanderWangY

  authored
  87377e6

  Copy full SHA for 87377e6