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 dev into my branch #499

Closed
wants to merge 28 commits into from
Closed

merging dev into my branch #499

wants to merge 28 commits into from

Commits on Nov 27, 2023

  1. move MapDemo to MapPage and make VictimMapPage

    @ilgazer
    ilgazer committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    010dfc6 View commit details
    Browse the repository at this point in the history

  2. Update ResqService.kt 

    Fixed after resolving conflicts with dev
    @GulbeycanCagri
    GulbeycanCagri authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    d50ecc0 View commit details
    Browse the repository at this point in the history

  3. #484 Default CORS Configuration is added.

    @alitpc25
    alitpc25 committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    f6a2f40 View commit details
    Browse the repository at this point in the history

  4. implement category tree

    @ilgazer
    ilgazer committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    278b66f View commit details
    Browse the repository at this point in the history

  5. implement fetching resources from backend 

    migrate map page to category tree
    @ilgazer
    ilgazer committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    b46dab3 View commit details
    Browse the repository at this point in the history

  6. fix dropdown bug

    @ilgazer
    ilgazer committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    3b6e53d View commit details
    Browse the repository at this point in the history

  7. Merge pull request #488 from bounswe/feature/frontend_responder 

    Resource Creation is implemented with respect to requirements.
    @ilgazer
    ilgazer authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    9f19378 View commit details
    Browse the repository at this point in the history

  8. Improved the location functionalities. Also added remaining unit test… 

    …s for Request and Need service classes.
    @volcaniqueo
    volcaniqueo committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    32c8afc View commit details
    Browse the repository at this point in the history

  9. Request Role Implementation

    @alperenDagi
    alperenDagi committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    7a5c56b View commit details
    Browse the repository at this point in the history

  10. add vitim page with easy need add button

    @ilgazer
    ilgazer committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    8cf61e6 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'dev' into feature/mobile-482-request-user-role

    @alperenDagi
    alperenDagi authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    7f00242 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #492 from bounswe/feature/BE-392-location-improvement 

    Improved the location functionalities. Also added remaining unit test…
    @alitpc25
    alitpc25 authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    bcc0a48 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #489 from bounswe/bugfix/BE-484-bugfix-backend-cor… 

    …s-error

#484 Default CORS Configuration is added.
    @volcaniqueo
    volcaniqueo authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    8bedace View commit details
    Browse the repository at this point in the history

  14. #484 Default CORS Configuration is added.

    @alitpc25
    alitpc25 committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    dd13585 View commit details
    Browse the repository at this point in the history

  15. #490 AuthService Unit test error fixed.

    @alitpc25
    alitpc25 committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    6cd1dd0 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #494 from bounswe/bugfix/BE-490-authservice-unit-t… 

    …est-fix

Bugfix/be 490 authservice unit test fix
    @volcaniqueo
    volcaniqueo authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    e112135 View commit details
    Browse the repository at this point in the history

  17. fix dropdown for category

    @ilgazer
    ilgazer committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    a89a45d View commit details
    Browse the repository at this point in the history

  18. Merge remote-tracking branch 'origin/dev' into feature/frontend_integ… 

    …rate_map_backend

# Conflicts:
#	resq/frontend/src/App.js
#	resq/frontend/src/pages/MapPage.js
    @ilgazer
    ilgazer committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    ee8d16c View commit details
    Browse the repository at this point in the history

  19. Finalize resource creation

    @HarunErgen
    HarunErgen committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    7b36bec View commit details
    Browse the repository at this point in the history

  20. Revert "when marker is selected, map zooms there" 

    This reverts commit aa517c5
    @ilgazer
    ilgazer committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    2c5ad26 View commit details
    Browse the repository at this point in the history

  21. fix issues caused by merge 

    complete rollback of zoom on click card as it was not working
    @ilgazer
    ilgazer committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    fa0e6b0 View commit details
    Browse the repository at this point in the history

  22. add missing markers

    @ilgazer
    ilgazer committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    d728017 View commit details
    Browse the repository at this point in the history

  23. fixed clicking on card centering the point on map

    @ilgazer
    ilgazer committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    b11fee7 View commit details
    Browse the repository at this point in the history

  24. Update screen text

    @HarunErgen
    HarunErgen committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    e2cf714 View commit details
    Browse the repository at this point in the history

  25. Set selected role

    @HarunErgen
    HarunErgen committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    20d7d26 View commit details
    Browse the repository at this point in the history

  26. Merge pull request #497 from bounswe/feature/mobile-496-add-resource 

    Implement resource creation
    @alperenDagi
    alperenDagi authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    3e90d6b View commit details
    Browse the repository at this point in the history

  27. Merge pull request #491 from bounswe/feature/mobile-482-request-user-… 

    …role

Request Role Implementation
    @GulbeycanCagri
    GulbeycanCagri authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    048b39d View commit details
    Browse the repository at this point in the history

  28. Merge pull request #493 from bounswe/feature/frontend_integrate_map_b… 

    …ackend

Implement category trees and integrate with backend for map page. Add victim page with quick add need
    @kubraaksux
    kubraaksux authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    898aee3 View commit details
    Browse the repository at this point in the history