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 |
|
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
|
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 |
|
Steffen van Bergerem
|
f93124863f
|
Add like service
|
2017-02-18 22:59:33 +01:00 |
|
Benjamin Neff
|
f9cf844602
|
Merge pull request #7280 from svbergerem/remove-chartbeat-and-mixpanel
Remove chartbeat and mixpanel support
|
2017-02-17 22:22:30 +01:00 |
|
Benjamin Neff
|
3d95642aca
|
Fix receiving multiple mentioned-in-comment notifications
When somebody commented multiple times and is mentioned in another
comment afterwards, the person received multiple notifications.
|
2017-02-16 03:09:40 +01:00 |
|
Benjamin Neff
|
eac8c7572c
|
Remove unused From headers
It is already added in the default_headers
|
2017-02-16 03:09:39 +01:00 |
|
Benjamin Neff
|
97c351c7b4
|
Add In-Reply-To and References header to mentioned in comment mail
|
2017-02-16 02:47:35 +01:00 |
|
Benjamin Neff
|
f1f1d09944
|
Merge pull request #7302 from svbergerem/simplify-mentions-publisher
Simplify mentions in the publisher
|
2017-02-15 03:15:01 +01:00 |
|
Steffen van Bergerem
|
810e43787c
|
Merge branch 'next-minor' into develop
|
2017-02-14 10:37:05 +01:00 |
|
Benjamin Neff
|
d68ad916c8
|
Remove whitespace from author link
closes #7330
|
2017-02-14 10:36:58 +01:00 |
|
Steffen van Bergerem
|
c8ee03f639
|
Merge branch 'next-minor' into develop
|
2017-02-14 09:59:34 +01:00 |
|
Benjamin Neff
|
8182e711b1
|
closes #7329
|
2017-02-14 09:59:30 +01:00 |
|
Benjamin Neff
|
8a409c815c
|
Merge branch 'next-minor' into develop
|
2017-02-14 00:30:53 +01:00 |
|
Steffen van Bergerem
|
5f8c838750
|
Change color of author-name on hover
closes #7326
|
2017-02-14 00:30:44 +01:00 |
|
Steffen van Bergerem
|
ef3faff8f1
|
Render mentions as links in comments
|
2017-02-13 21:47:57 +01:00 |
|
Steffen van Bergerem
|
99351bd152
|
Merge branch 'next-minor' into develop
|
2017-02-13 14:21:29 +01:00 |
|
Benjamin Neff
|
e92431ba88
|
Remove some unused color-theme overrides
After #7318 $link-color is used by default, no need to override anymore.
closes #7325
|
2017-02-13 14:21:20 +01:00 |
|
Benjamin Neff
|
2f9a032b38
|
Merge branch 'next-minor' into develop
|
2017-02-12 21:01:36 +01:00 |
|
Steffen van Bergerem
|
9558e747e4
|
Increase time to wait before showing the hovercard
closes #7319
|
2017-02-12 21:01:21 +01:00 |
|
Steffen van Bergerem
|
a6e6e6de91
|
Refactor publisher mentions backbone view
|
2017-02-12 18:36:27 +01:00 |
|