Commits · c85fe3872e519d83030d766321ece024bc3e2273 · Gigadoc 2 / diaspora

29 May, 2015 1 commit
- Replace DB environment variable with optional bundler groups · c85fe387
  Jonne Haß authored May 28, 2015
```
See the changes to the changelog for more details
```
  c85fe387
28 May, 2015 9 commits
- Merge branch 'stable' into develop · 351f54d7
  Jonne Haß authored May 28, 2015
  
  351f54d7
- Remove unnecessary initializer and comments in Gemfile and add explicit... · 36d6c5d2
  Sandip Trivedi authored May 28, 2015
```
Remove unnecessary initializer and comments in Gemfile and add explicit rubyzip gem version in Gemfile with description

closes #6001
```
  36d6c5d2
- Replaces the zipzip gem with the rubyzip gem · 2ba2ef1b
  Sandip Trivedi authored May 27, 2015
  
  2ba2ef1b
- Merge branch 'stable' into develop · 44919233
  Dennis Schubert authored May 27, 2015
  
  44919233
- handle when the diaspora xml parser returns nil · 21ae93e6
  Benjamin Neff authored May 26, 2015
```
closes #5991
```
  21ae93e6
- Merge branch 'stable' into develop · 04df6c11
  Dennis Schubert authored May 27, 2015
  
  04df6c11
- Update markdown-it-hashtag · 6206bb99
  Steffen van Bergerem authored May 27, 2015
```
closes #5998
```
  6206bb99
- Merge branch 'stable' into develop · d34878df
  Dennis Schubert authored May 27, 2015
  
  d34878df
- make the logrotation configurable · 5655eead
  Benjamin Neff authored May 27, 2015
```
closes #5994
```
  5655eead
26 May, 2015 4 commits
- Merge branch 'stable' into develop · 8c408a57
  Dennis Schubert authored May 26, 2015
  
  8c408a57
- Do not mute ActiveRecord::RecordNotUnique for now see #5971, regression from #5938 · 62e8f87f
  Dennis Schubert authored May 26, 2015
```
closes #5992
```
  62e8f87f
- Merge branch 'stable' into develop · d4312fba
  Dennis Schubert authored May 26, 2015
  
  d4312fba
- split eye output in 2 logfiles and forward stdout to terminal in dev mode · 4f2ee111
  Benjamin Neff authored May 25, 2015
```
closes #5989
```
  4f2ee111
25 May, 2015 4 commits
- Merge branch 'stable' into develop · aae11e07
  Dennis Schubert authored May 25, 2015
  
  aae11e07
- wrap the sidekiq logger to add the context info again · b491ecac
  Benjamin Neff authored May 24, 2015
```
closes #5988
```
  b491ecac
- Merge branch 'stable' into develop · f9f73f56
  Dennis Schubert authored May 25, 2015
  
  f9f73f56
- Introduce 'authorized' configuration option for services · 7c0e50c2
  Jason Robinson authored May 19, 2015
```
Since the Facebook API has changed and additional permissions are required for all users on a pod to cross-post, an additional 'authorized' flag is needed to be set for the Facebook service.
This flag allows either all users, one user or no users to use the cross-posting service.

Clarifies the situation for #5923, #5260 and #5085.

closes #5985
```
  7c0e50c2
24 May, 2015 4 commits
- Merge branch 'stable' into develop · 3e35ef0b
  Jonne Haß authored May 24, 2015
  
  3e35ef0b
- fix validation for status-message when the author is missing · 986ad0df
  Benjamin Neff authored May 24, 2015
```
closes #5986
```
  986ad0df
- Merge branch 'stable' into develop · 2ca0a17e
  Dennis Schubert authored May 24, 2015
  
  2ca0a17e
- gracefully handle when a like is already deleted again · 8531b160
  Benjamin Neff authored May 23, 2015
```
closes #5983
```
  8531b160
23 May, 2015 2 commits
- Merge branch 'stable' into develop · ba9b9471
  Dennis Schubert authored May 22, 2015
  
  ba9b9471
- use id from preloaded gon.post to fix broken liking with guid · 68f7208f
  Benjamin Neff authored May 22, 2015
```
closes #5978
```
  68f7208f
22 May, 2015 6 commits
- Add Changelog entry for #5974 · 4093a1bd
  Dennis Schubert authored May 22, 2015
  
  4093a1bd
- Merge branch 'stable' into develop · 70dc4fca
  Dennis Schubert authored May 22, 2015
  
  70dc4fca
- use logging-logger for sidekiq · be3b2852
  Benjamin Neff authored May 20, 2015
```
closes #5975
```
  be3b2852
- use logging gem for better logging with class name and log-level · ac96232d
  Benjamin Neff authored May 20, 2015
  
  ac96232d
- replace silence_assets.rb with quiet_assets gem · 49f0fb6d
  Benjamin Neff authored May 20, 2015
  
  49f0fb6d
- Merge pull request #5974 from jhass/port_setting · fc6de28e
  Dennis Schubert authored May 22, 2015
```
Update listen configuration
```
  fc6de28e
21 May, 2015 5 commits
- Merge branch 'stable' into develop · e2671f7b
  Jonne Haß authored May 21, 2015
  
  e2671f7b
- ensure tmp/pids exists [ci skip] · 47672dcd
  Jonne Haß authored May 21, 2015
  
  47672dcd
- Listen to unix socket in production by default · ebe0c760
  Jonne Haß authored May 19, 2015
  
  ebe0c760
- Merge branch 'stable' into develop · 9b7a3c86
  Jonne Haß authored May 20, 2015
  
  9b7a3c86
- fixes reshares with no text but with photo · 9cc0faa4
  Benjamin Neff authored May 20, 2015
```
regression from 1da1c53f203e6eb9dad50872e573a4965219ef92

closes #5976
```
  9cc0faa4
19 May, 2015 5 commits
- Remove deprecated port setting · 898e8d59
  Jonne Haß authored May 19, 2015
  
  898e8d59
- Merge branch 'stable' into develop · 5a3b62d8
  Jonne Haß authored May 19, 2015
  
  5a3b62d8
- remove unused older and newer methods for posts · 9a4a7255
  Benjamin Neff authored May 19, 2015
```
last renamed in 8386179f

closes #5970
```
  9a4a7255
- Merge branch 'stable' into develop · 2549f44b
  Dennis Schubert authored May 19, 2015
  
  2549f44b
- add "original post deleted" message on single post view · 289753e0
  Benjamin Neff authored May 17, 2015
```
closes #5968
```
  289753e0