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 |
|
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
|
29e712dfc8
|
Merge pull request #7305 from SuperTux88/improve-mention-syntax
Improve mention syntax
|
2017-02-05 10:30:06 +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
|
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
|
3d992160c3
|
Enable locales: de-CH, gd, and oc
|
2017-01-23 02:35:14 +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
|
a0bfe6ffbe
|
Merge branch 'next-minor' into develop
|
2017-01-16 01:17:35 +01:00 |
|
Steffen van Bergerem
|
b508b9f6ef
|
Update database config comments
closes #7282
|
2017-01-16 01:17:27 +01:00 |
|
Benjamin Neff
|
7b7fbeffdc
|
Merge branch 'next-minor' into develop
|
2017-01-15 23:45:56 +01:00 |
|
spixi
|
fa0bd14dfb
|
Fix script/server when bin/ is not in PATH
This fixes an issue, when the bin/ directory of diaspora is not in the PATH variable
closes #7281
|
2017-01-15 23:27:27 +01:00 |
|
Benjamin Neff
|
5d52c298ad
|
Merge branch 'next-minor' into develop
|
2017-01-15 05:07:07 +01:00 |
|
Benjamin Neff
|
66367cccd8
|
Start 0.6.4.0 cycle
|
2017-01-15 05:05:24 +01:00 |
|
Steffen van Bergerem
|
eb8d9809ff
|
Merge branch 'next-minor' into develop
|
2017-01-15 04:04:31 +01:00 |
|
SansPseudoFix
|
0f60b9fb94
|
Switch reason and message
unify
rename and show full post on reports
Fix XSS issue
Unification
Style
Fix pronto
closes #7180
|
2017-01-15 04:04:18 +01:00 |
|
Benjamin Neff
|
03f9147589
|
Merge branch 'next-minor' into develop
|
2017-01-15 02:19:10 +01:00 |
|
Steffen van Bergerem
|
d0e70ccd6a
|
Use new ajax error handling for like, unlike and comment failures
closes #7227
|
2017-01-15 02:19:02 +01:00 |
|
Dennis Schubert
|
00193a8866
|
Merge branch 'next-minor' into develop
|
2017-01-15 00:11:18 +01:00 |
|
Benjamin Neff
|
f671bebd04
|
Fix background on mobile photo upload with dark theme
closes #7278
|
2017-01-15 00:11:07 +01:00 |
|
Benjamin Neff
|
66e3cdb07e
|
Merge branch 'next-minor' into develop
|
2017-01-14 03:22:36 +01:00 |
|