WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Sprint 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

Jump to bottom
Open
4mr-Nour wants to merge 157 commits into
base: main
Choose a base branch
from
Open

Sprint 1 #3

4mr-Nour wants to merge 157 commits into from

Conversation

@4mr-Nour
Copy link
Collaborator

@4mr-Nour 4mr-Nour commented Oct 4, 2024

No description provided.

seifdiea and others added 30 commits October 2, 2024 01:38
@seifdiea
Merge pull request #2 from Advanced-computer-lab-2024/main
d610a24 
merging maria's changes
@OmarNasr67
package update
d1ccdac
@malak-hesham1
Malak
bbc10f2 
Malak-1
@OmarNasr67
msh malak
6f26b30 
msh malak-1
@malak-hesham1
Malak and Marina Push
fd168d3 
yarab yshtaghal
@malak-hesham1
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
cb7b24e 
…024/wingGo into Sprint-1
@Marina-Samir-Fahim
marina-seller
6f5c54d
@tasneem003
task 17
1e4bdf6 
still needs testing
@tasneem003
17 done
92c21e1
@seifdiea
Activity model
53b5589
@malak-hesham1
without comment 3nd controller updateSeller
f81a0e8
@malak-hesham1
addedMongoose
f81284a
@OmarNasr67
Requirement 24
77efebc 
Needs to be tested
@OmarNasr67
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
7ebcbd6 
…024/wingGo into Sprint-1
@tasneem003
req 23 p1
757690d
@tasneem003
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
11e9cf1 
…024/wingGo into Sprint-1
@tasneem003
nseet el comma
8e11004
@mennaessam1
mennnaaaaa req 86
2bb5b61
@OmarNasr67
Requirement 25
95e3159 
updated so that the tags can only be:
historic areas, beaches, family-friendly, shopping, budget-friendly
@mennaessam1
menna req 86
8e411fe
@mennaessam1
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
4b9511e 
…024/wingGo into Sprint-1
@seifdiea
CRUD for Activities
768af49 
Thoroughly tested and ready to go.
@tasneem003
task 23
44ce31b
@malak-hesham1
Marie and malak push
b11bb7b
@tasneem003
lesa task 23
6d7dcd6
@tasneem003
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
7a536fd 
…024/wingGo into Sprint-1
@tasneem003
2a5er marra task 23 inshallah
d1b445e
@tasneem003
hashing password task 17
80205b1
@OmarNasr67
Routing and updating controllers
c3689cc
@OmarNasr67
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
53a10b9 
…024/wingGo into Sprint-1
tasneem003 and others added 30 commits October 7, 2024 13:27
@tasneem003
fixing 37
7d5009e
@sylviafaris
last tourguide frontend
8c864d3
@sylviafaris
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
f1cbc04 
…024/wingGo into Sprint-1
@seifdiea
Update advertiserController.js
d3ec83e
@seifdiea
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
c91127b 
…024/wingGo into Sprint-1
@MariaEskaros
Govornor updatedd including tag
d9bb105
@MariaEskaros
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
5d6174b 
…024/wingGo into Sprint-1
@malak-hesham1
updated requirements tourist/guest
b0a0aad
@malak-hesham1
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
c796907 
…024/wingGo into Sprint-1
@mennaessam1
SELLER FRONTEND DONEE
7bdddaa
@mennaessam1
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
2840364 
…024/wingGo into Sprint-1
@sylviafaris
last last tourguide
2140b67
@sylviafaris
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
92e2f1f 
…024/wingGo into Sprint-1
@alikhalid33
req 47
4a14e0b 
filter Itineraries
@OmarNasr67
Fixing Ali's code
414ad02
@OmarNasr67
Updated tags for itineraries not attractions
5c6897e
@seifdiea
Tourist/activities front end is done
bc4a82f
@malak-hesham1
after filter itenararies
3e182a8
@malak-hesham1
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
7983b25 
…024/wingGo into Sprint-1
@malak-hesham1
after removing filter ali
4a1fa4a
@mennaessam1
Register frontend
5f52ac0
@mennaessam1
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
a1703e6 
…024/wingGo into Sprint-1
@tasneem003
error
6be7446
@seifdiea
Finished Products, Historical Places front end
c4252c3
@tasneem003
sort upcoming adjustment, tourist/guest
9b1669e
@seifdiea
Finished itineraries front-end for tourist
0ccf2c3
@malak-hesham1
after sort updated
dc9c371
@malak-hesham1
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
a6ae8f4 
…024/wingGo into Sprint-1
@mennaessam1
admin pic
75b0ec8
@mennaessam1
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
6be4b76 
…024/wingGo into Sprint-1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.