Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Mar 28, 2015
  1. @denschub

    Merge pull request #5822 from jhass/default_view

    denschub authored
    Replace default.html with a regular view
  2. @jhass

    Replace default.html with a regular view

    jhass authored
    So we can correctly reference the images
  3. @denschub

    Merge pull request #5817 from jhass/generated_error_pages

    denschub authored
    Generate error pages on assets:precompile
  4. @jhass

    Merge pull request #5821 from svbergerem/fix-layout-regression

    jhass authored
    Fix layout regression: missing header on search page
  5. @svbergerem
Commits on Mar 27, 2015
  1. @jhass
  2. @jhass

    Generate error pages on assets:precompile

    jhass authored
    This allows us to reuse any CSS we have, unify
    their look and unify their look with the regular
    page design.
    
    This works by instantiating ActionView and rendering
    templates in a rake task.
    
    Inspired by the errgent gem.
  3. @denschub

    Merge pull request #5819 from svbergerem/no-contacts-in-aspect-message

    denschub authored
    Add 'no contacts in this aspect yet' message
  4. @svbergerem
  5. @denschub

    Merge pull request #5818 from svbergerem/fix-frontend-regressions

    denschub authored
    Fix frontend regressions
Commits on Mar 26, 2015
  1. @svbergerem
  2. @svbergerem

    Fix oembed style regression

    svbergerem authored
  3. @svbergerem

    Merge pull request #5791 from SansPseudoFix/5745-Conversation-paginat…

    svbergerem authored
    …ion-design-is-broken
    
    Fix for 5745 - conversation pagination design is broken
  4. @SansPseudoFix

    add option pagination

    SansPseudoFix authored
    center pagination
    
    Fix pagination css
    
    Symbols for previous and next
    
    	modified:   app/assets/stylesheets/conversations.scss
    	modified:   app/views/conversations/index.haml
    
    Add responsive pagination
    
    Fix broken pagination
    
    	modified:   app/assets/stylesheets/conversations.scss
    	modified:   app/views/conversations/index.haml
    
    Fix broken pagination for mobile
    
    Mobile pagination
    
    Unify desktop and mobile background
    
    change background color
  5. @svbergerem

    bump ruby-progressbar

    svbergerem authored
  6. @jhass

    Merge pull request #5816 from svbergerem/remove-footer-stream-pages

    jhass authored
    Remove footer from stream and profile pages
  7. @svbergerem
  8. @jhass

    Merge pull request #5814 from svbergerem/update-markdown-it

    jhass authored
    Update markdown-it
  9. @svbergerem
  10. @svbergerem

    Merge pull request #5743 from Flaburgan/change-make-something

    svbergerem authored
    Replace Make Something text by the diaspora ball logo on registration page
Commits on Mar 25, 2015
  1. @Flaburgan

    Replace Make Something text by the diaspora ball logo on registration…

    Flaburgan authored
    … page
    
    Add ball.svg to /graphics
  2. @svbergerem

    Update markdown-it

    svbergerem authored
  3. @jhass

    Switch back to database cleaner

    jhass authored
    database_rewinder seems to cause deadlocks in postgres and other
    subtle bugs for us.
  4. @jhass

    Merge pull request #5812 from diaspora/update_gems

    jhass authored
    Update gems
  5. @jhass

    Update bundler on CI

    jhass authored
  6. @jhass

    bump systemu

    jhass authored
  7. @jhass

    bump fog

    jhass authored
  8. @jhass

    bump ruby-progressbar

    jhass authored
  9. @jhass

    bump jwt

    jhass authored
  10. @jhass

    bump excon

    jhass authored
  11. @jhass

    bump test_after_commit

    jhass authored
  12. @jhass

    bump sinatra

    jhass authored
  13. @jhass

    bump sidekiq

    jhass authored
  14. @jhass

    bump rspec-rails

    jhass authored
  15. @jhass

    bump rails_admin

    jhass authored
Something went wrong with that request. Please try again.