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

[Bazaar] add back end to bazaar mainpage #1265

Merged
merged 35 commits into from
Jul 14, 2023
Merged

[Bazaar] add back end to bazaar mainpage #1265

merged 35 commits into from
Jul 14, 2023

Commits on May 19, 2023

  1. first commit of Bazaar main page

    @SourbaevaJanaraJ
    SourbaevaJanaraJ committed May 19, 2023
    Configuration menu
    Copy the full SHA
    a56157f View commit details
    Browse the repository at this point in the history

Commits on May 20, 2023

  1. changed BazaarMain () UI and UX

    @SourbaevaJanaraJ
    SourbaevaJanaraJ committed May 20, 2023
    Configuration menu
    Copy the full SHA
    c4334f7 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

  1. added translation

    @SourbaevaJanaraJ
    SourbaevaJanaraJ committed May 22, 2023
    Configuration menu
    Copy the full SHA
    198efcd View commit details
    Browse the repository at this point in the history

Commits on May 23, 2023

  1. added textColor for highlight and neubeileu, highlight on the top

    @SourbaevaJanaraJ
    SourbaevaJanaraJ committed May 23, 2023
    Configuration menu
    Copy the full SHA
    f1ebbb9 View commit details
    Browse the repository at this point in the history

  2. pulled master branch

    @SourbaevaJanaraJ
    SourbaevaJanaraJ committed May 23, 2023
    Configuration menu
    Copy the full SHA
    a6c7620 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2023

  1. deleted comment

    @SourbaevaJanaraJ
    SourbaevaJanaraJ committed May 24, 2023
    Configuration menu
    Copy the full SHA
    6b7f606 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. changed communityChoose to more informal format, and moved required a… 

    …rgument on top
    @SourbaevaJanaraJ
    SourbaevaJanaraJ committed May 31, 2023
    Configuration menu
    Copy the full SHA
    ae92b2e View commit details
    Browse the repository at this point in the history

  2. testing bazaar back end, not finished

    @azackmatoff
    azackmatoff committed May 31, 2023
    Configuration menu
    Copy the full SHA
    67e8861 View commit details
    Browse the repository at this point in the history

  3. pulled master branch and solved all the conflicts

    @SourbaevaJanaraJ
    SourbaevaJanaraJ committed May 31, 2023
    Configuration menu
    Copy the full SHA
    8dd7abb View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2023

  1. deleted single_business model

    @SourbaevaJanaraJ
    SourbaevaJanaraJ committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    c1f06d2 View commit details
    Browse the repository at this point in the history

  2. changed BazaarPage to BazaarMain

    @SourbaevaJanaraJ
    SourbaevaJanaraJ committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    41b8cd3 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. not finished, returning data has to be changed

    @azackmatoff
    azackmatoff committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    e7597f7 View commit details
    Browse the repository at this point in the history

  2. pulled master branch, and did small refactoring of the elevated Butto… 

    …n on the Home Page
    @SourbaevaJanaraJ
    SourbaevaJanaraJ committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    d7f8385 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2023

  1. pulled master branch

    @SourbaevaJanaraJ
    SourbaevaJanaraJ committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    b21dac1 View commit details
    Browse the repository at this point in the history

  2. @JsonValue to snake_case

    @SourbaevaJanaraJ
    SourbaevaJanaraJ committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    2c5e4ad View commit details
    Browse the repository at this point in the history

  3. pulled master branch

    @SourbaevaJanaraJ
    SourbaevaJanaraJ committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    7104849 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. deleted CustomElevatedButton()

    @SourbaevaJanaraJ
    SourbaevaJanaraJ committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    268873c View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. try fix 01

    @Eldar2021
    Eldar2021 committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    c933753 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2023

  1. Merge branch 'el/try-fix-bazaar-overflow-errors' into Bazaar---Add-ba… 

    …ck-end-to-bazaars-mainpage
    @azackmatoff
    azackmatoff committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    84fd1bb View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2023

  1. Sort not done yet

    @azackmatoff
    azackmatoff committed Jun 10, 2023
    Configuration menu
    Copy the full SHA
    213af98 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. filter by categories done

    @azackmatoff
    azackmatoff committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    8cceb14 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into Bazaar---Add-back-end-to-bazaars-mainpage

    @azackmatoff
    azackmatoff committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    7541e10 View commit details
    Browse the repository at this point in the history

  3. fixed some errors

    @azackmatoff
    azackmatoff committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    00d5add View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. Merge branch 'master' into Bazaar---Add-back-end-to-bazaars-mainpage

    @azackmatoff
    azackmatoff committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    a852ad3 View commit details
    Browse the repository at this point in the history

  2. fixed analyze check fails

    @azackmatoff
    azackmatoff committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    da8f9ba View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. added comment regarding EdisonPaula

    @azackmatoff
    azackmatoff committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    3cdf052 View commit details
    Browse the repository at this point in the history

  2. after code review changes made

    @azackmatoff
    azackmatoff committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    968cae1 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. Merge branch 'master' into Bazaar---Add-back-end-to-bazaars-mainpage

    @azackmatoff
    azackmatoff committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    423c6c7 View commit details
    Browse the repository at this point in the history

  2. fixed dropdown menu ui

    @azackmatoff
    azackmatoff committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    6af4ea2 View commit details
    Browse the repository at this point in the history

  3. unit test failures fixed, which closes 1331

    @azackmatoff
    azackmatoff committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    bf01df6 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2023

  1. [mock_bazaar_data] fix remaining unicode error.

    @clangenb
    clangenb committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    5425553 View commit details
    Browse the repository at this point in the history

  2. [transfer_history_view] fix merge error

    @clangenb
    clangenb committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    8c01c9f View commit details
    Browse the repository at this point in the history

  3. [businesses_store] fix typo

    @clangenb
    clangenb committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    4709d90 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into Bazaar---Add-back-end-to-bazaars-mainpage

    @clangenb
    clangenb committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    b4ad75c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into Bazaar---Add-back-end-to-bazaars-mainpage

    @clangenb
    clangenb authored Jul 14, 2023
    Configuration menu
    Copy the full SHA
    11709d5 View commit details
    Browse the repository at this point in the history