0000000000000000000000000000000000000000 6b70fb9c9a4e37dd0fda5c5daf7502a4cd0118ef Marben Villaflor <villaflormarbenc@gmail.com> 1729733843 +0800	branch: Created from refs/remotes/origin/develop-marbs
6b70fb9c9a4e37dd0fda5c5daf7502a4cd0118ef 0e0b22e6fc200964e3fc48168a56b5eed43295de Marben Villaflor <villaflormarbenc@gmail.com> 1729733965 +0800	rebase (finish): refs/heads/develop-marbs onto 0e0b22e6fc200964e3fc48168a56b5eed43295de
0e0b22e6fc200964e3fc48168a56b5eed43295de e4e316d35bfdd9f708211fba7b21c48a658367fb Marben Villaflor <villaflormarbenc@gmail.com> 1730844917 +0800	pull: Merge made by the 'ort' strategy.
e4e316d35bfdd9f708211fba7b21c48a658367fb ac72d37a6e59f6584eecd1b64fe71c5287123f80 Marben Villaflor <villaflormarbenc@gmail.com> 1730880760 +0800	commit: updated cors
ac72d37a6e59f6584eecd1b64fe71c5287123f80 8093d817c0596437b00346096a4517301f48eecc Marben Villaflor <villaflormarbenc@gmail.com> 1731050323 +0800	commit: small refactor on authentication
8093d817c0596437b00346096a4517301f48eecc be5cb0d4fca3f674e93dd9a1b21dafa0c5f11ce6 Marben Villaflor <villaflormarbenc@gmail.com> 1731479721 +0800	pull: Fast-forward
be5cb0d4fca3f674e93dd9a1b21dafa0c5f11ce6 974723fdbcab6fac35b38af1d3157c0404d3b552 Marben Villaflor <villaflormarbenc@gmail.com> 1731969907 +0800	pull: Fast-forward
974723fdbcab6fac35b38af1d3157c0404d3b552 fdde65d6b68d2f0863bb6b2e1d1b57473240d87b Marben Villaflor <villaflormarbenc@gmail.com> 1731976529 +0800	commit: working on flight controller function
fdde65d6b68d2f0863bb6b2e1d1b57473240d87b 6c9ca2864a7e42dc1d7cdd6f2dd981f8ba8dce66 Marben Villaflor <villaflormarbenc@gmail.com> 1732087281 +0800	commit: worked on cacert
6c9ca2864a7e42dc1d7cdd6f2dd981f8ba8dce66 8e874a7d29ff2a75f588bcf74e05f032c13dc516 Marben Villaflor <villaflormarbenc@gmail.com> 1732176602 +0800	commit: converting returned data to existing data format
8e874a7d29ff2a75f588bcf74e05f032c13dc516 81de354110faa3244022a1f61de44a6189e7b3c0 Marben Villaflor <villaflormarbenc@gmail.com> 1732179483 +0800	commit: changes update
81de354110faa3244022a1f61de44a6189e7b3c0 f96e92b5119270e7514d16dbf04fc5ce7a8b73e0 Marben Villaflor <villaflormarbenc@gmail.com> 1732180066 +0800	commit: template data tracing
f96e92b5119270e7514d16dbf04fc5ce7a8b73e0 c30653f2abaa70b1301dc77be50b062026fe65fa Marben Villaflor <villaflormarbenc@gmail.com> 1732602497 +0800	pull: Fast-forward
c30653f2abaa70b1301dc77be50b062026fe65fa e22273c2930bcfbd06451f1cc60911f70a04809a Marben Villaflor <villaflormarbenc@gmail.com> 1732691516 +0800	commit: working on displaying item data on the list
e22273c2930bcfbd06451f1cc60911f70a04809a c30653f2abaa70b1301dc77be50b062026fe65fa Marben Villaflor <villaflormarbenc@gmail.com> 1732692926 +0800	reset: moving to c30653f2abaa70b1301dc77be50b062026fe65fa
c30653f2abaa70b1301dc77be50b062026fe65fa 97254dd01d06f3cf8df1d397bbd703b9979ba3e4 Marben Villaflor <villaflormarbenc@gmail.com> 1732692958 +0800	commit: working on displaying item data on the list
97254dd01d06f3cf8df1d397bbd703b9979ba3e4 4e2e7cea518768a8794078e39faff325b5978e8a Marben Villaflor <villaflormarbenc@gmail.com> 1733212201 +0800	pull: Fast-forward
4e2e7cea518768a8794078e39faff325b5978e8a 5abdeeb9c3c3e2b98070ab8ce6fb526c33ff9947 Marben Villaflor <villaflormarbenc@gmail.com> 1733215631 +0800	commit: workingon displaying data using vue
5abdeeb9c3c3e2b98070ab8ce6fb526c33ff9947 528a7fb83366776309258ee9cac4e4ebea0f236f Marben Villaflor <villaflormarbenc@gmail.com> 1733297434 +0800	commit: calculated departure and arrival time duration for dialog data
528a7fb83366776309258ee9cac4e4ebea0f236f f5d21519d08765a0ae2212138409d5131850e348 Marben Villaflor <villaflormarbenc@gmail.com> 1733301789 +0800	commit: js update
f5d21519d08765a0ae2212138409d5131850e348 d9d7838f34d59025441d19b6175fdc62aa9c981d Marben Villaflor <villaflormarbenc@gmail.com> 1733781313 +0800	pull: Fast-forward
d9d7838f34d59025441d19b6175fdc62aa9c981d c55652fcc437f2a05c38ea6b2821d0a7545f64ad Marben Villaflor <villaflormarbenc@gmail.com> 1733803766 +0800	commit: updated modal
c55652fcc437f2a05c38ea6b2821d0a7545f64ad c53c989309204ee04a5a985c756795137100072a Marben Villaflor <villaflormarbenc@gmail.com> 1733988403 +0800	commit: update flight
c53c989309204ee04a5a985c756795137100072a de503b28186c4dbc11d68d73d786ef33cc484382 Marben Villaflor <villaflormarbenc@gmail.com> 1734503637 +0800	commit: working on hotel api integration
de503b28186c4dbc11d68d73d786ef33cc484382 c115de0da5486432fec7aab118de8c8a9884e7f8 Marben Villaflor <villaflormarbenc@gmail.com> 1734505405 +0800	commit: geting hotel codes and city list
c115de0da5486432fec7aab118de8c8a9884e7f8 4421611e5d985c4266faba2c3b91048fdebdef3b Marben Villaflor <villaflormarbenc@gmail.com> 1735871102 +0800	pull: Fast-forward
4421611e5d985c4266faba2c3b91048fdebdef3b beb854e823677f37b11bbe12cdcdef816189fb4e Marben Villaflor <villaflormarbenc@gmail.com> 1735888736 +0800	commit: working on hotel and flight api
beb854e823677f37b11bbe12cdcdef816189fb4e 50712c1e47a96719a0c32083b80f0803a905ad2b Marben Villaflor <villaflormarbenc@gmail.com> 1736235003 +0800	commit: update
50712c1e47a96719a0c32083b80f0803a905ad2b 0639024e2729244f54739178f6fab7767ebab8b6 Marben Villaflor <villaflormarbenc@gmail.com> 1736293116 +0800	commit: setting error response
0639024e2729244f54739178f6fab7767ebab8b6 865c8e2f27ee776a1370c549e7bdd61f545aed63 Marben Villaflor <villaflormarbenc@gmail.com> 1736302507 +0800	commit: hotel updates
865c8e2f27ee776a1370c549e7bdd61f545aed63 425008aef3cba58e31c1639700c026e121a4ab7e Marben Villaflor <villaflormarbenc@gmail.com> 1736303869 +0800	commit: update
425008aef3cba58e31c1639700c026e121a4ab7e 6d3d923bc470ebb77ff43b627c8da6dd8f31cde7 Marben Villaflor <villaflormarbenc@gmail.com> 1736320482 +0800	commit: Update
6d3d923bc470ebb77ff43b627c8da6dd8f31cde7 0ae54acf9e7f567f85a5c3a130a54d9f8a1de4e7 Marben Villaflor <villaflormarbenc@gmail.com> 1736559819 +0800	commit: updated theme
0ae54acf9e7f567f85a5c3a130a54d9f8a1de4e7 72343db0ded4e06f7a24ab8b51013fdee5fa84a3 Marben Villaflor <villaflormarbenc@gmail.com> 1736559910 +0800	commit: update
72343db0ded4e06f7a24ab8b51013fdee5fa84a3 7259c92a9a986b9ce04c92988f9ea686dd446ffb Marben Villaflor <villaflormarbenc@gmail.com> 1736841306 +0800	commit: updating footer
7259c92a9a986b9ce04c92988f9ea686dd446ffb 206d1467fae4959f8c53ca034271be7f9b6cccd1 Marben Villaflor <villaflormarbenc@gmail.com> 1736846920 +0800	commit: Updated footer
206d1467fae4959f8c53ca034271be7f9b6cccd1 36733bc07fb6639dff3c7d4609136d6cc84e7ad6 Marben Villaflor <villaflormarbenc@gmail.com> 1736891987 +0800	commit: code cleanup
36733bc07fb6639dff3c7d4609136d6cc84e7ad6 3196d2958a8efedcc671cbb2f250a45f4e89b880 Marben Villaflor <villaflormarbenc@gmail.com> 1736904387 +0800	commit: Update
3196d2958a8efedcc671cbb2f250a45f4e89b880 21a5c4aa79332b20053b0c031c27157715f25cfa Marben Villaflor <villaflormarbenc@gmail.com> 1736913864 +0800	commit: update
21a5c4aa79332b20053b0c031c27157715f25cfa 149cb26f2ef5c3ec707fb269c4e18d333f03917d Marben Villaflor <villaflormarbenc@gmail.com> 1736927537 +0800	commit: working on booking details
149cb26f2ef5c3ec707fb269c4e18d333f03917d 621dba3f01cdee421361e4abc54c793f4e2df27b Marben Villaflor <villaflormarbenc@gmail.com> 1737090627 +0800	commit: working on mock data for booking
