Steffen van Bergerem
|
e98d9501c4
|
Bump acts_as_api
|
2017-03-04 22:09:19 +01:00 |
|
Steffen van Bergerem
|
00e740bca4
|
Bump activerecord-import
|
2017-03-04 22:09:19 +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 |
|
Steffen van Bergerem
|
1a14061e38
|
Merge branch 'next-minor' into develop
|
2017-03-02 12:48:53 +01:00 |
|
Benjamin Neff
|
7d2e6c636b
|
Bump webmock
closes #7347
|
2017-03-02 12:48:47 +01:00 |
|
Benjamin Neff
|
f96edaa029
|
Merge branch 'next-minor' into develop
|
2017-03-02 01:27:06 +01:00 |
|
Steffen van Bergerem
|
313de7a047
|
Bump rails
closes #7345
|
2017-03-02 01:26:58 +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
|
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
|
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 |
|
Benjamin Neff
|
d984178685
|
Merge pull request #7327 from svbergerem/display-mentions-in-comment
Render mentions as links in comments
|
2017-02-13 23:58:28 +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
|
339c25f333
|
Merge pull request #7324 from SuperTux88/at-before-mention-links
Display @ before mentions
|
2017-02-13 22:06:50 +01:00 |
|
Steffen van Bergerem
|
ab0a4606e2
|
Use new mention syntax in specs
|
2017-02-13 21:56:05 +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 |
|
Benjamin Neff
|
5c444e62be
|
Add @ before mentions for mobile and notifications
fixes #7269
|
2017-02-12 20:10:36 +01:00 |
|
Benjamin Neff
|
c312ff00f3
|
Bump markdown-it-diaspora-mention
|
2017-02-12 19:30:43 +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 |
|
Benjamin Neff
|
cdb220be8d
|
Merge branch 'next-minor' into develop
|
2017-02-11 19:37:30 +01:00 |
|