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

Merge to main #866

Merged
merged 377 commits into from
Dec 26, 2023
Merged

Merge to main #866

merged 377 commits into from
Dec 26, 2023

Conversation

elifkizilky
Copy link
Contributor

To move the whole changes in our development branch to main branch

yunusemrealtug and others added 30 commits December 18, 2023 21:44
@yunusemrealtug
solved conflict and added tags
743d7f4
@kardelenerdal
Merge pull request #745 from bounswe/feature/MB/744/merge-user-search…
2b07fd2 
…-to-main-search-page-mobile

#744 merged users search into main search page - mobile app
@kardelenerdal
Merge pull request #736 from bounswe/feature/MB/689/fixing-image-size…
95797be 
…-problem-mobile-app

#689 image scale problem for games resolved in the mobile app.
@kardelenerdal
Merge pull request #684 from bounswe/bugfix/MB/605/like-dislike-2
ba6d566 
Fixed Like Dislike Bug
@mtkamiloglu
Add GroupPage route to App.js
36836ed
@mtkamiloglu
Merge remote-tracking branch 'origin' into feature/FE/650/group-page
ed8f5d1
@omersafakbebek
added request logger
80da332
@omersafakbebek
Merge branch 'development' of https://github.com/bounswe/bounswe2023g…
d2200db 
…roup7 into development
@yunusemrealtug
maxnumberofmembers bugfix
11fd222
@yunusemrealtug
membercheck fixed
7e52abe
@mtkamiloglu
Merge pull request #747 from bounswe/feature/FE/708/create-group
f57c2a2 
create group instructed
@mtkamiloglu
Merge remote-tracking branch 'origin' into feature/FE/650/group-page
6e11ed3
@mtkamiloglu
created group page
393da3e
@mtkamiloglu
Refactor code to improve performance and readability
ea2ee8a
@mtkamiloglu
Add Edit Group functionality and dialog
be9dc75
@mtkamiloglu
Refactor GroupPage layout and add tags
e51c143
@mtkamiloglu
Add secondary text to display admin status in member list
82bafcc
@haticerk
removed the unused platforms
73dfb56
@mtkamiloglu
Remove unused state variables and optimize API calls
389b8b8
@kardelenerdal
annotation start
a020517
@yunusemrealtug
Merge pull request #749 from bounswe/feature/FE/650/group-page
d0486a0 
Feature/fe/650/group page
@elifkizilky
Create lab_report_10.md
d4001c6
@yunusemrealtug
Update lab_report_10.md
288fca9
@kardelenerdal
Update lab_report_10.md
519549f
@haticerk
Update lab_report_10.md
1c393f6
@mtkamiloglu
Added last week's and this week's jobs
ed019ca
@haticerk
Merge pull request #763 from bounswe/lab-report-10
8ccc861 
Create lab_report_10.md
@elifkizilky
added footer
9d48ff4
@omersafakbebek
added annotation service
6080865
@omersafakbebek
added annotation endpoints
cc5e75d
elifkizilky and others added 24 commits December 25, 2023 21:13
@elifkizilky
Merge pull request #855 from bounswe/feature/FE/797/story-guide-annot…
24e0ae8 
…ation

Feature/fe/797/story guide annotation
@mtkamiloglu
detailed search added to the forums page
36b26f3
@yunusemrealtug
Merge pull request #856 from bounswe/enhancement/FE/727/UI-enhancement
32d780b 
Enhancement/fe/727/UI enhancement
@omersafakbebek
Create README.md
c9dcedc
@omersafakbebek
Update README.md
44444aa
@omersafakbebek
Update README.md
dd4f515
@elifkizilky
solved conflicts in the search for details search
f076b70
@elifkizilky
Merge pull request #857 from bounswe/feature/FE/649/detailed-search
e5a1459 
Feature/fe/649/detailed search
@elifkizilky
Added group tab to the game page
80e2c74
@yunusemrealtug
Merge pull request #858 from bounswe/feature/FE/649/detailed-search
75e6e2a 
Added group tab to the game page
@elifkizilky
Update README.md
c28d777
@omersafakbebek
Update README.md
2afd81b
@elifkizilky
Update README.md
f3829cd
@haticerk
fixes
6af56c3
@senaal
Merge pull request #859 from bounswe/feature/MB/999/final_push
2623c7c 
Final Fixes
@omersafakbebek
Update README.md
9500006
@mtkamiloglu
Update ForumTopic import and usage
9803502
@elifkizilky
Merge pull request #860 from bounswe/feature/FE/649/detailed-search
b7527c5 
Update ForumTopic import and usage
@mtkamiloglu
Refactor handleDescriptionChange in CreateEntityForm.js
96812cc
@elifkizilky
Merge pull request #861 from bounswe/feature/FE/649/detailed-search
4e6e6b9 
Refactor handleDescriptionChange in CreateEntityForm.js
@haticerk
final fix to .apk
5c68482
@senaal
Merge pull request #862 from bounswe/feature/MB/998/final_fix
611da9a 
Final Fix in .apk File
@elifkizilky
edit comment fixed
f9cc442
@elifkizilky
Merge pull request #864 from bounswe/feature/FE/654-655/like-dislike-…
479b05c 
…delete-update-thread-comment

HOTFIX: edit comment fixed
@elifkizilky elifkizilky added the milestone Related to milestone reports label Dec 26, 2023
@elifkizilky elifkizilky merged commit 54559ff into main Dec 26, 2023
2 checks passed
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
milestone Related to milestone reports
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@elifkizilky @yunusemrealtug @kardelenerdal @mtkamiloglu @omersafakbebek @haticerk @melihgezerr @frknlke @senaal @tacettinburakeren