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

Merging development to main branch #631

Merged
merged 341 commits into from
Dec 1, 2023
Merged

Merging development to main branch #631

merged 341 commits into from
Dec 1, 2023

Conversation

elifkizilky
Copy link
Contributor

@elifkizilky elifkizilky commented Dec 1, 2023 •
edited
Loading

We need to merge main with development to integrate our changes.

kardelenerdal and others added 30 commits November 19, 2023 15:35
@kardelenerdal
default image for games page
804e534
@Hakkush-07
Comment entity and writeComment and likeComment endpoints
7a9cc08
@melihgezerr
review create flow
13a94f2
@frknlke
Merge pull request #470 from bounswe/feature/MB/459/show_hide_password
acb04f3 
feature/MB/459/show_hide_password
@melihgezerr
end of create flow
9213f69
@melihgezerr
end of like and dislike flows
2513ed0
@melihgezerr
end of delete flow
0a17166
@melihgezerr
end of edit flow
14ec4b2
@melihgezerr
end of all flows
9b60ebc
@kardelenerdal
changed the duration of pop up message
885328d
@Hakkush-07
add timestamp, parentId fields and dislikeComment endpoint to Comment…
d88f00e 
… entity
@Hakkush-07
take comment related things to separate controller and service
725db2f
@omersafakbebek
Merge pull request #490 from bounswe/feature/482/BE/review-entity-and…
9c791f9 
…-create-flow

feature/482/BE/review-entity-and-create-flow
@Hakkush-07
add deleteComment and editComment endpoints
ff27aa9
@Hakkush-07
Merge branch 'development' into feature/BE/478/comment
962f3b2
@Hakkush-07
remove unused imports
56cbe69
@omersafakbebek
fixed an sql bug (backend)
8c5748c
@haticerk
Merge pull request #484 from bounswe/feature/MB/460/create_game_page
ea5f7e4 
feature/MB/460/create_game_page
@omersafakbebek
added follow info for game list
e8ea810
@omersafakbebek
fix test error
a44644b
@yunusemrealtug
added profile update modal, also mock steam external link
4dccaef
@frknlke
#466 tokenization for mobile app
1f3beaa
@yunusemrealtug
Merge branch 'development' of https://github.com/bounswe/bounswe2023g…
c565f8c 
…roup7 into feature/FE/464/edit-user
@yunusemrealtug
profile page implementation
c00fc0b
@elifkizilky
added forums page and related icon at sidebar
f14f06f
@elifkizilky
Merge branch 'development' of https://github.com/bounswe/bounswe2023g…
97680b8 
…roup7 into feature/FE/473-475/forums-page-sidebar
@senaal
feature: game page converted to abstract to fill it according to sele…
fbc4375 
…cted game. Some styling will be fixed.
@senaal
Merge pull request #493 from bounswe/feature/MB/466/adding-tokenizati…
7c4c45f 
…on-mobile

#466 tokenization for mobile app
@frknlke @senaal
#466 tokenization for mobile app
53de993
@senaal
tokenization for game page
9629b6b
senaal and others added 17 commits November 27, 2023 20:41
@senaal
Merge pull request #606 from bounswe/feature/MB/522/entity_pages
9577645 
Create Entity page is implemented
@senaal
Merge pull request #607 from bounswe/bugfix/MB/605/like_dislike
a986f1f 
Fixed the Like/Dislike for Forum
@elifkizilky
completed enhancements and fixed bugs
e767767
@yunusemrealtug
Merge pull request #608 from bounswe/feature/FE/593/enhancements
09780e5 
completed enhancements and fixed bugs
@haticerk
Update README.md
c395b9f
@yunusemrealtug
bugfix for link
67999fd
@haticerk
updated the mobile readme
cbc997c
@elifkizilky
Merge pull request #611 from bounswe/feature/FE/609/bugfix-link
841f745 
bugfix for link
@yunusemrealtug
bugfixed
e204863
@kardelenerdal
Merge pull request #610 from bounswe/feature/MB/596/create-apk
16dc45d 
Update README.md with the new .apk Link
@yunusemrealtug
checked link forumtopic
6d8f7ba
@elifkizilky
Merge pull request #612 from bounswe/feature/FE/609/bugfix-link
8fcb100 
bugfixed for other link
@haticerk
Update README.md
997f4e7
@kardelenerdal
Merge pull request #614 from bounswe/feature/MB/613/readme_update
2de998a 
Version Update README.md
@haticerk
Create m2_group7.md
317cb0b
@haticerk
Update m2_group7.md
c3b6f8c
@kardelenerdal
Merge pull request #630 from bounswe/feature/MB/629/m2_report
fcd0790 
Create m2_group7.md
@elifkizilky elifkizilky added type : development Updates and enhancements on the application priority : high Job needs to be completed at most two days status : need_review This issue is needed to review effort : moderate This issue can take some time milestone Related to milestone reports labels Dec 1, 2023
@elifkizilky elifkizilky added this to the Milestone 2 Report milestone Dec 1, 2023
yunusemrealtug
yunusemrealtug approved these changes Dec 1, 2023
View reviewed changes
Copy link
Contributor

@yunusemrealtug yunusemrealtug left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for all effort

haticerk
haticerk approved these changes Dec 1, 2023
View reviewed changes
Copy link
Contributor

@haticerk haticerk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I approve the merge!

@haticerk haticerk merged commit 8bf3e44 into main Dec 1, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@haticerk haticerk haticerk approved these changes

@yunusemrealtug yunusemrealtug yunusemrealtug approved these changes

@kardelenerdal kardelenerdal Awaiting requested review from kardelenerdal

Assignees
No one assigned
Labels
effort : moderate This issue can take some time milestone Related to milestone reports priority : high Job needs to be completed at most two days status : need_review This issue is needed to review type : development Updates and enhancements on the application
Projects
None yet
Milestone
Milestone 2 Report
Development

Successfully merging this pull request may close these issues.