Permalink
Commits on Jan 21, 2013
  1. Merge remote-tracking branch 'upstream/master' into twitter-api

    carols10cents committed Jan 21, 2013
    Conflicts:
    	app/controllers/static_controller.rb
    	config/routes.rb
Commits on Jan 8, 2013
  1. Updating rails to 3.2.11 for security patches

    Carol Nichols
    Carol Nichols committed Jan 8, 2013
Commits on Dec 27, 2012
  1. Merge pull request #736 from imageoptimiser/optimised-images

    carols10cents committed Dec 27, 2012
    Optimise images (49 KB reduction)
  2. Merge remote-tracking branch 'origin/feature/change_username'

    carols10cents committed Dec 27, 2012
    Conflicts:
    	test/models/user_test.rb
  3. Merge remote-tracking branch 'origin/test_cleanup'

    carols10cents committed Dec 27, 2012
    Conflicts:
    	test/models/author_test.rb
  4. Merge remote-tracking branch 'origin/issue_698'

    carols10cents committed Dec 27, 2012
    Conflicts:
    	test/lib/converts_subscriber_to_feed_data_test.rb
    	test/lib/finds_or_creates_feeds_test.rb
    	test/lib/finger_test.rb
Commits on Dec 24, 2012
  1. Optimised images

    imageoptimiser authored and codeincontext committed Dec 24, 2012
Commits on Dec 10, 2012
Commits on Dec 2, 2012
  1. Fixes #733. Don't allow direct posting to update create if there isn…

    carols10cents committed Dec 2, 2012
    …'t a valid current user.
Commits on Nov 26, 2012
  1. Merge remote-tracking branch 'upstream/master' into twitter-api

    carols10cents committed Nov 26, 2012
    Conflicts:
    	Gemfile
    	app/models/user.rb
  2. Organize author tests by method; group before_save callbacks together…

    carols10cents committed Nov 20, 2012
    …; name tests consistently
Commits on Nov 24, 2012
  1. Merge pull request #732 from carols10cents/issue_731

    steveklabnik committed Nov 24, 2012
    Fixes Issue #548 and #731. Handles cases where author is nil and that ca...
  2. Fixes Issue #548 and #731. Handles cases where author is nil and that…

    carols10cents committed Nov 24, 2012
    … causes errors in the view.
    
    I don't know how update authors get to be nil, but here we are.
Commits on Nov 22, 2012
  1. Since an unsuccessful profile update shouldn't ping hubs, there's no …

    carols10cents committed Nov 22, 2012
    …need to use a VCR cassette in tests of unsuccessful profile updates
  2. Show multiple error messages when there are multiple errors saving a …

    carols10cents committed Nov 22, 2012
    …profile edit
    
    Reuse the errors partial from the signup process; make the message more general.
  3. Updates name of edit profile action.

    wilkie authored and carols10cents committed Nov 16, 2012
    The old name made its destructive behavior unclear and its mutation.
    This now has the common update_ prefix and a bang to indicate this. It
    is far more instructive than edit_user_profile since edit is an action
    and what is that?! It's update everywhere else! Who wrote this, an
    alien? :D :D :D
  4. Adds functionality to change your username.

    wilkie authored and carols10cents committed Nov 16, 2012
    This functionality affects the User controller and model and view.
    
    In the model, I have replaced the behavior of the edit_user_profile
    badness to just add freaking errors to self whenever something is
    invalid instead of reporting a string since those errors contain
    consistent error messages anyway. It does not return. I will reflect
    this in another commit by changing the name to something more
    appropriate.
    
    Which means in the model, I have added messages to validations that for
    some reason did not have one before. We should put those strings all in
    one place eventually for sanity.
    
    In the controller, I updated the, um, update action to look for errors
    like a normal controller action would and respond naturally. Some
    wonkiness occurs.
    
    This wonkiness is a result of trying to change the field that the
    current url is built from. Therefore, let's use the canonical user,
    current_user, whenever possible. When redirecting, we have changed the
    canonical user, therefore use @user to generate urls.
    
    That wonkiness is in the view. Here, @user is the current image of the
    user and current_user is the true user (or preimage, I guess.) So, using
    current_user where (honestly, you would expect current_user anyway) you
    want to use the stable values and @user when you want the changed fields
    is what I've done.
    
    Tests:
    
    Updates tests to reflect changes in error messages.
    
    Adds four acceptance tests to edit_profile_test:
    
    * it updates your username (check that a username can simply be changed)
    * it does not update your username if the chosen username exists (make
        sure that you cannot steal somebody else's name)
    * it redirects to your new name when you change your username (the
        redirect should take you to your profile, which has a different url
        now)
    * it does not allow you to change your username to something invalid (do
        not allow special characters in your name)
    
    Adds one unit test:
    
    * username can be changed (checks that the edit_user_profile method,
        which will become update_profile! actually updates the username with
        the given parameter)
  5. Makes email duplication validation independent of username.

    wilkie authored and carols10cents committed Nov 16, 2012
    Oh, and it also ignores a nil value. You have no idea how frustrating it
    was to see it take two nil values and rub them together and say "A horse
    is a horse" and throw them in my face.
    
    I also note that it was storing "" as an email sometimes, adding to the
    fun time frustration hour.
  6. Merge pull request #724 from carols10cents/issue_532

    wilkie committed Nov 22, 2012
    Don't even try authenticating by checking hashed_password if there isn't one-- just fail.
    
    Fixes #532.
  7. Improve code style

    gavinlaking authored and carols10cents committed Oct 28, 2012
    - organized schema, associations, validations, and callbacks in models
    - whitespace changes for clarity