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

Fix friends bug #159

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

Fix friends bug #159

wants to merge 102 commits into from

Conversation

somunachima
Copy link

No description provided.

xengeo and others added 30 commits November 14, 2023 11:52
@xengeo
Initial commit - add test data
830a95b
@NatalieJClark
Update lombok version
07f7ab4
add route for users show page and html file for users show
94c3e5f
write tests for users controller
81cbd3c
@davidsholoye
Merge pull request #1 from davidsholoye/users_controller
a924737 
Users controller
@NatalieJClark
Update post model fields and add sign up button
b4418a9
@NatalieJClark
Merge pull request #2 from davidsholoye/navigation
6fd6da6 
Navigation
@xengeo
update column types to bigint and complete comment model implementation
51dd9c6
@xengeo
Merge pull request #3 from davidsholoye/add_comment_model
2546362 
update column types to bigint and complete comment model implementation
@xengeo
update V11 migration file for column type change
6f562d9
@xengeo
Merge pull request #4 from davidsholoye/add_comment_model
b7f4cc6 
update V11 migration file for column type change
@davidsholoye
Add header and links to profile, friends and timeline. And signout
533486a
@xengeo
tested sign up features, checked for empty credentials
95c4d7d
@xengeo
Merge pull request #5 from davidsholoye/signup-testing
3034112 
tested sign up features, checked for empty credentials
@davidsholoye
Friend request system with errors
a1227ea
@xengeo
posts appear by newest first
41ffd26
@xengeo
Merge pull request #6 from davidsholoye/order-posts
e182e72 
posts appear by newest first
@zakkariyaa
add friend controller and friend model
1cbb2be
Add routes to friend controller and update model to be able to make a…
d40fdb2 
… friend request from current user
Merge changes with main
bd2552f
@NatalieJClark
Merge pull request #7 from davidsholoye/userControllerTesting
ae1460e 
User controller testing
@xengeo
Rename V12__alter_friends_table.sql to V13__alter_friends_table.sql
7eec94b 
update migration file version number due to clash
@zakkariyaa
rename v12 and v13 to v12 and v14
920d81a
@zakkariyaa
Merge pull request #8 from davidsholoye/fixdb
303c1e8 
rename v12 and v13 to v12 and v14
@NatalieJClark
Delete flyway versions
ef6da3e
@NatalieJClark
Add user_id to new post
b6359dc
@NatalieJClark
Resolved conflicts
5c2da42
@zakkariyaa
fixed the logout issue by changing the anchor tag to form
1d57d36
@NatalieJClark
Resolved conflicts
f3d66d2
@zakkariyaa
Merge pull request #9 from davidsholoye/fix-logout-issue
ea13863 
fixed the logout issue by changing the anchor tag to form
xengeo and others added 30 commits November 23, 2023 12:17
@xengeo
display image and username next to post content on post/index.html
43cfdb4
@xengeo
Merge pull request #20 from davidsholoye/display_username_image_on_post
6ee33d8 
display image and username next to post content on post/index.html
add more styling to timeline/posts index
12d8a12
@somunachima
Merge branch 'main' into timeline-css
9175240
@somunachima
Merge pull request #21 from davidsholoye/timeline-css
39677eb 
add more styling to timeline/posts index
add more styling to friends index page
234aef9
@somunachima
Merge pull request #22 from davidsholoye/friends-css
b99c6b5 
add more styling to friends index page
@davidsholoye
Made changes to the css
b433901
add correct links to navbar to go to current user's profile page
2361673
@somunachima
Merge pull request #24 from davidsholoye/navbar-links
bddf518 
add correct links to navbar to go to current user's profile page
@davidsholoye
Merge branch 'main' into css_changes
47343c7
@davidsholoye
Merge pull request #23 from davidsholoye/css_changes
9f5e860 
Made changes to the css
add correct links to navbar to go to current user's profile page
3ab4d44
@somunachima
Merge pull request #25 from davidsholoye/check-navbar
92c8a01 
add correct links to navbar to go to current user's profile page
@zakkariyaa
like functionality + changes from main'
5594e77
@zakkariyaa
Merge pull request #26 from davidsholoye/like-functionality
6f33b4d 
Like functionality
@zakkariyaa
photo update works
9bf8f75
@NatalieJClark
Fix broken tests
5a944d9
@zakkariyaa
Merge pull request #27 from davidsholoye/post-photo
ddaed85 
photo update works
@NatalieJClark
Merge branch 'main' into create_dockerfile
c3b2b5f
@NatalieJClark
Merge pull request #28 from davidsholoye/create_dockerfile
9c0a21e 
Fix broken tests
@NatalieJClark
Fix photo
04acabd
@NatalieJClark
Fix photo
e9161f9
@zakkariyaa
users can upload photos as posts
08cca0b
@zakkariyaa
merge with changes from main
8adb2c4
@zakkariyaa
Merge pull request #29 from davidsholoye/post-photo2
685f920 
Post photo2
add styling to post-show
c559c47
@somunachima
Merge branch 'main' into posts-show-css
ae783ab
@somunachima
Merge pull request #30 from davidsholoye/posts-show-css
d576eb7 
add styling to post-show
fix bugs in friends
64eed9b
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
@somunachima @xengeo @NatalieJClark @davidsholoye @zakkariyaa