Permalink
Commits on Mar 9, 2011
  1. simplified functionality on aspect edit faceboxes

    danielgrippi committed Mar 9, 2011
  2. You can now pass hashes to the logger

    Raphael Sofaer committed Mar 9, 2011
  3. fixed #911

    jhass committed Mar 9, 2011
  4. updated locales

    jhass committed Mar 9, 2011
  5. --amend

    jhass committed Mar 9, 2011
  6. fixed some translations

    jhass committed Mar 9, 2011
    do not escape html in private_message text only email
  7. markdownafy the private message text

    zhitomirskiyi committed Mar 9, 2011
  8. Merge branch 'private_messages'

    danielgrippi committed Mar 9, 2011
    Conflicts:
    	app/controllers/status_messages_controller.rb
    	app/models/data_point.rb
    	app/models/status_message.rb
    	db/schema.rb
    	lib/fake.rb
    	public/stylesheets/sass/application.sass
    	spec/models/mention_spec.rb
  9. fixed double-javascript loading on people/show

    danielgrippi committed Mar 9, 2011
  10. added missing translation

    danielgrippi committed Mar 9, 2011
  11. added the email notification, the notification is not persisted, fixe…

    zhitomirskiyi committed Mar 9, 2011
    …d the receive callback spec
Commits on Mar 8, 2011
  1. Merge branch 'private_messages' of github.com:diaspora/diaspora into …

    zhitomirskiyi committed Mar 8, 2011
    …private_messages
  2. checking for relayable in the dispatcher and the receiver

    zhitomirskiyi committed Mar 8, 2011
  3. update unread count in conversation visibility when hitting conversat…

    danielgrippi committed Mar 8, 2011
    …ionscontroller#show
  4. link to public feed of the person on the profile person show page ins…

    jhass committed Mar 8, 2011
    …tead of to the one of current_user
    
    
    fixed #700
    fixed #864
    fixed #774
  5. notifier for the messages, we're so close

    zhitomirskiyi committed Mar 8, 2011
  6. updated locales

    jhass committed Mar 8, 2011
  7. cleaned up new message facebox

    danielgrippi committed Mar 8, 2011
  8. dispatch the conversation in ConversationsController

    danielgrippi committed Mar 8, 2011
Commits on Mar 7, 2011
  1. don't change photos while commenting

    Raphael Sofaer committed Mar 7, 2011
  2. Comment button needs to be moved into comment box line

    Raphael Sofaer committed Mar 7, 2011
  3. re-enable commenting box on show page without comments, but it looks …

    Raphael Sofaer committed Mar 7, 2011
    …kind of ugly
  4. Post photos without text

    Raphael Sofaer committed Mar 7, 2011
  5. pulling in

    zhitomirskiyi committed Mar 7, 2011
Commits on Mar 6, 2011
  1. Update rspec-instafail, test git headers

    Raphael Sofaer committed Mar 6, 2011
  2. Merge branch 'master' of github.com:diaspora/diaspora

    Raphael Sofaer committed Mar 6, 2011
Commits on Mar 5, 2011
  1. updated locales

    jhass committed Mar 5, 2011
  2. more private message wip.

    danielgrippi committed Mar 5, 2011