Commit graph

9025 commits

Author SHA1 Message Date
Benjamin Neff
d9b02418b6
Merge branch 'next-minor' into develop 2017-03-27 00:04:53 +02:00
Steffen van Bergerem
4a56c0465c
Remove outdated rtl styles
These lines might have been necessary some time ago but now they are making things worse.

closes #7374
2017-03-27 00:04:38 +02:00
Steffen van Bergerem
2c53c2941e
Remove unused rtl styles 2017-03-27 00:03:06 +02:00
Steffen van Bergerem
d59ede46df
Remove styles for removed elements 2017-03-27 00:03:06 +02:00
Steffen van Bergerem
4a944c5ab4
Use small avatar in the person json
closes #7376
2017-03-27 00:02:10 +02:00
Steffen van Bergerem
13a44be306
Reduce size of conversation recipients in conversation form
Fixes #7321.
2017-03-27 00:01:29 +02:00
Steffen van Bergerem
6f3c61d8f2
Increase maximal height of large thumbnail
Fixes #6248, supersedes #6244.

closes #7383
2017-03-27 00:00:41 +02:00
Steffen van Bergerem
8a98cd4517
Refactor destroyModel function in base view
closes #7385
2017-03-26 23:53:37 +02:00
Steffen van Bergerem
3ce4bba383
Only remove post from stream after successful response
Pass destroyModel from post control view to post view
and don't listen to the remove event in the post view
anymore. The `remove` function will be called from the
base view.

Fixes #5445
2017-03-26 23:50:48 +02:00
Benjamin Neff
04e653bd69
Merge branch 'next-minor' into develop 2017-03-26 04:15:19 +02:00
Steffen van Bergerem
aa55a7a023
Remove custom jquery input event
closes #7371
2017-03-26 04:14:59 +02:00
Benjamin Neff
a07bd94ec6
Merge pull request #7389 from svbergerem/fix-comment-mentions-spacing
Fix comment mentions spacing
2017-03-26 04:06:34 +02:00
Benjamin Neff
d04a553ae2
Merge pull request #7380 from svbergerem/refactor-mentions-css
Refactor mentions-input-box css
2017-03-26 04:04:56 +02:00
Benjamin Neff
af0a5e32a1
Merge pull request #7369 from svbergerem/color-themes-i18n
i18n for color themes
2017-03-26 03:12:54 +02:00
Benjamin Neff
06b61b6480
Merge branch 'next-minor' into develop 2017-03-25 20:38:00 +01:00
Steffen van Bergerem
57b7debdb6
Refactor location stream view, remove unused function
closes #7364
2017-03-25 20:37:37 +01:00
Steffen van Bergerem
05e9798027
Fix sharing indicator on profile page for blocked users
closes #7382
2017-03-25 20:35:45 +01:00
Steffen van Bergerem
d3de97b244
Disable autocomplete for the conversation form recipient input
closes #7375
2017-03-25 20:34:13 +01:00
Steffen van Bergerem
a639951b20
Remove unused jquery.infinitescroll
closes #7370
2017-03-25 20:32:33 +01:00
Steffen van Bergerem
f5c937b9cf
Fix comment mentions spacing 2017-03-24 13:11:16 +01:00
Steffen van Bergerem
a1199ac219
Remove mentions-input-box 2017-03-24 01:14:01 +01:00
Steffen van Bergerem
d38eabf333
Refactor mentions-input-box css 2017-03-24 01:07:39 +01:00
cmrd Senya
c2f352d837
Comment mentions front-end 2017-03-24 00:40:24 +02:00
Steffen van Bergerem
a2ca68b523
Merge branch 'next-minor' into develop 2017-03-21 13:34:59 +01:00
flaburgan
ad7d4d777b
Add links to liked and commented pages within My activity
closes #5502
2017-03-21 13:34:47 +01:00
Steffen van Bergerem
80b53adcf0
Merge branch 'next-minor' into develop 2017-03-21 13:08:52 +01:00
flaburgan
b3e3de08b8
Fix block user failing feature
closes #7379
2017-03-21 13:08:44 +01:00
cmrd Senya
c90cb3328e
jQuery 3 integration 2017-03-18 16:50:52 +02:00
Steffen van Bergerem
ca6ce912d3
Merge branch 'next-minor' into develop 2017-03-17 11:34:56 +01:00
cmrd Senya
526ebcfa13
In jQuery 3 "#" is disallowed as a selector
here is a somewhat hacky way to force use an empty selector where "#"
was used as a selector before

closes #7372
2017-03-17 11:34:45 +01:00
Steffen van Bergerem
7eb3dabb44
i18n for color themes 2017-03-16 12:25:41 +01:00
Steffen van Bergerem
1b9ab16039
Merge branch 'next-minor' into develop 2017-03-06 21:11:54 +01:00
cmrd Senya
2739259fb6
some more replacements for deprecated jquery methods
closes #7356
2017-03-06 21:11:47 +01:00
Steffen van Bergerem
0aefc76aaa
Merge branch 'next-minor' into develop 2017-03-06 21:10:31 +01:00
Senya
0e28cfadb2
remove unused setPreload function
closes #7354
2017-03-06 21:10:25 +01:00
Steffen van Bergerem
6fce2810e5
Merge pull request #7331 from SuperTux88/fix-mentioned-in-comments-notifications
Fix mentioned in comments notifications
2017-03-05 20:07:25 +01:00
Benjamin Neff
509f429cc8
Move 'distinct' to 'allowed_to_be_mentioned_in_a_comment_to' 2017-03-05 17:59:28 +01:00
Benjamin Neff
e82ac2199f
Merge branch 'next-minor' into develop 2017-03-04 22:11:22 +01:00
Steffen van Bergerem
ff64581a70
Bump fineuploader 2017-03-04 22:09:25 +01:00
Benjamin Neff
e1bf447aad
Merge branch 'next-minor' into develop 2017-03-04 21:08:18 +01:00
Steffen van Bergerem
12deda1429
Change regexp for hashtags
Fixes #5765, fixes #5815, supersedes #6099.

closes #7350
2017-03-04 21:08:11 +01:00
Benjamin Neff
0488902b66
Merge branch 'next-minor' into develop 2017-02-19 21:56:19 +01:00
Steffen van Bergerem
bb2826842f
Only display invite link on contacts page if invitations are enabled
fixes #7340

closes #7342
2017-02-19 21:55:10 +01:00
Benjamin Neff
fa85b17890
Merge branch 'next-minor' into develop 2017-02-19 03:20:39 +01:00
Steffen van Bergerem
0627cdaf43
Use autosize in modals
Fixes #7338 and missing autosize in conversation forms on the profile page
and the contacts page. Regression from #6674.

closes #7339
2017-02-19 03:20:26 +01:00
Benjamin Neff
ec2c4a8564
Merge branch 'next-minor' into develop 2017-02-18 23:00:59 +01:00
Steffen van Bergerem
436934e890
Refactor reshares controller using reshare service 2017-02-18 22:59:38 +01:00
Steffen van Bergerem
44b616eda8
Add reshare service 2017-02-18 22:59:38 +01:00
Steffen van Bergerem
e74b524e8f
Refactor likes index route 2017-02-18 22:59:37 +01:00
Steffen van Bergerem
2772cb6e0c
Refactor likes controller using like service 2017-02-18 22:59:37 +01:00