Commit 103e62a4 authored by Sean Tilley's avatar Sean Tilley

Fix merge conflict with changelog

parent 7dfa6299
## Refactor
### script/server
* Uses foreman now
* Reduce startup time by reducing calls to `script/get_config.rb`
* `config/script_server.yml` is removed and replaced by the `server` section in `config/diaspora.yml`
Have a look at the updated example!
* Thin is dropped in favour of unicorn
* Already set versions of `RAILS_ENV` and `DB` are now prefered over those set in `config/diaspora.yml`
### Other
* MessagesController. [#3657](
* **Fixed setting:** `follow_diasporahq` has now to be set to `true` to enable following the DiasporaHQ account. Was `false`
## Features
* Add "My Activity" icon mobile -[Author Icon]( [#3687](
* Add password_confirmation field to registration page. [#3647](
* When posting to Twitter, behaviour changed so that URL to post will only be added to the post when length exceeds 140 chars or post contains uploaded photos.
## Bug Fixes
* Fix posting to Facebook and Tumblr. Have a look at the updated [services guide]( for new Facebook instructions.
* Fix overflow button in mobile reset password. [#3697](
* Fix issue with interacted_at in post fetcher. [#3607](
* Fix error with show post Community Spotlight. [#3658](
* Fix javascripts problem with read/unread notifications. [#3656](
* Fix error with open/close registrations. [#3649](
* Fix javascripts error in invitations facebox. [#3638](
* Fix css overflow problem in aspect dropdown on welcome page. [#3637](
* Fix empty page after authenticating with other services. [#3693](
* Fix posting public posts to Facebook. [#2882](, [#3650](
* Fix error with invite link box shows on search results page even if invites have been turned off. [#3708](
* Fix misconfiguration of Devise to allow the session to be remembered. [#3472](
* Fix problem with show reshares_count in stream. [#3700](
Fix exception when the root of a reshare of a reshare got deleted [#3546](
* Fix syntax error in French Javascript pluralization rule.
## New configuration system!
Copy over config/diaspora.yml.example to config/diaspora.yml and migrate your settings! An updated Heroku guide including basic hints on howto migrate is [here](
The new configuration system allows all possible settings to be overriden by environment variables. This makes it possible to deploy heroku without checking any credentials into git. Read the top of `config/diaspora.yml.example` for an explanation on how to convert the setting names to environment variables.
### Environment variable changes:
#### deprectated
#### removed
* application_yml - Obsolete, all settings are settable via environment variables now
#### renamed
## Gem changes
### Updated gems
* omniauth-tumblr 1.0 -> 1.1
* rails_admin git -> 0.1.1
* activerecord-import 0.2.10 -> 0.2.11
* fog 1.4.0 -> 1.6.0
* asset_sync 0.4.2 -> 0.5.0
* jquery-rails 2.0.2 -> 2.1.3
### Removed gems
The following gems and their related files were removed as they aren't widely enough used to justify maintenance for them by the core developers. If you use them please maintain them in your fork.
* airbrake
* newrelic_rpm
* rpm_contrib
* heroku_san
The following gems were removed because their are neither used in daily development or are just CLI tools that aren't required to be loaded from the code:
* heroku
* oink
* yard
## Publisher
Refactoring of the JavaScript code; it is now completely rewritten to make use of Backbone.js.
This paves the way for future improvements such as post preview or edit toolbar/help.
## Removal of 'beta' code
The feature-flag on users and all the code in connection with experimental UX changes got removed/reverted. Those are the parts that became
The single-post view will also be revamped/reverted, but that didn't make it into this release.
## JS lib updates
## Cleanup in maintenance scripts and automated build environment
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment