0000000000000000000000000000000000000000 70bfe5de2612cd27874cd02d1358a4cba3359713 phambien <bpham9641@gmail.com> 1781858831 +0700	clone: from https://github.com/tranthanh190823-png/DATN-Website-ban-nuoc-hoa-Aventis-BACKEND-
70bfe5de2612cd27874cd02d1358a4cba3359713 90074eac34fa7ce7b785d6768e7ab95bacad278c phambien <bpham9641@gmail.com> 1782200080 +0700	merge origin/main: Fast-forward
90074eac34fa7ce7b785d6768e7ab95bacad278c d057dd62c338b4dc5d71a6437c9df42ea6876dc8 phambien <bpham9641@gmail.com> 1782990624 +0700	commit: feat: upgrade socket.js with roles, rooms, and chat events
d057dd62c338b4dc5d71a6437c9df42ea6876dc8 06fe6447c0d27b0ef61c3cb3b1499cc7efacde71 phambien <bpham9641@gmail.com> 1782991391 +0700	commit (merge): Merge branch 'main' into main: resolve socket conflict by keeping local chat events
06fe6447c0d27b0ef61c3cb3b1499cc7efacde71 ab2830f3e478f36ee412f698da005fb244faa5e4 phambien <bpham9641@gmail.com> 1782992024 +0700	commit: feat: merge db chat with realtime UX features
ab2830f3e478f36ee412f698da005fb244faa5e4 b5eb9ed52221c6bcbb61201d69d3b2558ecc05c0 phambien <bpham9641@gmail.com> 1784618214 +0700	commit (merge): Resolve merge conflict in utils/socket.js
b5eb9ed52221c6bcbb61201d69d3b2558ecc05c0 8f0320db33cac065087a06f63afff17fe956e4c2 phambien <bpham9641@gmail.com> 1784618267 +0700	commit: Resolve merge conflict from stash pop in imageMap.json
8f0320db33cac065087a06f63afff17fe956e4c2 2b69d3ecccfb8a505eff86672fa4d6e45789a247 phambien <bpham9641@gmail.com> 1785165213 +0700	commit: Fix Google auth bypass, sorting logic, and other optimizations
2b69d3ecccfb8a505eff86672fa4d6e45789a247 1b562cd74f9b938abdebf8b7fcf25b2476768e6b phambien <bpham9641@gmail.com> 1785165229 +0700	pull --no-rebase: Merge made by the 'ort' strategy.
