0000000000000000000000000000000000000000 bdde7f2afb25c862bcbfaf927887f9f20f024d4b Francine <flaw0006@student.monash.edu> 1743655112 +1100	clone: from https://git.infotech.monash.edu/UGIE/ugie-2025/team051/team051-app_fit3047_v2.git
bdde7f2afb25c862bcbfaf927887f9f20f024d4b 1c885b62525af6ba59c93b14457f75013cf5b716 Francine <flaw0006@student.monash.edu> 1743655381 +1100	pull: Fast-forward
1c885b62525af6ba59c93b14457f75013cf5b716 636985ef5e468f9519dca2cf9786d6bf260c9de5 Francine <flaw0006@student.monash.edu> 1743845964 +1100	pull: Fast-forward
636985ef5e468f9519dca2cf9786d6bf260c9de5 5516f1508ed0d0963be130bbfb0bd096ffe87bdb Francine <flaw0006@student.monash.edu> 1743866028 +1100	commit: Playing around with homepage style (such as font, colour) - feel free to change
5516f1508ed0d0963be130bbfb0bd096ffe87bdb ecf7a377b171a63b1b85c7322a40811793023371 Francine <flaw0006@student.monash.edu> 1743866182 +1100	commit: Fixing colour for 'About Us'
ecf7a377b171a63b1b85c7322a40811793023371 314f959f350b3b6f0bfaee7bf09eb54a78557f76 Francine <flaw0006@student.monash.edu> 1744021386 +1000	commit: fixing some ui
314f959f350b3b6f0bfaee7bf09eb54a78557f76 7aad9b804a5c8cd4796e57fd2c4f524393802636 Francine <flaw0006@student.monash.edu> 1744021397 +1000	rebase (start): checkout origin/main
7aad9b804a5c8cd4796e57fd2c4f524393802636 6da2f4f84e2f3aadfc62824175927c2138a67bbc Francine <flaw0006@student.monash.edu> 1744021411 +1000	rebase (continue): fixing some ui
6da2f4f84e2f3aadfc62824175927c2138a67bbc 6da2f4f84e2f3aadfc62824175927c2138a67bbc Francine <flaw0006@student.monash.edu> 1744021413 +1000	rebase (finish): returning to refs/heads/main
6da2f4f84e2f3aadfc62824175927c2138a67bbc 19f5f0c6260bb40a38c19701130909683018effd Francine <flaw0006@student.monash.edu> 1744021545 +1000	commit: fixing navbar
19f5f0c6260bb40a38c19701130909683018effd e717f675e0c2575699b4c11b7df2b666f8999bdd Francine <flaw0006@student.monash.edu> 1744021655 +1000	commit: fixing FAQ and copyright design
e717f675e0c2575699b4c11b7df2b666f8999bdd 70a9f23a03942675e0163b7479052117a92c4793 Francine <flaw0006@student.monash.edu> 1744021737 +1000	commit: Fixing social media placement and apps
70a9f23a03942675e0163b7479052117a92c4793 a8acb10974c467a3ba09e4fe83f2d1391b42e64e Francine <flaw0006@student.monash.edu> 1744024623 +1000	commit: Adding font and colour choices to home.css
a8acb10974c467a3ba09e4fe83f2d1391b42e64e 4d9a56f436af7a3ca8e3cd7994766efe537240fc Francine <flaw0006@student.monash.edu> 1744026607 +1000	commit: Adding css styles for contact form to contactform_add.css
4d9a56f436af7a3ca8e3cd7994766efe537240fc 78ae34776841496a2ca09de08bbdc6f64fe42ba6 Francine <flaw0006@student.monash.edu> 1744027336 +1000	commit: Ignore
78ae34776841496a2ca09de08bbdc6f64fe42ba6 b00cef0be750034ae6e56aa852a4a0bfa5f759c7 Francine <flaw0006@student.monash.edu> 1744091738 +1000	pull: Fast-forward
b00cef0be750034ae6e56aa852a4a0bfa5f759c7 810221b91ade50609c42e714c9574ed29c07ec70 Francine <flaw0006@student.monash.edu> 1744095951 +1000	pull: Fast-forward
810221b91ade50609c42e714c9574ed29c07ec70 f4d2afae1b76b4fd8cf3b12572d2d68a7841239f Francine <flaw0006@student.monash.edu> 1744198578 +1000	pull: Fast-forward
f4d2afae1b76b4fd8cf3b12572d2d68a7841239f a9e086ff4bd380a09ab9776b537dce24f8376417 Francine <flaw0006@student.monash.edu> 1744256083 +1000	commit: Putting 'Our Products' into the navigation link, preparing for iteration 2 implementation
a9e086ff4bd380a09ab9776b537dce24f8376417 adab5665fcef4bc871218d081268590d0133f1a6 Francine <flaw0006@student.monash.edu> 1744257116 +1000	pull: Fast-forward
adab5665fcef4bc871218d081268590d0133f1a6 e17387f6516e88ed9f50c586d2313a9896ea0f04 Francine <flaw0006@student.monash.edu> 1744257367 +1000	commit: Commented out 'Forgot Password' option in admin login
e17387f6516e88ed9f50c586d2313a9896ea0f04 7ac902870c032775a4de985935dc951c531f78ea Francine <flaw0006@student.monash.edu> 1744257598 +1000	pull: Fast-forward
7ac902870c032775a4de985935dc951c531f78ea ab4b1f71f88cf59489980b895580321d5533e26c Francine <flaw0006@student.monash.edu> 1744258098 +1000	pull: Fast-forward
ab4b1f71f88cf59489980b895580321d5533e26c a8d9596afc47d12c486be7634fa36537fe00ac9f Francine <flaw0006@student.monash.edu> 1744258204 +1000	commit: Changing to 'manage products' when admin is logged in
a8d9596afc47d12c486be7634fa36537fe00ac9f c18a7138e4cf6a2216419115ee49ca846738c820 Francine <flaw0006@student.monash.edu> 1744258571 +1000	commit: Added css file for manage inquiries
c18a7138e4cf6a2216419115ee49ca846738c820 ce90c54b048f9931bf088f45266a29d873cde3cf Francine <flaw0006@student.monash.edu> 1744366118 +1000	pull: Fast-forward
ce90c54b048f9931bf088f45266a29d873cde3cf f172d039106175595a75e683cfa32f0f1af707ba Francine <flaw0006@student.monash.edu> 1744366197 +1000	commit: Removing Jon's intro
f172d039106175595a75e683cfa32f0f1af707ba 495ea98ad169cb6cd72941b3464031a71aac4deb Francine <flaw0006@student.monash.edu> 1744440045 +1000	pull: Fast-forward
495ea98ad169cb6cd72941b3464031a71aac4deb ae115953d951d8fd804ace39d4b13103a208cbe5 Francine <flaw0006@student.monash.edu> 1744450655 +1000	commit: Changing username, password and database for cpanel.
ae115953d951d8fd804ace39d4b13103a208cbe5 190501800d77b1ed8206a994742fc50c1d54fe8c Francine <flaw0006@student.monash.edu> 1744538911 +1000	commit: fixing schema for contact forms
190501800d77b1ed8206a994742fc50c1d54fe8c 1bb423d115d97f6b6cd3abbfe59c5295a4d8cd8c Francine <flaw0006@student.monash.edu> 1744539005 +1000	pull (start): checkout 1bb423d115d97f6b6cd3abbfe59c5295a4d8cd8c
1bb423d115d97f6b6cd3abbfe59c5295a4d8cd8c b675ecd95e29db61ffa01a50e8b7c9fc0e0831ec Francine <flaw0006@student.monash.edu> 1744539005 +1000	pull (pick): fixing schema for contact forms
b675ecd95e29db61ffa01a50e8b7c9fc0e0831ec b675ecd95e29db61ffa01a50e8b7c9fc0e0831ec Francine <flaw0006@student.monash.edu> 1744539005 +1000	pull (finish): returning to refs/heads/main
b675ecd95e29db61ffa01a50e8b7c9fc0e0831ec 98fa0b9ce84ed07a428b75afe4242c2fea507909 Francine <flaw0006@student.monash.edu> 1744539044 +1000	commit: fixing schema for contact forms
98fa0b9ce84ed07a428b75afe4242c2fea507909 214c39f87607a4c6ef35dbf95c528dccba25957d Francine <flaw0006@student.monash.edu> 1744598906 +1000	commit: Commenting out our products section for next iteration
214c39f87607a4c6ef35dbf95c528dccba25957d 1f87d2ebff3d9ff1fb6c8d656d8859591c2e6f97 Francine <flaw0006@student.monash.edu> 1744601036 +1000	commit: editing ui for manage inquiries to mtch system design
1f87d2ebff3d9ff1fb6c8d656d8859591c2e6f97 0ba93d9ef1bcb29a97ad2de3e6177e5037dd79ca Francine <flaw0006@student.monash.edu> 1744771370 +1000	pull: Fast-forward
0ba93d9ef1bcb29a97ad2de3e6177e5037dd79ca c65c639c35aae76847acd3d4a4b76437343c6f4d Francine <flaw0006@student.monash.edu> 1744863606 +1000	commit: Changing db to local host for testing and development
c65c639c35aae76847acd3d4a4b76437343c6f4d 6f9e404de58527081f19f60d38f0e2a0579212ca Francine <flaw0006@student.monash.edu> 1744863658 +1000	commit: Uncommenting our products
6f9e404de58527081f19f60d38f0e2a0579212ca 462ba31df606b8bdf350c7682fd96a0636fd86d8 Francine <flaw0006@student.monash.edu> 1744864186 +1000	commit: Decreased gap between about us and FAQ section
462ba31df606b8bdf350c7682fd96a0636fd86d8 d841141f72eb8c8bad6acd5b7ccfcea33b308e29 Francine <flaw0006@student.monash.edu> 1744866304 +1000	pull: Fast-forward
d841141f72eb8c8bad6acd5b7ccfcea33b308e29 528faecc985b3216a8262911ebe69d0191c69c6b Francine <flaw0006@student.monash.edu> 1744868651 +1000	pull: Fast-forward
528faecc985b3216a8262911ebe69d0191c69c6b 83081e0e5e30a607767d90c3b6c948dd38f5795e Francine <flaw0006@student.monash.edu> 1744869048 +1000	commit: pushing error 400 page
83081e0e5e30a607767d90c3b6c948dd38f5795e 76147cf5050bc6ed6dacc237267e456475ff54d1 Francine <flaw0006@student.monash.edu> 1744869057 +1000	merge origin/main: Merge made by the 'ort' strategy.
76147cf5050bc6ed6dacc237267e456475ff54d1 39357b1762c0a07d4170a0e3ef4072bdd4938b04 Francine <flaw0006@student.monash.edu> 1745136034 +1000	pull: Fast-forward
39357b1762c0a07d4170a0e3ef4072bdd4938b04 d713dbb4f03d9cf5c5c77be220d2315810ab80ba Francine <flaw0006@student.monash.edu> 1745143766 +1000	commit: Ensuring successful completion of a form redirects back to home page.
d713dbb4f03d9cf5c5c77be220d2315810ab80ba 114c2ea2a0d75be8d3cd3a66070a61b71dbc2f27 Francine <flaw0006@student.monash.edu> 1745145617 +1000	commit: Designing an error page for when an invalid url is entered.
114c2ea2a0d75be8d3cd3a66070a61b71dbc2f27 0f59eae7f320c2160cbc265e08177fd77e7a2dbc Francine <flaw0006@student.monash.edu> 1745146909 +1000	commit: Trying to set up catalogue page, but still not working. Still directing to admin login.
0f59eae7f320c2160cbc265e08177fd77e7a2dbc 08d3645c7f80f2e387b6e14860552f3b99399160 Francine <flaw0006@student.monash.edu> 1745230786 +1000	pull: Fast-forward
08d3645c7f80f2e387b6e14860552f3b99399160 15c01d64614f209d844eee9e0f78d49f1eeada0a Francine <flaw0006@student.monash.edu> 1745232992 +1000	commit: Removing whitespace
15c01d64614f209d844eee9e0f78d49f1eeada0a 492b88e993769901ca9f185b1a8e2021590a3fa5 Francine <flaw0006@student.monash.edu> 1745234241 +1000	commit: Changed catalogue to a grid - looks horrible atm
492b88e993769901ca9f185b1a8e2021590a3fa5 3d27f09a2643f7ea078fdc00d2a76b096266b76b Francine <flaw0006@student.monash.edu> 1745234505 +1000	commit: Commenting out Add to Cart as it is for iteration 2
3d27f09a2643f7ea078fdc00d2a76b096266b76b bb2c32b4ee9b56a53c476554d94fcab425f451cd Francine <flaw0006@student.monash.edu> 1745234779 +1000	commit: Adding style for catalogue into a css file
bb2c32b4ee9b56a53c476554d94fcab425f451cd bfa92745f1a5fb66741084d2fb32e6bb9152223a Francine <flaw0006@student.monash.edu> 1745235062 +1000	commit: Catalogue - Background colour change
bfa92745f1a5fb66741084d2fb32e6bb9152223a 5e4dc8a5d71c7992e09b82c2a508448ac488144e Francine <flaw0006@student.monash.edu> 1745235667 +1000	commit: Catalogue - Further style changes
5e4dc8a5d71c7992e09b82c2a508448ac488144e c140580243430661034dbf32908dd5ce5ec2cfda Francine <flaw0006@student.monash.edu> 1745236101 +1000	commit: Creating a details page where customers can find more details on each product
c140580243430661034dbf32908dd5ce5ec2cfda 816ae38251d4105aeba099548ab5c50e8f1ec007 Francine <flaw0006@student.monash.edu> 1745238390 +1000	commit: Tried to create a function to remove whitespace from contact form entries - failed but made a more detailed error message instead
816ae38251d4105aeba099548ab5c50e8f1ec007 1621064571ed4fc9a1be841fb216b7d1c830b76a Francine <flaw0006@student.monash.edu> 1745241497 +1000	commit: Moved styles for inquiries into css file and further IU editing
1621064571ed4fc9a1be841fb216b7d1c830b76a c0ac479b144fdbb10186443a8dfa3ccacc27237f Francine <flaw0006@student.monash.edu> 1745242886 +1000	commit: Moves styles for product management into a css file and further edits on frontend to match other pages
c0ac479b144fdbb10186443a8dfa3ccacc27237f 5c421024b5d8f9fd3eba9a65f972cf52e9da2b85 Francine <flaw0006@student.monash.edu> 1745243479 +1000	commit: Further edits to the manage products to match manage inquiries page
5c421024b5d8f9fd3eba9a65f972cf52e9da2b85 8fb55705ca24d5eb5eb7c969f1c131923dd1d09f Francine <flaw0006@student.monash.edu> 1745243629 +1000	commit: Made sure products modified and created date is in Australian format, not America.
8fb55705ca24d5eb5eb7c969f1c131923dd1d09f 87c629c08c6320d2e3ea61d42766369507ce037c Francine <flaw0006@student.monash.edu> 1745243841 +1000	commit: Decreased spacing between header and 'add product' button with table
87c629c08c6320d2e3ea61d42766369507ce037c 4f919458d150b4081f5dd08193bb60a7f75656cf Francine <flaw0006@student.monash.edu> 1745244453 +1000	commit: Initialising css file for admin product VIEW action and fixing issue of image not showing.
4f919458d150b4081f5dd08193bb60a7f75656cf e8b1e06ee64ddbba027b935bf525f669de94bc45 Francine <flaw0006@student.monash.edu> 1745246659 +1000	commit: Completing frontend design for VIEW PRODUCT (admin)
e8b1e06ee64ddbba027b935bf525f669de94bc45 1245eca0d819d3820ceb3b0d7934deb973f11d4f Francine <flaw0006@student.monash.edu> 1745248078 +1000	commit: Completing frontend design for ADD PRODUCT function (admin)
1245eca0d819d3820ceb3b0d7934deb973f11d4f c575fd6e5ffb3021c529433c997fb6223cdeaced Francine <flaw0006@student.monash.edu> 1745249523 +1000	commit: Completing frontend design for EDIT PRODUCT function (admin), but the backend is not working, will not let submit
c575fd6e5ffb3021c529433c997fb6223cdeaced 3cb169671a906277e95294daf2948db2ec97b069 Francine <flaw0006@student.monash.edu> 1745251512 +1000	commit: Editing catalogue
3cb169671a906277e95294daf2948db2ec97b069 343745c2dbb0ea5b27a53f4c237b946232c664ad Francine <flaw0006@student.monash.edu> 1745253735 +1000	commit: Trying to fix UI for product details, but having issues with alignment
343745c2dbb0ea5b27a53f4c237b946232c664ad 1785c91d2a0084247212f741b921a7a59c636065 Francine <flaw0006@student.monash.edu> 1745317294 +1000	pull: Fast-forward
1785c91d2a0084247212f741b921a7a59c636065 686980e3e706dbf75ad13994673c15fa7726efb2 Francine <flaw0006@student.monash.edu> 1745320476 +1000	commit: Fixed table size so that all info can be seen without scrolling horizontally.
686980e3e706dbf75ad13994673c15fa7726efb2 a22baa202264eb71c0d74565056d51a1c611ce70 Francine <flaw0006@student.monash.edu> 1745402051 +1000	pull: Fast-forward
a22baa202264eb71c0d74565056d51a1c611ce70 ca02d926f8f982500007219838929a0757cde556 Francine <flaw0006@student.monash.edu> 1745403341 +1000	commit: Adjusted layout of product details page
ca02d926f8f982500007219838929a0757cde556 0089b78d0143eb8595962e2de5c2d4def688891f Francine <flaw0006@student.monash.edu> 1745406004 +1000	pull: Fast-forward
0089b78d0143eb8595962e2de5c2d4def688891f 2b156e8ce676fd9571e2d9023bb05ad533b725db Francine <flaw0006@student.monash.edu> 1745457108 +1000	commit: Changing username, password, and database for cpanel
