Skip to content
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

University name fixed #18

Open
wants to merge 145 commits into
base: main
Choose a base branch
from
Open

University name fixed #18

wants to merge 145 commits into from

Conversation

nadeen-maree
Copy link

No description provided.

andalusm and others added 30 commits January 15, 2024 14:29
@andalusm
Update README.md
2764b73
@andalusm
Added logo file
5626c5f
@andalusm
Update README.md
d6045d7
@reemodo
Update package-lock.json to add bootstrap package
0420951
@nadeen-maree
Update and rename DataModel.js to ActivityModel.js
f5a9a51
@SujoodEldda
changing names
70870da
@nadeen-maree
Update index.html
fe9cd7a
@SujoodEldda
Merge branch 'main' of https://github.com/reemodo/Amani
b1aa972
@reemodo
Rename api.js to activitiesApi.js
f076ba2
@nadeen-maree
Create ActivityController.js
caf6af9
@nadeen-maree
Update main.js
5b24bb3
@nadeen-maree
Update main.js
44c07c8
@nadeen-maree
Update ActivityController.js
13036e0
@SujoodEldda
removing things
d8ce657
@SujoodEldda
Merge branch 'main' of https://github.com/reemodo/Amani
6c6bb3e
@SujoodEldda
Add files via upload
5a3ffc1
@SujoodEldda
Delete user.JSON
6175cc3
@SujoodEldda
Add files via upload
c783fe1
@reemodo
Update package.json
a68db23
@reemodo
Update .gitignore to ignore any edition in package and package-lock.json
0312294
@reemodo
edit package-lock and package to meet our requirements
c0872b4
@reemodo
add dist/models dir
77f668f
@reemodo
add server changes
ef88dcc
@reemodo
change api route
24a8833
@SujoodEldda
adding DBMangaer.js
65c2bd5
@SujoodEldda
adding the connectToDB function
c479d91
@andalusm
Added main html page with correct styles
471cd95
@reemodo
Merge pull request #1 from reemodo/DB-Branch
91194bf 
Db branch
@andalusm
Merge branch 'main' of https://github.com/reemodo/Amani
d63f8f2
@reemodo
Merge branch 'main' into serverFile
7f59a8b
andalusm and others added 29 commits January 16, 2024 19:02
@andalusm
Merge branch 'main' into myActivities
a713bfd
@Noor-n204
Merge pull request #30 from reemodo/myActivities
96ac77b 
Added My activities handlebar
@andalusm
Fixed generater error
4c399c2
@andalusm
Merge branch 'main' into FixedGeneraterData
24eda60
@andalusm
Merge pull request #31 from reemodo/FixedGeneraterData
2a860e2 
Fixed generater error
@reemodo
add activity feat
9ebd260
@reemodo
Merge pull request #32 from reemodo/handlingActivitesViewFeat
748f0ec 
add activity feat
@andalusm
Fixed filter button
541507e
@Noor-n204
Merge pull request #33 from reemodo/Buttonfix
b869c9e 
Fixed filter button
@reemodo
Revert "Fixed filter button"
a5a012c
@reemodo
Merge pull request #34 from reemodo/revert-33-Buttonfix
919cd6f 
Revert "Fixed filter button"
@Noor-n204
fix add activity
9e94b8e
@Noor-n204
Merge pull request #35 from reemodo/fixAddActivity
dba1113 
fix add activity
@reemodo
debug the project
342d399
@reemodo
debug
efd14de
@andalusm
Merge pull request #36 from reemodo/addActivity
e108e4d 
Add activity
@andalusm
Fixed edit activity bug and fixed the filter bug and preferred gender…
8081642 
… bug
@reemodo
Merge pull request #37 from reemodo/FixedFrontEnd
3d01e99 
Fixed edit activity bug and fixed the filter bug and preferred gender…
@SujoodEldda
changing dummy data
a9ecefc
@SujoodEldda
Merge pull request #38 from reemodo/dummyData
3030236 
changing dummy data
@reemodo
bug delete
964ee25
@reemodo
Merge pull request #39 from reemodo/bugDelete
3b305df 
bug delete
@SujoodEldda
changing dummy data of activity
5b10f92
@SujoodEldda
Merge pull request #40 from reemodo/dummyData
6fe212c 
changing dummy data of activity
@andalusm
Added scroll up button
680cb45
@andalusm
Merge pull request #41 from reemodo/AddedTopButton
d109078 
Added scroll up button
@Noor-n204
added user university API
26851c8
@Noor-n204
Merge pull request #42 from reemodo/universityAPI
6c80316 
added user university API
@nadeen-maree
university name fixed
d2b8d8f
@andalusm andalusm deleted the universityNameFixed branch January 18, 2024 08:11
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.
5 participants
@nadeen-maree @andalusm @reemodo @SujoodEldda @Noor-n204