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

refactor CreateMenu to have dynamic items #1548

Merged
merged 12 commits into from
Mar 22, 2021
Merged

refactor CreateMenu to have dynamic items #1548

merged 12 commits into from
Mar 22, 2021

Commits on Feb 23, 2021

  1. refactor CreateMenu to have dynamic items

    @Maftalion
    Maftalion committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    4ab6780 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2021

  1. refactor menu items into CONST

    @Maftalion
    Maftalion committed Feb 24, 2021
    Configuration menu
    Copy the full SHA
    a73e58d View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into matt-dynamic-crea… 

    …te-menu

# Conflicts:
#	src/pages/home/sidebar/SidebarScreen.js
    @Maftalion
    Maftalion committed Feb 24, 2021
    Configuration menu
    Copy the full SHA
    27d53eb View commit details
    Browse the repository at this point in the history

  3. add missing import

    @Maftalion
    Maftalion committed Feb 24, 2021
    Configuration menu
    Copy the full SHA
    ff2c70d View commit details
    Browse the repository at this point in the history

  4. update menu visibility logic

    @Maftalion
    Maftalion committed Feb 24, 2021
    Configuration menu
    Copy the full SHA
    728bca0 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2021

  1. revert conditional rendering of menu

    @Maftalion
    Maftalion committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    8d4ecfa View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2021

  1. update to use plus icon

    @Maftalion
    Maftalion committed Feb 27, 2021
    Configuration menu
    Copy the full SHA
    c288639 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2021

  1. Merge branch 'master' into matt-dynamic-create-menu

    @Maftalion
    Maftalion committed Mar 2, 2021
    Configuration menu
    Copy the full SHA
    b3ac7d9 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2021

  1. Merge branch 'master' into matt-dynamic-create-menu 

    # Conflicts:
#	src/components/Icon/Expensicons.js
    @Maftalion
    Maftalion committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    f06d865 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2021

  1. Merge branch 'master' into matt-dynamic-create-menu 

    # Conflicts:
#	src/CONST.js
#	src/components/CreateMenu.js
#	src/components/Icon/Expensicons.js
#	src/pages/home/ReportScreen.js
#	src/pages/home/report/ReportActionCompose.js
#	src/pages/home/report/ReportView.js
#	src/pages/home/sidebar/SidebarScreen.js
    @Maftalion
    Maftalion committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    ec2099f View commit details
    Browse the repository at this point in the history

  2. fix merge conflicts

    @Maftalion
    Maftalion committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    3fc4b04 View commit details
    Browse the repository at this point in the history

  3. reduce time, fix proptype

    @Maftalion
    Maftalion committed Mar 19, 2021
    Configuration menu
    Copy the full SHA
    801f92a View commit details
    Browse the repository at this point in the history