Dennis Schubert
7401808e3f
Merge branch 'stable' into develop
2015-05-31 01:49:43 +02:00
Benjamin Neff
76ca4fdc70
use image_url for the logo in mails
...
closes #6013
2015-05-31 01:49:38 +02:00
Dennis Schubert
8c4bcd8bd3
Merge branch 'stable' into develop
2015-05-31 01:47:09 +02:00
Steffen van Bergerem
fdad348898
Fix tag rendering in emails
...
closes #6009
2015-05-31 01:47:05 +02:00
Dennis Schubert
b2dbdb3706
Merge branch 'stable' into develop
2015-05-30 03:08:30 +02:00
Jonne Haß
ac52cef546
Only return the current_users participation for post interactions
...
closes #6007
2015-05-30 03:08:25 +02:00
Dennis Schubert
807b4f72bd
Merge pull request #6003 from jhass/remove_db_hack
...
Replace DB environment variable with optional bundler groups
2015-05-30 03:04:33 +02:00
Jonne Haß
146f7eea52
Merge branch 'stable' into develop
2015-05-29 11:42:03 +02:00
Sandip Trivedi
b026a2afe8
Replaces facebox vendored asset with rails gem #5194
...
closes #6005
2015-05-29 11:41:57 +02:00
Jonne Haß
6581c580f8
Merge branch 'stable' into develop
2015-05-29 11:39:36 +02:00
Benjamin Neff
604ffb445a
optimized sprites
...
- move mobile icons to mobile-folder, so they aren't included in the
icons-sprite
- move logos to branding/logos, and create a logos-sprite without the
big other branding-images
- delete duplicate images
closes #6004
2015-05-29 11:39:30 +02:00
Benjamin Neff
247e9efe49
remove unused branding images
2015-05-29 11:39:01 +02:00
Benjamin Neff
bd8888291d
remove more old assets
2015-05-29 11:39:01 +02:00
Benjamin Neff
a22be8a4cb
remove unused social media logos and add attribution
2015-05-29 11:39:01 +02:00
Benjamin Neff
36b1568d32
remove old unused icons (mostly replaced by entypo)
2015-05-29 11:39:00 +02:00
Jonne Haß
c85fe3872e
Replace DB environment variable with optional bundler groups
...
See the changes to the changelog for more details
2015-05-29 01:33:12 +02:00
Jonne Haß
351f54d74f
Merge branch 'stable' into develop
2015-05-28 11:24:34 +02:00
Sandip Trivedi
36d6c5d2ba
Remove unnecessary initializer and comments in Gemfile and add explicit rubyzip gem version in Gemfile with description
...
closes #6001
2015-05-28 11:24:30 +02:00
Sandip Trivedi
2ba2ef1b9c
Replaces the zipzip gem with the rubyzip gem
2015-05-28 11:23:57 +02:00
Dennis Schubert
44919233c0
Merge branch 'stable' into develop
2015-05-28 01:34:28 +02:00
Benjamin Neff
21ae93e658
handle when the diaspora xml parser returns nil
...
closes #5991
2015-05-28 01:34:24 +02:00
Dennis Schubert
04df6c115d
Merge branch 'stable' into develop
2015-05-28 01:28:19 +02:00
Steffen van Bergerem
6206bb9920
Update markdown-it-hashtag
...
closes #5998
2015-05-28 01:28:15 +02:00
Dennis Schubert
d34878df55
Merge branch 'stable' into develop
2015-05-28 01:26:53 +02:00
Benjamin Neff
5655eead7c
make the logrotation configurable
...
closes #5994
2015-05-28 01:26:48 +02:00
Dennis Schubert
8c408a57ae
Merge branch 'stable' into develop
2015-05-26 05:25:43 +02:00
Dennis Schubert
62e8f87f2c
Do not mute ActiveRecord::RecordNotUnique for now see #5971 , regression from #5938
...
closes #5992
2015-05-26 05:25:39 +02:00
Dennis Schubert
d4312fbaba
Merge branch 'stable' into develop
2015-05-26 03:08:01 +02:00
Benjamin Neff
4f2ee11158
split eye output in 2 logfiles and forward stdout to terminal in dev mode
...
closes #5989
2015-05-26 03:06:42 +02:00
Dennis Schubert
aae11e07ae
Merge branch 'stable' into develop
2015-05-25 04:23:33 +02:00
Benjamin Neff
b491ecac31
wrap the sidekiq logger to add the context info again
...
closes #5988
2015-05-25 04:23:28 +02:00
Dennis Schubert
f9f73f56db
Merge branch 'stable' into develop
2015-05-25 04:18:46 +02:00
Jason Robinson
7c0e50c2c2
Introduce 'authorized' configuration option for services
...
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
2015-05-25 04:18:38 +02:00
Jonne Haß
3e35ef0b63
Merge branch 'stable' into develop
2015-05-24 11:16:09 +02:00
Benjamin Neff
986ad0df14
fix validation for status-message when the author is missing
...
closes #5986
2015-05-24 11:16:05 +02:00
Dennis Schubert
2ca0a17ee0
Merge branch 'stable' into develop
2015-05-24 02:30:08 +02:00
Benjamin Neff
8531b160a6
gracefully handle when a like is already deleted again
...
closes #5983
2015-05-24 02:30:02 +02:00
Dennis Schubert
ba9b947173
Merge branch 'stable' into develop
2015-05-23 01:24:14 +02:00
Benjamin Neff
68f7208ff5
use id from preloaded gon.post to fix broken liking with guid
...
closes #5978
2015-05-23 01:24:09 +02:00
Dennis Schubert
4093a1bdd3
Add Changelog entry for #5974
2015-05-22 03:11:55 +02:00
Dennis Schubert
70dc4fcab1
Merge branch 'stable' into develop
2015-05-22 02:53:55 +02:00
Benjamin Neff
be3b2852be
use logging-logger for sidekiq
...
closes #5975
2015-05-22 02:53:50 +02:00
Benjamin Neff
ac96232d85
use logging gem for better logging with class name and log-level
2015-05-22 02:53:19 +02:00
Benjamin Neff
49f0fb6dcd
replace silence_assets.rb with quiet_assets gem
2015-05-22 02:53:19 +02:00
Dennis Schubert
fc6de28ee1
Merge pull request #5974 from jhass/port_setting
...
Update listen configuration
2015-05-22 02:47:07 +02:00
Jonne Haß
e2671f7b05
Merge branch 'stable' into develop
2015-05-21 17:26:39 +02:00
Jonne Haß
47672dcd6b
ensure tmp/pids exists [ci skip]
2015-05-21 17:25:47 +02:00
Jonne Haß
ebe0c76040
Listen to unix socket in production by default
2015-05-21 17:23:36 +02:00
Jonne Haß
9b7a3c86e6
Merge branch 'stable' into develop
2015-05-21 00:46:59 +02:00
Benjamin Neff
9cc0faa4e6
fixes reshares with no text but with photo
...
regression from 1da1c53f203e6eb9dad50872e573a4965219ef92
closes #5976
2015-05-21 00:46:50 +02:00
