Permalink
Commits on Jul 19, 2011
  1. Add cucumber feature for changing email address

    Raphael Sofaer committed Jul 19, 2011
  2. We don't use perform_delegate anymore

    Raphael Sofaer committed Jul 19, 2011
  3. Merge remote branch 'yolk/348-change-email-with-confirmation' into me…

    Raphael Sofaer committed Jul 19, 2011
    …rge_email_change
    
    Conflicts:
    	app/controllers/users_controller.rb
    	config/locales/diaspora/en.yml
    	db/schema.rb
    	spec/controllers/users_controller_spec.rb
    	spec/mailers/notifier_spec.rb
Commits on Jul 18, 2011
  1. Fix issue #1579, like.target, not like.post

    Raphael Sofaer committed Jul 18, 2011
  2. Merge remote branch 'untitaker/1589-remove-unicode-smileys'

    Raphael Sofaer committed Jul 18, 2011
Commits on Jul 17, 2011
  1. Merge pull request #1609 from ticho/master

    jhass committed Jul 17, 2011
    Fix for issue #1600: Missing string for translation ("Recent notifications")
  2. Removed unicode smileys, #1589

    untitaker committed Jul 17, 2011
Commits on Jul 16, 2011
  1. Revert "deleted unused file". sorry!! :(

    danielgrippi committed Jul 16, 2011
    This reverts commit a6f2f82.
  2. deleted unused file

    danielgrippi committed Jul 16, 2011
  3. take ':' out of translation

    danielgrippi committed Jul 16, 2011
  4. fixed emails to show avatars, have subject lines that allow threading…

    danielgrippi committed Jul 16, 2011
    … in email clients, and relevant content previews
Commits on Jul 15, 2011
  1. Merge pull request #1583 from Gallaecio/master

    jhass committed Jul 15, 2011
    Update of Galician (gl) translation
  2. Shorter backtrace in the SQL logs

    Raphael Sofaer committed with root Jul 15, 2011
  3. Include profile in contactsController index for the publisher

    Raphael Sofaer committed with root Jul 15, 2011
  4. Ajax in the contacts for mentioning after page load

    Raphael Sofaer committed Jul 15, 2011
  5. Had forgotten to use the right string delimiters (not needed, but hey…

    Adrián Chaves Fernández (Gallaecio) committed Jul 15, 2011
    …, I want to do things right\!).
  6. Review of Galician (gl) translation of Diaspora finished.

    Adrián Chaves Fernández (Gallaecio) committed Jul 15, 2011
  7. Added correct string delimiters to the last strings of ‘diaspora/gl.y…

    Adrián Chaves Fernández (Gallaecio) committed Jul 15, 2011
    …ml’ file.
  8. Minor (translation) fix for a string, the one related to the “time ago”.

    Adrián Chaves Fernández (Gallaecio) committed Jul 15, 2011
  9. Minor (translation) fix for a string, the one related to the “time ago”.

    Adrián Chaves Fernández (Gallaecio) committed Jul 15, 2011
  10. Finished the review of the Galician (gl) translation of ‘diaspora/(la…

    Adrián Chaves Fernández (Gallaecio) committed Jul 15, 2011
    …ng).yml’ file.
  11. Use activerecord-import in ReceiveLocalBatch. The default behavior of…

    Raphael Sofaer committed Jul 14, 2011
    … it is to do an On Duplicate Key Update updated_at = Time.now, but we have a test for that case anyway.
  12. Vanna doesn't include helpers so we have to include them in views sep…

    sarahmei committed Jul 15, 2011
    …arately to use them. The absence of this line was producing a deprecation warning for error_messages_for, because our helper redefines that method (it was removed from rails).
Commits on Jul 14, 2011
  1. updated locales

    jhass committed Jul 14, 2011
  2. put ?invite in the readme.

    danielgrippi committed Jul 14, 2011