Skip to content
This repository

Mar 10, 2014

  1. Jonne Haß

    Merge pull request #4842 from seanbrant/patch-1

    Fixes typos
    authored
  2. Sean Brant

    Fixes typos

    authored

Feb 19, 2014

  1. Jonne Haß

    Merge branch 'hotfix/0.3.0.3'

    authored
  2. Jonne Haß

    update rails to 3.2.17

    authored

Feb 18, 2014

  1. Jason Robinson

    Merge branch 'hotfix/0.3.0.2'

    authored

Feb 15, 2014

  1. Jason Robinson

    Bump version to 0.3.0.2

    authored
  2. Jason Robinson

    Changelogs for 0.3.0.2, changelog for #4714

    authored
  3. svbergerem

    fix hovercards

    (cherry picked from commit a51c4f0)
    
    Conflicts:
    	Changelog.md
    authored jaywink committed
  4. Florian Staudacher

    fix regression caused by updating backbone.js without updating change…

    …d parameters
    
    (cherry picked from commit 09a840e)
    authored jaywink committed
  5. arlo gn

    embedding youtube videos over https

    (cherry picked from commit 1563d08)
    authored jaywink committed
  6. Fabian Rodriguez

    bump kaminari

    (cherry picked from commit b5e6c2a)
    authored jaywink committed

Jan 20, 2014

  1. Jason Robinson

    Merge branch 'hotfix/0.3.0.1'

    authored
  2. Jason Robinson

    bump to 0.3.0.1

    authored
  3. Florian Staudacher

    fix regression in conversations causing an infinite recursion (fix #4715

    )
    
    (cherry picked from commit 5c059b2)
    
    Conflicts:
    	Changelog.md
    authored jaywink committed

Jan 19, 2014

  1. Jason Robinson

    Merge branch 'release/0.3.0.0'

    authored
  2. Jason Robinson

    bump to 0.3.0.0

    authored
  3. Jonne Haß

    Merge pull request #4709 from Flaburgan/update-changelog-gems

    Add gems upgrade in the changelog
    authored
  4. Antoine D.

    Add gems upgrade in the changelog

    authored
  5. Jonne Haß

    updated 158 locale files [ci skip]

    authored

Jan 18, 2014

  1. Jonne Haß

    Merge branch 'develop' of github.com:diaspora/diaspora into develop

    authored
  2. Jonne Haß

    bump recommended rubygems version

    authored
  3. Jonne Haß

    Merge pull request #4700 from qmaruf/absolute-path-for-favicon-ico

    Absolute path added for favicon.ico
    authored

Jan 17, 2014

  1. Jonne Haß

    Merge pull request #4662 from Raven24/update_underscore-backbone

    update backbone.js and underscore.js
    authored

Jan 16, 2014

  1. Jonne Haß

    Merge pull request #4698 from goobertron/remove_alpha_refs

    Remove alpha refs from devise.en.yml
    authored
  2. Florian Staudacher

    replace vendored backbone.js/underscore.js with 'backbone-on-rails' gem

    - updates underscore to 1.5.2 and backbone to 1.1.0
    
    backbone had some breaking changes:
    - fix url/urlRoot handling in models & collections
    - options are no longer attached to the view by default
    - collections reset when 'fetch' is called, tell it to keep the existing
      models
    
    other changes:
    - fix some events triggering multiple times in connection with deleting
      a model
    - use document fragments instead of an element array for stream entries
    - adapt jasmine and cucumber specs to the changed code
      * no longer test the backbone router as part of our code
      * jasmine factory already returns model instances, no need to wrap
        that again
    authored
  3. Remove alpha references to invites and buggy software

    authored
  4. Quazi Marufur Rahman

    Absolute path added for favicon.ico

    authored

Jan 15, 2014

  1. Dennis Schubert

    Merge pull request #4511 from MrZYX/bump_devise

    update devise to 3.2
    authored
  2. Jonne Haß

    Merge pull request #4688 from ivanzotov/develop

    Fix after_create to after_commit
    authored
  3. Jonne Haß

    update devise to 3.2

    authored
  4. Fabian Rodriguez

    Merge pull request #4635 from diaspora/update_gems

    Update gems
    authored

Jan 14, 2014

  1. Ivan Zotov

    Fix after_create to after_commit

    authored
  2. Jonne Haß

    Merge pull request #4692 from svbergerem/header-fix-badge-background

    Remove background from badges in header
    authored
  3. svbergerem

    Remove background from badges in header

    authored

Jan 13, 2014

  1. Jonne Haß

    Merge pull request #4682 from goobertron/NSFW_profile_text

    Change NSFW explanation on profile settings page
    authored
Something went wrong with that request. Please try again.