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

User Edit #56

Merged
merged 10 commits into from
May 28, 2015
Merged

User Edit #56

merged 10 commits into from
May 28, 2015

Commits on May 27, 2015

  1. Edit username, name, description

    @Gjum
    Gjum committed May 27, 2015
    Configuration menu
    Copy the full SHA
    d51818b View commit details
    Browse the repository at this point in the history

Commits on May 28, 2015

  1. Add dummy links for password change and account deletion to edit_profile

    @Gjum
    Gjum committed May 28, 2015
    Configuration menu
    Copy the full SHA
    348b8a1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github.com:7Pros/circuit into feature/user-… 

    …edit
    @Gjum
    Gjum committed May 28, 2015
    Configuration menu
    Copy the full SHA
    e622b89 View commit details
    Browse the repository at this point in the history

  3. Add link to profile-edit page, fix description field, fix indents

    @Gjum
    Gjum committed May 28, 2015
    Configuration menu
    Copy the full SHA
    878b9f3 View commit details
    Browse the repository at this point in the history

  4. Remove login-dependent stuff from templates

    @Gjum
    Gjum committed May 28, 2015
    Configuration menu
    Copy the full SHA
    b539ecb View commit details
    Browse the repository at this point in the history

  5. Make the edit link a material icon button

    @metalmatze
    metalmatze committed May 28, 2015
    Configuration menu
    Copy the full SHA
    45f60a9 View commit details
    Browse the repository at this point in the history

  6. Formatting and improve edit forms

    @metalmatze
    metalmatze committed May 28, 2015
    Configuration menu
    Copy the full SHA
    af8abef View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1 from MetalMatze/feature/user-edit 

    Formatting, improved forms and icon button for edit
    @Gjum
    Gjum committed May 28, 2015
    Configuration menu
    Copy the full SHA
    2dad039 View commit details
    Browse the repository at this point in the history

  8. Add CSRF token to password change form

    @Gjum
    Gjum committed May 28, 2015
    Configuration menu
    Copy the full SHA
    db5e15b View commit details
    Browse the repository at this point in the history

  9. Delete account, not profile. Also make button smaller

    @Gjum
    Gjum committed May 28, 2015
    Configuration menu
    Copy the full SHA
    4d307c7 View commit details
    Browse the repository at this point in the history