Permalink
Commits on Apr 19, 2013
  1. bump foreigner

    jhass committed Apr 13, 2013
  2. bump omniauth

    jhass committed Apr 13, 2013
  3. bump haml

    jhass committed Apr 13, 2013
  4. bump selenium-webdriver

    jhass committed Apr 13, 2013
  5. bump rspec-mocks

    jhass committed Apr 13, 2013
  6. bump faraday

    jhass committed Apr 4, 2013
  7. bump client_side_validations

    jhass committed Apr 4, 2013
  8. bump omniauth-twitter

    jhass committed Apr 4, 2013
  9. bump safe_yaml

    jhass committed Apr 4, 2013
Commits on Apr 15, 2013
  1. Refactor script/server

    * Made style consistent
    * Add helper functions to print messages
    * Abort script if critical command fails
    * Made number of started Sidekiq workers configurable again
    jhass committed Apr 15, 2013
Commits on Apr 14, 2013
  1. bump oauth2

    jhass committed Apr 4, 2013
  2. bump mime-types

    jhass committed Apr 4, 2013
  3. bump rake

    jhass committed Apr 4, 2013
  4. bump guard

    jhass committed Apr 4, 2013
  5. bump chunky_png

    jhass committed Apr 4, 2013
  6. Fix typo in devise initializer

    jhass committed Apr 14, 2013
  7. Merge pull request #4116 from Raven24/remove-capistrano

    remove capistrano from the main source code repo
    jhass committed Apr 14, 2013
  8. remove capistrano from the main source code repo

    capistrano deployment scripts will be maintained in a separate deployment repo
    Raven24 committed Apr 14, 2013
Commits on Apr 13, 2013
  1. Merge pull request #4115 from movilla/small_fix

    Correction typos for changelog and activity mobile feature
    jhass committed Apr 13, 2013
  2. Merge branch 'remove_navbar' of git://github.com/movilla/diaspora int…

    …o movilla-remove_navbar
    
    Conflicts:
    	Changelog.md
    jhass committed Apr 13, 2013
  3. Merge branch 'activity_more' of git://github.com/movilla/diaspora int…

    …o movilla-activity_more
    
    Conflicts:
    	Changelog.md
    jhass committed Apr 13, 2013
  4. Merge pull request #4096 from RoonyH/3897-submit_a_comment_by_shift+e…

    …nter
    
    3897 submit a comment by shift+enter
    jhass committed Apr 13, 2013
  5. bump sidekiq

    jhass committed Apr 13, 2013
Commits on Apr 10, 2013
  1. Merge branch '3681-infinite-scroll-on-contact-page' of git://github.c…

    …om/asphxia/diaspora into develop
    
    Conflicts:
    	Changelog.md
    jhass committed Apr 10, 2013
  2. Merge pull request #4112 from marpo60/issues_4017_4107_fixes

    close issues #4017 and 4107 by including jquery.textchange
    jhass committed Apr 10, 2013
  3. Add changelog entry for #4017 & #4107

    juanazam committed Apr 10, 2013
  4. Merge branch 'brauliomartinezlm-4058_redirect_to_downcase_version_of_…

    …tags' into develop
    jhass committed Apr 10, 2013
Commits on Apr 9, 2013
Commits on Apr 8, 2013
  1. added same feature to publisher

    roonyh committed Apr 8, 2013
Commits on Apr 7, 2013
  1. Merge pull request #4099 from svbergerem/feature/post-preview

    Preview posts in stream
    Raven24 committed Apr 7, 2013
  2. preview posts in stream

    svbergerem committed Apr 4, 2013