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
Benjamin Neff
4e6a9aeb1e
Fallback to title if the reshare root was deleted
...
closes #7284
2017-01-18 23:51:42 +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
Steffen van Bergerem
941118d7af
Move formatting from locale to views
...
closes #7283
2017-01-15 23:42:03 +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
5e58068a72
Merge branch 'release/0.6.3.0' into next-minor
2017-01-15 23:00:32 +01:00
Benjamin Neff
e7d6831900
Add .wti to .gitignore
2017-01-15 22:40:13 +01:00
Steffen van Bergerem
bd0210a181
Remove chartbeat and mixpanel support
2017-01-15 13:30:54 +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
Steffen van Bergerem
bc5848fe9e
Use new ajax error handling for reshare failures
2017-01-15 02:17:10 +01:00
Steffen van Bergerem
d609238ed4
Refactor mobile alerts for error responses, add them to container with fixed position
2017-01-15 02:17:10 +01:00
Steffen van Bergerem
b8d3323de0
Return error when unlike failed
2017-01-15 02:17:10 +01:00
Steffen van Bergerem
de789267fc
Remove id selectors for mobile photo show page
...
closes #7279
2017-01-15 02:03:00 +01:00
Benjamin Neff
f11d51746d
Downgrade thor to 0.19.1
...
Version 0.19.4 prints errors to the console, which can be weird for
podmins.
See erikhuda/thor#538
2017-01-15 02:01:00 +01:00
Dennis Schubert
96b7c6b429
Merge branch 'next-minor' into develop
2017-01-15 00:13:17 +01:00
Benjamin Neff
8e196a34a1
Hash from federation library now contains strings
...
closes #7258
2017-01-15 00:13:11 +01:00
Benjamin Neff
b79ccc5207
Add created_at to comments
2017-01-15 00:12:08 +01:00
Benjamin Neff
99c52f055c
Bump diaspora_federation
2017-01-15 00:12:08 +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
0c0b618a8b
Fix background on mobile photo page with dark theme
2017-01-15 00:09:50 +01:00
Benjamin Neff
66e3cdb07e
Merge branch 'next-minor' into develop
2017-01-14 03:22:36 +01:00
Steffen van Bergerem
a290c432d8
Fix link to post on mobile photo page
...
closes #7274
2017-01-14 03:21:37 +01:00
Benjamin Neff
c2a66966f2
Merge branch 'next-minor' into develop
2017-01-14 02:09:09 +01:00
Steffen van Bergerem
521b3deefe
Bump markdown-it
...
closes #7277
2017-01-14 02:08:55 +01:00
Steffen van Bergerem
a341be7677
Bump markdown-it-diaspora-mention
2017-01-14 02:08:14 +01:00
Benjamin Neff
2bcca54330
Merge pull request #7242 from cmrd-senya/mentionable-route
...
new PostController#mentionable_in_comment action
2017-01-13 04:13:01 +01:00
