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
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
dba8de5488
Use $blue only for reshare icon and $link-color everywhere else
2017-02-11 19:17:45 +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
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
44f712a2e6
Add test for first post to be public
2017-02-08 12:56:34 +01:00
Dennis Schubert
63077bfeaf
Merge branch 'next-minor' into develop
2017-02-05 10:34:48 +01:00
Steffen van Bergerem
690bbd9db3
Link to community guidelines from left navbar
...
closes #7298
2017-02-05 10:34:44 +01:00
Dennis Schubert
37cdc7c10e
Merge branch 'next-minor' into develop
2017-02-05 10:32:18 +01:00
Benjamin Neff
ab79758f72
Update spring binstub
...
closes #7287
2017-02-05 10:32:13 +01:00
Dennis Schubert
fda2d846e8
Merge branch 'next-minor' into develop
2017-02-05 10:31:34 +01:00
Benjamin Neff
b910c1730c
Bump asset_sync
...
This new version now has fog-core as dependency instead of fog. Now we
can only add fog-aws as dependency and remove all other fog provider.
closes #7289
2017-02-05 10:31:29 +01:00
Dennis Schubert
29e712dfc8
Merge pull request #7305 from SuperTux88/improve-mention-syntax
...
Improve mention syntax
2017-02-05 10:30:06 +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
19e122264b
Merge branch 'next-minor' into develop
2017-01-31 01:52:46 +01:00
Steffen van Bergerem
d790dec24d
Bump markdown-it-diaspora-mention
...
closes #7301
2017-01-31 01:52:02 +01:00
Benjamin Neff
e10771c707
Merge pull request #7300 from SuperTux88/new-mention-syntax
...
New mention syntax - backend changes
2017-01-29 07:02:35 +01:00
Benjamin Neff
0e89d60117
Use name of mentioned person in plain text
2017-01-29 03:06:26 +01:00
Benjamin Neff
322f92110a
Backport new mention syntax to old syntax for backward compatibility
...
See #7276
2017-01-29 03:06:26 +01:00
Benjamin Neff
a0d200d209
Update regex for new mention syntax
...
See #7276
2017-01-29 03:06:26 +01:00
Steffen van Bergerem
2aa91e0b62
Merge branch 'next-minor' into develop
2017-01-28 18:04:21 +01:00
Senya
302ee795b6
Fix a jasmine test issue
...
The issue from a jasmine spec introduced by #7227 caused the testsuite that runs in a browser to be redirected out of the jasmine runner and therefore not finished.
closes #7299
2017-01-28 18:04:01 +01:00
Benjamin Neff
a025a23c71
Merge branch 'next-minor' into develop
2017-01-23 02:43:12 +01:00
Benjamin Neff
c130b78117
Merge branch 'master' into next-minor
2017-01-23 02:42:53 +01:00
Benjamin Neff
1702cc1c86
Merge branch 'release/0.6.3.0'
2017-01-23 02:39:54 +01:00
Benjamin Neff
3d992160c3
Enable locales: de-CH, gd, and oc
2017-01-23 02:35:14 +01:00
Benjamin Neff
46ef3e65c4
updated 86 locale files [ci skip]
2017-01-23 02:09:19 +01:00
Benjamin Neff
af00d7c5c0
Merge branch 'next-minor' into develop
2017-01-22 23:30:42 +01:00
flaburgan
1028632ac1
Add Liberapay button in the donate section
...
closes #7290
2017-01-22 23:29:57 +01:00
Benjamin Neff
0e09c27a86
Merge branch 'next-minor' into develop
2017-01-19 00:20:53 +01:00
Steffen van Bergerem
8f95e973b2
Bump json
...
json 1.8.3 was incompatible with ruby 2.4.0
closes #7285
2017-01-19 00:20:43 +01:00
Benjamin Neff
8d84865e82
Merge branch 'next-minor' into develop
2017-01-18 23:52:17 +01:00
Benjamin Neff
451e6087be
Merge branch 'release/0.6.3.0' into next-minor
2017-01-18 23:52:11 +01:00
