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

MF-739 - Add ID to the User entity #1152

Merged
merged 12 commits into from
Jun 4, 2020
Merged

MF-739 - Add ID to the User entity #1152

merged 12 commits into from
Jun 4, 2020

Commits on Apr 30, 2020

  1. MF-739 - Add ID to the User entity 

    Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
    @manuio
    manuio committed Apr 30, 2020
    Configuration menu
    Copy the full SHA
    4dd6bab View commit details
    Browse the repository at this point in the history

Commits on May 1, 2020

  1. Resolve remarks 

    Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
    @manuio
    manuio committed May 1, 2020
    Configuration menu
    Copy the full SHA
    c8ed990 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/mainflux/mainflux into users

    @manuio
    manuio committed May 1, 2020
    Configuration menu
    Copy the full SHA
    c2e4ccf View commit details
    Browse the repository at this point in the history

  3. Move idp to project root 

    Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
    @manuio
    manuio committed May 1, 2020
    Configuration menu
    Copy the full SHA
    d962fbc View commit details
    Browse the repository at this point in the history

Commits on May 6, 2020

  1. Use RetrieveByEmail func and UUIDProvider 

    Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
    @manuio
    manuio committed May 6, 2020
    Configuration menu
    Copy the full SHA
    5bc64b9 View commit details
    Browse the repository at this point in the history

  2. Rm idp.go 

    Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
    @manuio
    manuio committed May 6, 2020
    Configuration menu
    Copy the full SHA
    e0fa715 View commit details
    Browse the repository at this point in the history

  3. Fix comment 

    Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
    @manuio
    manuio committed May 6, 2020
    Configuration menu
    Copy the full SHA
    64a79cc View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2020

  1. Fix merge conflicts 

    Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
    @manuio
    manuio committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    746d4ff View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2020

  1. Rename UserInfo into ViewUser 

    Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
    @manuio
    manuio committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    f6e9002 View commit details
    Browse the repository at this point in the history

  2. Fix ViewUser naming 

    Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
    @manuio
    manuio committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    4cb7327 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/mainflux/mainflux into users

    @manuio
    manuio committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    1f2a2af View commit details
    Browse the repository at this point in the history

  4. Fix vendor mproxy 0.2.1 version 

    Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
    @manuio
    manuio committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    8af0e06 View commit details
    Browse the repository at this point in the history