Skip to content

final merge -for review 1 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
P-himaja wants to merge 89 commits into
base: main
Choose a base branch
from
Open

final merge -for review 1 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
a50da86
Deleted all files present
P-himaja Feb 8, 2024
22de529
All files inserted
P-himaja Feb 8, 2024
ddd1160
All files deleted again
P-himaja Feb 8, 2024
48a8c8d
Backend files
P-himaja Feb 8, 2024
b773fed
editing files
P-himaja Feb 9, 2024
877ef1c
Merge branch 'main' into login-test
P-himaja Feb 9, 2024
833d8b4
Merge pull request #2 from P-himaja/login-test
P-himaja Feb 9, 2024
10a080d
last commit
P-himaja Feb 9, 2024
3792390
Merge branch 'main' into login-test
P-himaja Feb 9, 2024
d7562fc
Merge pull request #3 from P-himaja/login-test
P-himaja Feb 9, 2024
1ec15a8
Update payment.html
P-himaja Feb 10, 2024
7434a13
Merge branch 'main' into main
P-himaja Feb 10, 2024
877555c
filter basic added
P-himaja Mar 8, 2024
fd74afc
update
anisha1910git Mar 8, 2024
f57b2eb
login updated
P-himaja Mar 8, 2024
fd3426a
search button added to the files
wafiyaalim Mar 8, 2024
c231e4c
Merge branch 'main' of https://github.com/P-himaja/MINI-PROJECT
wafiyaalim Mar 8, 2024
2853f12
edited search box
P-himaja Mar 9, 2024
5c7c6d2
upload button working
P-himaja Mar 9, 2024
8236eb8
update
P-himaja Mar 9, 2024
2aa97ac
update
P-himaja Mar 9, 2024
05896e5
update
P-himaja Mar 9, 2024
36d77fa
update
P-himaja Mar 9, 2024
a35025d
update
wafiyaalim Mar 10, 2024
f0cc037
Merge branch 'main' of https://github.com/P-himaja/MINI-PROJECT
wafiyaalim Mar 10, 2024
b7b2b29
update
wafiyaalim Mar 15, 2024
61e1358
update
wafiyaalim Mar 15, 2024
77a8fff
update
wafiyaalim Mar 15, 2024
a46cf00
update
wafiyaalim Mar 15, 2024
c053a06
update
wafiyaalim Mar 15, 2024
e517de0
added hotel images
P-himaja Mar 23, 2024
cfcde57
hotel images_working
P-himaja Mar 23, 2024
9b54acc
update
wafiyaalim Mar 23, 2024
47dfd56
Merge branch 'main' of https://github.com/P-himaja/MINI-PROJECT
wafiyaalim Mar 23, 2024
5672389
Revert "hotel images_working"
P-himaja Mar 23, 2024
4d9c76c
update
wafiyaalim Mar 23, 2024
d99ba13
update
wafiyaalim Mar 23, 2024
b591e42
Revert "hotel images_working"
P-himaja Mar 23, 2024
aaa9756
update
wafiyaalim Mar 23, 2024
ef93981
finallu working hotel images
P-himaja Mar 23, 2024
08c01d8
Merge branch 'main' of https://github.com/P-himaja/MINI-PROJECT
P-himaja Mar 23, 2024
7f45694
updated iternary css
P-himaja Mar 23, 2024
e627c0f
update
wafiyaalim Mar 23, 2024
fbda2c1
sorting works,hotel html added
P-himaja Mar 23, 2024
bd47627
update
wafiyaalim Mar 24, 2024
4c8658b
update
wafiyaalim Mar 24, 2024
e56d2db
update
wafiyaalim Mar 24, 2024
9202caf
rating added and sorting according to rating added
P-himaja Mar 24, 2024
fc5dfde
Merge branch 'main' of https://github.com/P-himaja/MINI-PROJECT
P-himaja Mar 24, 2024
6583348
update
wafiyaalim Mar 24, 2024
3fd9563
update
wafiyaalim Mar 24, 2024
5fcc173
dashboard added
P-himaja Mar 24, 2024
7d57b82
chatbot
anisha1910git Mar 25, 2024
0394152
finish travel button
wafiyaalim Mar 25, 2024
81947e6
feadback
anisha1910git Mar 25, 2024
40a8e32
update
anisha1910git Mar 25, 2024
dc3c53e
carousel pictures
wafiyaalim Apr 10, 2024
c078fe1
carousel pictures updates
wafiyaalim Apr 10, 2024
19a2dce
blog.html
anisha1910git Apr 10, 2024
167e15f
carousel
wafiyaalim Apr 10, 2024
fc89283
carousel fully updated
wafiyaalim Apr 10, 2024
7e0a3c9
file structure chnaged
anisha1910git Apr 11, 2024
3765c97
Merge branch 'main' of https://github.com/P-himaja/MINI-PROJECT
anisha1910git Apr 11, 2024
b893519
footer fixed
wafiyaalim Apr 11, 2024
f4d41bf
broken links fixed
anisha1910git Apr 11, 2024
15d112e
Merge branch 'main' of https://github.com/P-himaja/MINI-PROJECT
anisha1910git Apr 11, 2024
aeb7ff1
header and footer
wafiyaalim Apr 11, 2024
c1bd9cb
Merge branch 'main' of https://github.com/P-himaja/MINI-PROJECT
anisha1910git Apr 11, 2024
037b8d4
about us arrow fixed
anisha1910git Apr 11, 2024
9da1a5d
header footer and t and c
wafiyaalim Apr 11, 2024
0cc1249
Merge branch 'main' of https://github.com/P-himaja/MINI-PROJECT
wafiyaalim Apr 11, 2024
1075d33
Merge branch 'main' of https://github.com/P-himaja/MINI-PROJECT
anisha1910git Apr 11, 2024
3dbdeaa
all connectivity
wafiyaalim Apr 11, 2024
31a06db
Merge branch 'main' of https://github.com/P-himaja/MINI-PROJECT
wafiyaalim Apr 11, 2024
119a706
push
wafiyaalim Apr 11, 2024
20d85e1
edit
anisha1910git Apr 11, 2024
32069f0
Merge branch 'main' of https://github.com/P-himaja/MINI-PROJECT
anisha1910git Apr 11, 2024
3e72d75
nothing works
wafiyaalim Apr 12, 2024
91d0eb5
weather
anisha1910git Apr 12, 2024
a8bee67
broken links fixed
anisha1910git Apr 12, 2024
98dfdc3
dashboard works
P-himaja Apr 12, 2024
58167cd
Merge branch 'main' of https://github.com/P-himaja/MINI-PROJECT
P-himaja Apr 12, 2024
a4d1296
header linked
P-himaja Apr 12, 2024
df4f640
last header update
P-himaja Apr 12, 2024
d33c7e3
updates
anisha1910git Apr 12, 2024
0938f3f
Merge branch 'main' of https://github.com/P-himaja/MINI-PROJECT
anisha1910git Apr 12, 2024
7c7fc59
wheel
anisha1910git Apr 13, 2024
e0287d4
profilephoto
anisha1910git Apr 13, 2024
a224b87
wheel
anisha1910git Apr 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
{
"liveServer.settings.port": 5502
"liveServer.settings.port": 5502,
"files.associations": {
"*.embeddedhtml": "html",
"N_QUEEN.C": "cpp"
}
}
Binary file added 10 TravelHub_AbhaTewari.mp4
View file
Open in desktop
Binary file not shown.
Loading