Dennis Schubert
09aef2f145
Merge branch 'next-minor' into develop
2016-09-06 05:08:09 +02:00
Steffen van Bergerem
e27af6ee1a
Redirect logged in users to inviters page when following an invitation link
...
closes #7061
2016-09-06 05:08:04 +02:00
Steffen van Bergerem
16fc0ec015
Merge branch 'next-minor' into develop
2016-09-05 22:44:57 +02:00
Benjamin Neff
c5ebea5bda
Fix randomly failing interacted_at spec
...
also remove some unnecessary Timecop.return
closes #7060
2016-09-05 22:44:52 +02:00
Dennis Schubert
a53354edc2
Merge branch 'next-minor' into develop
2016-09-04 21:40:31 +02:00
Benjamin Neff
50e7314535
Cleanup invalid unconfirmed emails
...
Also remove confirm_email_token when unconfirmed_email is removed.
Fixes #7048
closes #7051
2016-09-04 21:40:27 +02:00
Benjamin Neff
a85c8e75f2
Merge branch 'next-minor' into develop
2016-09-04 03:55:17 +02:00
Steffen van Bergerem
4d51c02432
Add OpenGraph video support
...
closes #7043
2016-09-04 03:55:09 +02:00
Dennis Schubert
8a9ed52fe4
Merge branch 'next-minor' into develop
2016-09-04 03:37:23 +02:00
Dennis Schubert
0514545fba
Pin diaspora-prosody-config version
2016-09-04 03:36:58 +02:00
Dennis Schubert
948d634a43
Merge branch 'next-minor' into develop
2016-09-04 03:33:08 +02:00
Lukas Matt
19b21b07a4
bump diaspora-prosody-config to v0.0.7
...
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
closes #7029
2016-09-04 03:33:03 +02:00
Dennis Schubert
a87097785e
Merge branch 'next-minor' into develop
2016-09-04 03:31:46 +02:00
Benjamin Neff
8c58206e63
Fix links of more-button on mobile streams
...
Fixes #6999
closes #7036
2016-09-04 03:31:41 +02:00
Dennis Schubert
daff91ea20
Merge branch 'next-minor' into develop
2016-09-04 03:30:10 +02:00
Benjamin Neff
4fea926057
Only update interacted_at on new comments
...
I got feedback from many users, that they don't understand how the "my
activity" stream is sorted, because they have posts on the top, but
don't see why. The user doesn't see if a like was added, and it is also
not imported for the user to see the post again then. And we have
notifications if someone likes a users own posts, so no need to move it on
top of the "my activity" stream here too.
closes #7030
2016-09-04 03:29:59 +02:00
Dennis Schubert
37f8508153
Merge branch 'next-minor' into develop
2016-09-04 03:28:16 +02:00
Steffen van Bergerem
02ad431fb0
Fix conversations message overflow when posting code
...
Related issue: https://github.com/twbs/bootstrap/issues/15958
closes #7055
2016-09-04 03:28:12 +02:00
Dennis Schubert
fa99009d87
Merge branch 'next-minor' into develop
2016-09-04 03:26:47 +02:00
Steffen van Bergerem
c3de77e0fc
Send notification mails on CSRF fails
...
closes #7050
2016-09-04 03:26:42 +02:00
Steffen van Bergerem
6ad9000f8c
Sign out users with wrong CSRF tokens
...
See http://guides.rubyonrails.org/security.html#cross-site-request-forgery-csrf
2016-09-04 03:26:18 +02:00
Dennis Schubert
75dcc1008e
Merge branch 'next-minor' into develop
2016-09-04 03:23:02 +02:00
Steffen van Bergerem
806de7e9d8
Exclude closed accounts from search
...
closes #7042
2016-09-04 03:22:58 +02:00
Dennis Schubert
cc8eff9efb
Merge branch 'next-minor' into develop
2016-09-04 03:17:53 +02:00
Steffen van Bergerem
9a2cb1517a
Set participations client side when changing post interactions
...
closes #7040
2016-09-04 03:17:48 +02:00
Steffen van Bergerem
02742a4a8f
Use post controls view for single post moderation
2016-09-04 03:16:24 +02:00
Steffen van Bergerem
8faedd574d
Move post controls to a separate view
2016-09-04 03:16:24 +02:00
Steffen van Bergerem
68045cec8c
Remove unused feedback actions view
2016-09-04 03:16:24 +02:00
Dennis Schubert
684d7d8312
Merge branch 'next-minor' into develop
2016-09-04 03:15:39 +02:00
Steffen van Bergerem
ffdd5a14ac
Remove deleted comments when loading more comments
...
closes #7045
2016-09-04 03:15:35 +02:00
Steffen van Bergerem
e3e9510e6a
Refactor appending comments to the comment stream
2016-09-04 03:14:17 +02:00
Dennis Schubert
0a5df214f2
Merge branch 'next-minor' into develop
2016-09-04 03:06:20 +02:00
Benjamin Neff
b3453c494e
make session-cookie HttpOnly
...
closes #7041
2016-09-04 03:06:15 +02:00
Dennis Schubert
a7d030e1df
Merge branch 'next-minor' into develop
2016-09-04 03:02:36 +02:00
Steffen van Bergerem
28dd88543e
Add cuke for changing the preferred language
...
closes #7053
2016-09-04 03:02:31 +02:00
Steffen van Bergerem
ce7d008e09
Set grammatical gender in tags controller
2016-09-04 03:02:27 +02:00
Steffen van Bergerem
89b51dddf9
Add application controller specs for grammatical gender
2016-09-04 03:02:27 +02:00
Dennis Schubert
d2a0528b56
Merge branch 'next-minor' into develop
2016-09-04 03:01:55 +02:00
Steffen van Bergerem
08794bc47b
Remove user_photo method from users controller
...
closes #7049
2016-09-04 03:01:51 +02:00
Benjamin Neff
25928864e9
Merge branch 'next-minor' into develop
2016-09-04 02:25:14 +02:00
Steffen van Bergerem
18fbb2a885
Remove useless notifier spec
...
closes #7056
2016-09-04 02:24:58 +02:00
Steffen van Bergerem
c7c9bb9628
Merge branch 'next-minor' into develop
2016-09-04 01:44:31 +02:00
Benjamin Neff
5017bd9541
rewrite notifier template with haml
...
closes #7054
2016-09-04 01:44:15 +02:00
Benjamin Neff
b0611ce270
remove logo from mails
2016-09-04 01:43:24 +02:00
Benjamin Neff
364502a134
bring back sender avatar
2016-09-04 01:43:24 +02:00
Benjamin Neff
575748169e
remove text color from notification mails
2016-09-04 01:43:24 +02:00
Benjamin Neff
dcbdf54511
Merge branch 'next-minor' into develop
2016-09-01 22:50:14 +02:00
Lukas Matt
cf5a9d7e04
Delete all null entries before removing the column
...
related to #7032
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
closes #7038
2016-09-01 22:49:07 +02:00
Steffen van Bergerem
175d061032
Merge branch 'next-minor' into develop
2016-09-01 21:51:36 +02:00
Steffen van Bergerem
33b064b8dc
Add changelog for #7039 [ci skip]
2016-09-01 21:50:19 +02:00
