Commit graph

1567 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
4a944c5ab4
Use small avatar in the person json
closes #7376
2017-03-27 00:02:10 +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
5b0b3d989b
Merge pull request #7394 from SuperTux88/mention-backport-on-receive
Only backport mention syntax when the author is local
2017-03-26 12:26:52 +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
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
b0da14c383
Merge pull request #7386 from cmrd-senya/comment-mention-front-end
Comment mentions front-end
2017-03-24 00:20:37 +01: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
Steffen van Bergerem
b2d0feb00d
Merge pull request #7303 from cmrd-senya/jquery3
Use jQuery 3
2017-03-18 16:06:05 +01: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
Benjamin Neff
351b4d28bf
Merge branch 'next-minor' into develop 2017-03-05 01:58:24 +01:00
Benjamin Neff
13698bece5
Start 0.6.5.0 cycle 2017-03-05 01:56:50 +01:00
Benjamin Neff
ae687cf1d5
Merge branch 'next-minor' into develop 2017-03-05 00:01:11 +01:00
Benjamin Neff
8e4261100b
Create asterisk.png without digest after precompile
fixes #7317

closes #7322
2017-03-04 23:58:08 +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
e3c9e9c9f1
Improve comment service spec for limited post the user can't see
closes #7337
2017-02-18 23:00:49 +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
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
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
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
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
cdb220be8d
Merge branch 'next-minor' into develop 2017-02-11 19:37:30 +01:00
Steffen van Bergerem
dc8d66520b
Use $link-color for text and $brand-primary for backgrounds/buttons
closes #7318
2017-02-11 19:37:07 +01:00
Steffen van Bergerem
f1510ba2d6
Merge branch 'next-minor' into develop 2017-02-08 12:58:27 +01:00
Benjamin Neff
d9a1297271
Refactor PublisherHelper and move publisher_open? method
closes #7311
2017-02-08 12:58:13 +01:00