Commit graph

16269 commits

Author SHA1 Message Date
Jonne Haß
ada2913cd7 bump webmock 2015-10-29 04:20:37 +01:00
Jonne Haß
c0c4b7277b bump shoulda-matchers 2015-10-29 04:20:37 +01:00
Jonne Haß
6404f5df2b bump rubocop 2015-10-29 04:20:37 +01:00
Jonne Haß
e0e2ab01af bump redcarpet 2015-10-29 04:19:18 +01:00
Jonne Haß
19875a59e0 bump rails-assets-jquery-placeholder 2015-10-29 04:19:18 +01:00
Jonne Haß
bd427ea2db bump pry 2015-10-29 04:18:53 +01:00
Jonne Haß
b1318779a6 bump mini_magick 2015-10-29 04:18:12 +01:00
Jonne Haß
6bc1314b43 bump handlebars_assets 2015-10-29 04:18:12 +01:00
Jonne Haß
fb923a188e bump faraday 2015-10-29 04:17:42 +01:00
Jonne Haß
3eb32a6c60 bump database_cleaner 2015-10-29 04:17:07 +01:00
cmrd Senya
00588e1ef8 Disable self-notification possibility
closes #6512
2015-10-20 16:27:39 +02:00
Dennis Schubert
d8ed529f92 Merge branch 'master' into stable 2015-10-19 18:56:56 -07:00
Dennis Schubert
bdc55f05f7 Release 0.5.4.0 2015-10-19 18:55:33 -07:00
Dennis Schubert
1f4ad4019f Merge branch 'release/0.5.4.0' into stable 2015-10-19 18:49:08 -07:00
Dennis Schubert
aabe6951e5 Do not reload Streams asynchronously
Fixes #6494 and #6473
Partly reverts 517cd56f21
[ci skip]
2015-10-19 18:46:09 -07:00
Steffen van Bergerem
06c1d2e9e3 Compare person id in people show view
closes #6505
2015-10-15 12:20:13 +02:00
Steffen van Bergerem
995ce18c37 Display publisher on user profile path
closes #6503
2015-10-15 05:58:38 +02:00
cmrd Senya
69b46df3d6 Notifications for comments on local posts by non-contacts 2015-10-14 22:32:19 +02:00
cmrd Senya
dc02c5384b Notify a remote user when a non-contact user likes or comment her public post 2015-10-14 22:30:35 +02:00
Lincoln Stoll
6ac6dc1059 Don't set key for logfile on Heroku
This fixes the issue reported in #5947. Sidekiq will only log to stdout when this key evals to false, so this can't be forced with an empty string. This change eliminates the key altogether when running on Heroku.

closes #6500
2015-10-14 11:00:42 +02:00
cmrd Senya
70b5d86386 Remove the lines from inlined_jobs.rb which never get called.
closes #6499
2015-10-14 01:14:54 +02:00
Jonne Haß
6e845eb22a Do not enforce lambda { } for multiline [ci skip] 2015-10-13 12:06:53 +02:00
Steffen van Bergerem
b68daaece3 Redirect to sign in on 401 ajax response
closes #6496
2015-10-12 16:12:30 +02:00
Steffen van Bergerem
b9e6f749e2 Clean up view.js 2015-10-12 11:36:09 +02:00
Dennis Schubert
9df2cb7290 Prepare 0.5.5.0 release
[ci skip]
2015-10-12 03:41:38 +02:00
Steffen van Bergerem
123e6d1dd4 Redirect logged out users to sign up page for limited posts
closes #6490
2015-10-11 17:29:01 +02:00
Lukas Matt
9be6b41141 bump vines to v0.2.0.develop.4
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>

closes #6489
2015-10-10 20:44:57 +02:00
Steffen van Bergerem
230f6d6d62 Fix hovercard view console error
closes #6480
2015-10-10 06:45:09 +02:00
Steffen van Bergerem
2fc7caf0bd Fix infinite scroll console error
closes #6478
2015-10-09 23:10:58 +02:00
Steffen van Bergerem
4e5d09e6c5 Fix 'post to single aspect' cukes 2015-10-09 23:10:53 +02:00
Steffen van Bergerem
98eca2d1a6 Update perfect-scrollbar
closes #6476
2015-10-09 18:16:35 +02:00
Steffen van Bergerem
95f3a5edbf Update markdown-it 2015-10-09 18:15:13 +02:00
Steffen van Bergerem
f7bd0bbb24 DRY app/router.js 2015-10-09 17:45:51 +02:00
Steffen van Bergerem
dccad3f7e1 Remove old stream instance when reloading the stream
closes #6472
2015-10-09 11:00:27 +02:00
Steffen van Bergerem
1ad48d7ce3 Fix changelog for #6462 [ci skip] 2015-10-08 16:18:49 +02:00
Steffen van Bergerem
da9cb52007 Scroll to top when reloading the stream
closes #6470
2015-10-08 14:44:02 +02:00
Steffen van Bergerem
0c214cd4ca Make click on active stream link reload the stream
closes #6466
2015-10-08 10:52:18 +02:00
Steffen van Bergerem
e0be1b49f1 Add public stream
closes #6465
2015-10-07 22:29:39 +02:00
Faldrian
058bcb43f8 Added avatar image fallback for notifications
closes #6463
2015-10-07 21:58:56 +02:00
Faldrian
d486e37487 following tags now normalized and sorted in ui
closes #6454
2015-10-07 21:38:12 +02:00
Faldrian
a946251a9e Show getting_started only if user has made no profile changes on the page
closes #6456
2015-10-07 10:58:06 +02:00
Steffen van Bergerem
517cd56f21 Don't reload stream pages
closes #6462
2015-10-06 22:46:58 +02:00
Steffen van Bergerem
25e4d8c365 Fix shortcuts after changing streams 2015-10-06 22:34:36 +02:00
Jonne Haß
c5819b9c57 Enable SQL logging by default in development mode 2015-10-05 15:22:28 +02:00
Lukas Matt
1cf69b33ea bump diaspora-vines to v0.2.0.develop.3
closes #6441
2015-10-03 02:28:01 +02:00
augier
22882aa24d Infinite scroll triggered relative to last element top rather than window bottom
closes #6451
2015-10-02 23:42:26 +02:00
Steffen van Bergerem
baba71612d Replace deprecated default_wait_time for Capybara
closes #6430
2015-09-27 12:02:24 +02:00
Jonne Haß
ca215ca28d Sidetiq still isn't celluloid 0.17 compatible 2015-09-21 12:21:16 +02:00
Jonne Haß
8c246c406f bump typhoeus 2015-09-19 23:02:13 +02:00
Jonne Haß
e571acf2f2 bump notiffany 2015-09-19 23:01:37 +02:00