Commit graph

1374 commits

Author SHA1 Message Date
Benjamin Neff
58642de8cb Merge branch 'next-minor' into develop 2016-09-13 01:01:12 +02:00
Steffen van Bergerem
2c41485a61 Add charset to error pages
closes #7092
2016-09-13 01:01:08 +02:00
Benjamin Neff
36b2dff164 Merge branch 'next-minor' into develop 2016-09-13 01:00:13 +02:00
Steffen van Bergerem
2139f4b4c2 Use div instead of span for loader
closes #7091
2016-09-13 01:00:04 +02:00
Benjamin Neff
960f39b6ff Merge branch 'next-minor' into develop 2016-09-12 00:47:23 +02:00
Steffen van Bergerem
12e9e551d9 Remove blueimp gallery heading
closes #7082
2016-09-12 00:47:18 +02:00
Benjamin Neff
838982e92c Merge branch 'next-minor' into develop 2016-09-12 00:39:40 +02:00
Steffen van Bergerem
16af93f8a2 Prevent overflow of interaction avatars in the single post view
closes #7070
2016-09-12 00:39:28 +02:00
Benjamin Neff
b3b4ccd553 Merge branch 'next-minor' into develop 2016-09-11 23:06:27 +02:00
Steffen van Bergerem
4036a572af Remove whitespaces next to like link in stream
closes #7088
2016-09-11 23:06:21 +02:00
Steffen van Bergerem
eb0f948af5
Merge branch 'next-minor' into develop 2016-09-11 01:55:34 +02:00
Benjamin Neff
a5f538b9ae
Load jquery in the head on mobile
Some pages need jquery in the head and instead of loading it twice on
these pages, it is better and easier to load it in the head on all
pages. It should be in the cache after the first load anyway.

closes #7086
2016-09-11 01:55:25 +02:00
Benjamin Neff
4bf1ca6616 Merge branch 'next-minor' into develop 2016-09-11 00:21:28 +02:00
Steffen van Bergerem
546f909658 Fix 500 in html requests for post interactions
closes #7085
2016-09-11 00:21:13 +02:00
Steffen van Bergerem
580a068abf
Merge branch 'next-minor' into develop 2016-09-10 15:03:49 +02:00
Flaburgan
f0e70a3c6c
Fix wrong aria label
closes #7068
2016-09-10 15:03:39 +02:00
Steffen van Bergerem
3a58c233f4
Merge branch 'next-minor' into develop 2016-09-09 00:54:00 +02:00
cmrd Senya
ad596d8df1
Fix tags URLs in hovercards
fixes #7074

closes #7075
2016-09-09 00:53:21 +02:00
Dennis Schubert
99d8ca8414
Merge branch 'next-minor' into develop 2016-09-06 06:03:11 +02:00
Steffen van Bergerem
c6858d62a3
Add missing sidebar background in contacts tab
closes #7064
2016-09-06 06:03:06 +02:00
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
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
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
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
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
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
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
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
Steffen van Bergerem
5c9978a72a
Merge pull request #7039 from lislis/4779-indicate-proper-way-to-report-bugs-in-sidebar
Indicate proper way to report bugs in sidebar, close #4779
2016-09-01 13:49:21 +02:00
Dennis Schubert
3f157bec35
Prepare 0.7.0.0 cycle
[ci skip]
2016-08-21 23:53:42 +02:00
Dennis Schubert
0921cfb43e
Prepare 0.6.1.0 cycle
[ci skip]
2016-08-21 23:52:30 +02:00
Jonne Haß
33c8e029ee
add changelog entry for #6998 [ci skip] 2016-08-18 21:56:10 +02:00
Steffen van Bergerem
bcb34ecaa7
Fix a link in the changelog [ci skip] 2016-08-18 17:16:54 +02:00
Jonne Haß
148e85558a
Merge pull request #7001 from svbergerem/fix-conversation-recipient-suggestions
Fix conversations autoSuggest showing non-mutual contacts
2016-08-18 13:36:27 +02:00