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

Profile #323

Merged
merged 14 commits into from
Jun 13, 2018
Merged

Profile #323

merged 14 commits into from
Jun 13, 2018

Commits on Jun 4, 2018

  1. Drawer layout

    @diegolmello
    diegolmello committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    9bee772 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into drawer 

    # Conflicts:
#	app/containers/Sidebar.js
#	app/containers/routes/AuthRoutes.js
    @diegolmello
    diegolmello committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    eb8695f View commit details
    Browse the repository at this point in the history

  3. Drawer changes

    @diegolmello
    diegolmello committed Jun 4, 2018
    Configuration menu
    Copy the full SHA
    c88592a View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2018

  1. Profile

    @diegolmello
    diegolmello committed Jun 5, 2018
    Configuration menu
    Copy the full SHA
    04c274b View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2018

  1. Profile avatar

    @diegolmello
    diegolmello committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    e0b1835 View commit details
    Browse the repository at this point in the history

  2. Set language

    @diegolmello
    diegolmello committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    175d86a View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2018

  1. Merge branch 'develop' into profile 

    # Conflicts:
#	app/containers/Sidebar.js
#	app/containers/routes/AuthRoutes.js
#	app/i18n/locales/en.js
#	app/views/ProfileView/index.js
#	app/views/SettingsView/index.js
    @diegolmello
    diegolmello committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    3cdb73f View commit details
    Browse the repository at this point in the history

  2. Tests

    @diegolmello
    diegolmello committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    f23a12d View commit details
    Browse the repository at this point in the history

  3. Custom fields

    @diegolmello
    diegolmello committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    bbfdde2 View commit details
    Browse the repository at this point in the history

  4. Readme updated

    @diegolmello
    diegolmello committed Jun 8, 2018
    Configuration menu
    Copy the full SHA
    9b96aca View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2018

  1. fix invalid user muted value

    @ggazzo
    ggazzo committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    084682b View commit details
    Browse the repository at this point in the history

  2. Fix for "Cannot add a child that doesn't have a YogaNode to a parent … 

    …without a measure function! (Trying to add a 'RCTVirtualText' to a 'RCTView')"
    @diegolmello
    diegolmello committed Jun 11, 2018
    Configuration menu
    Copy the full SHA
    ddb4b47 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into profile

    @diegolmello
    diegolmello authored Jun 11, 2018
    Configuration menu
    Copy the full SHA
    f2a142c View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2018

  1. Merge branch 'develop' into profile

    @ggazzo
    ggazzo authored Jun 13, 2018
    Configuration menu
    Copy the full SHA
    103ea67 View commit details
    Browse the repository at this point in the history