Benjamin Neff
e91a0a57a3
Merge branch 'next-minor' into develop
2017-04-08 00:00:56 +02:00
Steffen van Bergerem
bcb75e3082
Add avatar fallback for conversations view
...
Fixes #4991
2017-04-08 00:00:12 +02:00
Steffen van Bergerem
1c1af74e9f
Add avatar fallback for typeahead suggestions
2017-04-07 23:59:58 +02:00
Steffen van Bergerem
c94bac3cf9
Return 406 instead of 500 for statistics.json
...
Fixes #7406
2017-03-30 23:17:58 +02:00
Steffen van Bergerem
e8ee74ef87
Remove statistics.json
2017-03-27 15:54:34 +02:00
Benjamin Neff
d9b02418b6
Merge branch 'next-minor' into develop
2017-03-27 00:04:53 +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
d0fcdc254e
Only backport mention syntax when the author is local
...
We don't need to change new to old syntax when we receive a post from a
newer pod, since we can handle the new syntax. This is only needed when
sending it to older pods.
related to #7392
2017-03-25 23:42:19 +01:00
Benjamin Neff
06b61b6480
Merge branch 'next-minor' into develop
2017-03-25 20:38:00 +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
cmrd Senya
c2f352d837
Comment mentions front-end
2017-03-24 00:40:24 +02:00
cmrd Senya
71e0bdc411
app_spec fixes
2017-03-18 16:50:55 +02:00
cmrd Senya
c90cb3328e
jQuery 3 integration
2017-03-18 16:50:52 +02: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
cmrd Senya
f36a4cd1f5
don't use the deprecated ".selector" method
2017-03-06 21:11:13 +01:00
cmrd Senya
a479db1c96
a missing spy
2017-03-06 21:11:12 +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
612455d41f
Bump faraday and twitter
...
closes #7348
2017-03-04 22:10:23 +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
ec2c4a8564
Merge branch 'next-minor' into develop
2017-02-18 23:00:59 +01:00
Steffen van Bergerem
e3c9e9c9f1
Improve comment service spec for limited post the user can't see
...
closes #7337
2017-02-18 23:00:49 +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
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
Benjamin Neff
3ef98f50ee
Merge pull request #7328 from svbergerem/use-new-mention-syntax-in-specs
...
Use new mention syntax in specs
2017-02-13 23:19:32 +01:00
Steffen van Bergerem
ab0a4606e2
Use new mention syntax in specs
2017-02-13 21:56:05 +01:00
Benjamin Neff
5c444e62be
Add @ before mentions for mobile and notifications
...
fixes #7269
2017-02-12 20:10:36 +01:00
Steffen van Bergerem
a6e6e6de91
Refactor publisher mentions backbone view
2017-02-12 18:36:27 +01:00
Steffen van Bergerem
b23debf0b6
Refactor publisher backbone view
2017-02-12 18:36:27 +01:00
Steffen van Bergerem
9217df43cd
Only update mentions in publisher before opening suggestions or preview
2017-02-12 18:36:27 +01:00
Steffen van Bergerem
90b379b110
Drop useless data attribute for message text in publisher
2017-02-12 18:36:26 +01:00
Steffen van Bergerem
c4b6b9534c
No more fake text in the publisher
2017-02-12 18:36:26 +01:00
Steffen van Bergerem
a04f32adce
Drop mentions box in the publisher
2017-02-12 18:31:37 +01:00
Steffen van Bergerem
b3c412d38f
Display mention syntax in publisher instead of username
2017-02-12 18:31:36 +01:00
Steffen van Bergerem
408645cccc
Use new mention syntax in the publisher
2017-02-12 18:31:36 +01:00
Steffen van Bergerem
f1510ba2d6
Merge branch 'next-minor' into develop
2017-02-08 12:58:27 +01:00
Benjamin Neff
8ebf9c4a4c
Move publisher methods to PublisherHelper and check public publisher flag
...
This makes the #newhere post public again.
2017-02-08 12:56:34 +01:00
Benjamin Neff
2d8d0255dd
Improve handling with new mention syntax without name
...
* fallback to diaspora ID when person is not found
* fix filter_people when the person is not found
* write some more tests
2017-01-31 20:56:22 +01:00
Benjamin Neff
84e2a131cf
Remove { and } from the name when backporting mentions
...
Because } is not compatible with the regex.
2017-01-31 20:56:21 +01:00
Benjamin Neff
0e89d60117
Use name of mentioned person in plain text
2017-01-29 03:06:26 +01:00
