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.

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 model avatars #144

Closed
wants to merge 15 commits into from
Closed

User model avatars #144

wants to merge 15 commits into from

Commits on Feb 6, 2012

  1. If the user model has an avatar method call that to get an avatar ima… 

    …ge url instead of using gravatar.
    Marc Sutton committed Feb 6, 2012
    Copy the full SHA
    c04f3d0 View commit details
    Browse the repository at this point in the history

  2. Use a slightly clearer name to show that the model should return a url.

    Marc Sutton committed Feb 6, 2012
    Copy the full SHA
    23da753 View commit details
    Browse the repository at this point in the history

  3. Remove subscribe functionality.

    Marc Sutton committed Feb 6, 2012
    Copy the full SHA
    6104435 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2012

  1. If the user model has an avatar method call that to get an avatar ima… 

    …ge url instead of using gravatar.
    Marc Sutton committed Feb 8, 2012
    Copy the full SHA
    855909f View commit details
    Browse the repository at this point in the history

  2. Use a slightly clearer name to show that the model should return a url.

    Marc Sutton committed Feb 8, 2012
    Copy the full SHA
    cfc7d4e View commit details
    Browse the repository at this point in the history

  3. Restart custom avatars the right way with some tests.

    Marc Sutton committed Feb 8, 2012
    Copy the full SHA
    83a1ac1 View commit details
    Browse the repository at this point in the history

  4. Add a custom avatar field to the dummy's user.

    Marc Sutton committed Feb 8, 2012
    Copy the full SHA
    3489377 View commit details
    Browse the repository at this point in the history

  5. Add the new configuration setting for custom avatars and a hint about… 

    … how to use it in the initializer template.
    Marc Sutton committed Feb 8, 2012
    Copy the full SHA
    2e1f8a3 View commit details
    Browse the repository at this point in the history

  6. Use the forem option to set an avatar if there is one.

    Marc Sutton committed Feb 8, 2012
    Copy the full SHA
    e141c68 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'user-model-avatars' 

    Conflicts:
	app/helpers/forem/posts_helper.rb
    Marc Sutton committed Feb 8, 2012
    Copy the full SHA
    a0fd080 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'upstream/master' 

    Conflicts:
	lib/generators/forem/install/templates/initializer.rb
    Marc Sutton committed Feb 8, 2012
    Copy the full SHA
    bfa2abc View commit details
    Browse the repository at this point in the history

  9. Remove fix for my app only that rebase pulled in.

    Marc Sutton committed Feb 8, 2012
    Copy the full SHA
    2ec8fb5 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2012

  1. Merge upstream

    Marc Sutton committed Mar 29, 2012
    Copy the full SHA
    5c3ff8d View commit details
    Browse the repository at this point in the history

  2. Merge master

    Marc Sutton committed Mar 29, 2012
    Copy the full SHA
    65424b7 View commit details
    Browse the repository at this point in the history

  3. Fix broken test.

    Marc Sutton committed Mar 29, 2012
    Copy the full SHA
    7381623 View commit details
    Browse the repository at this point in the history