Egor
|
bff9eb5ef7
|
Reports
|
2019-02-20 16:51:25 +00:00 |
Wim Vanderbauwhede
|
04b1c13554
|
Merge remote-tracking branch 'upstream/develop' into patch-image-description
|
2019-02-14 16:41:40 +00:00 |
Haelwenn (lanodan) Monnier
|
6a6a5b3251
|
de-group alias/es
|
2019-02-09 16:31:17 +01:00 |
Haelwenn (lanodan) Monnier
|
60ea29dfe6
|
Credo fixes: alias grouping/ordering
|
2019-02-09 14:59:20 +01:00 |
Haelwenn (lanodan) Monnier
|
106f4e7a0f
|
Credo fixes: parameter consistency
|
2019-02-09 14:59:20 +01:00 |
Haelwenn (lanodan) Monnier
|
8bcfac93a8
|
Make credo happy
|
2019-02-09 14:59:20 +01:00 |
kaniini
|
4c99b6d35a
|
Merge branch 'fix/tusky-dm' into 'develop'
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
|
2019-01-25 05:19:32 +00:00 |
Maxim Filippov
|
9274cabe01
|
Use correct logic to determine "attentions" list
|
2019-01-24 23:30:43 +03:00 |
Haelwenn (lanodan) Monnier
|
98c8184c1f
|
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
|
2019-01-21 08:00:41 +01:00 |
Ivan Tashkinov
|
65bb9b2fba
|
[#491] Made full nicknames be preserved in user links text only in Bio.
|
2019-01-18 09:30:16 +03:00 |
William Pitcock
|
0bdbd4f968
|
common api: utils: remove newline to <br> conversion from bare HTML to be consistent with markdown
ok @lanodan
|
2019-01-10 03:45:58 +00:00 |
William Pitcock
|
2ecf81f10c
|
common api: fix newlines in markdown code blocks
|
2019-01-10 03:37:37 +00:00 |
Wim Vanderbauwhede
|
ba93396649
|
Patch to support image descriptions in Pleroma FE
|
2019-01-04 16:27:46 +00:00 |
Wim Vanderbauwhede
|
4c95545d19
|
Patch to support image descriptions in Pleroma FE
|
2019-01-04 15:35:41 +00:00 |
Wim Vanderbauwhede
|
fe2dceb66d
|
Patch to support image descriptions in Pleroma FE
|
2019-01-04 15:22:02 +00:00 |
William Pitcock
|
980b5288ed
|
update copyright years to 2019
|
2018-12-31 15:41:47 +00:00 |
William Pitcock
|
2791ce9a1f
|
add license boilerplate to pleroma core
|
2018-12-23 20:56:42 +00:00 |
Maksim Pechnikov
|
baead4ea4b
|
fix markdown formatting
|
2018-12-14 16:03:58 +03:00 |
Maksim Pechnikov
|
89b3729afa
|
fix warnings
|
2018-12-12 09:09:19 +03:00 |
Maksim Pechnikov
|
074fa790ba
|
fix compile warnings
|
2018-12-09 20:50:08 +03:00 |
William Pitcock
|
67038ae15e
|
common api: utils: access inReplyTo object ID correctly
|
2018-12-04 04:52:09 +00:00 |
William Pitcock
|
4e93d6ae14
|
common api: utils: flip to/cc for mentions
|
2018-11-08 19:17:01 +00:00 |
lain
|
45ebc8dd9a
|
Check for empty string in_reply_to ids.
|
2018-11-02 17:33:51 +01:00 |
William Pitcock
|
f407831120
|
common api: prefer formatting attachments using the attachment's name instead of URI
|
2018-10-29 17:59:24 +00:00 |
William Pitcock
|
784b3a615d
|
utils: fix another possible leak with private S3 backends using mediaproxy
same rationale as the other mediaproxy changes
|
2018-10-29 17:26:15 +00:00 |
William Pitcock
|
30efa86c05
|
common api: enable tag linking in markdown mode
|
2018-10-14 20:36:11 +00:00 |
William Pitcock
|
b1be9415ef
|
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
This reverts commit d31bbb1cfe , reversing
changes made to 340ab3cb90 .
|
2018-10-05 20:49:34 +00:00 |
lambda
|
58539e1357
|
Revert "Merge branch 'feature/rich-text' into 'develop'"
This reverts merge request !309
|
2018-08-31 09:51:20 +00:00 |
William Pitcock
|
6aa65b68b8
|
common api: add support for formatting messages outside of twitter-style plain text
|
2018-08-31 03:13:59 +00:00 |
kaniini
|
63094cfd3e
|
Merge branch 'feature/emoji-in-local-users' into 'develop'
Add emoji to local user profiles.
Closes #202
See merge request pleroma/pleroma!271
|
2018-08-26 23:24:41 +00:00 |
ensra
|
1495d04789
|
fix test for converting bio \r\n to <br>.
|
2018-08-21 14:51:27 +01:00 |
William Pitcock
|
c033d2004b
|
formatting
|
2018-08-20 18:40:05 +00:00 |
William Pitcock
|
145546e52a
|
common api: format hashtags in the same way as we format mentions
|
2018-08-20 18:39:47 +00:00 |
eal
|
92caa2632b
|
Use Image type for emoji icons.
|
2018-08-13 16:21:18 +03:00 |
eal
|
f9d13558c8
|
CommonAPI: add emoji to user source data on update
|
2018-08-13 15:27:20 +03:00 |
lain
|
0f70e83e8c
|
Better error handling in TwitterApiController.
|
2018-06-03 19:11:22 +02:00 |
lambda
|
c41012053a
|
Merge branch 'feature/change-password' into 'develop'
Feature/change password
See merge request pleroma/pleroma!166
|
2018-05-24 17:16:37 +00:00 |
lain
|
0b5bc62b33
|
Don't save double tags in AP objects we create
This crashed Mastodon workers.
|
2018-05-23 17:25:24 +02:00 |
Syldexia
|
d0690622cd
|
Added endpoint for changing passwords
|
2018-05-21 23:06:03 +01:00 |
Syldexia
|
98b36d359a
|
Fixed formatting and test
|
2018-05-13 15:43:42 +01:00 |
Syldexia
|
5bfb7b4ce6
|
Moved account deletion stuff to somewhere that hopefully makes more sense
|
2018-05-13 14:36:02 +01:00 |
Syldexia
|
a16117225f
|
Added endpoint for user account deletion
|
2018-05-13 14:35:48 +01:00 |
Mark Felder
|
636f0fa402
|
Clean up unused aliases and imports
|
2018-05-04 21:25:31 +00:00 |
Mark Felder
|
ab4aa5720a
|
Fix a bunch of unused variable warnings
|
2018-05-04 20:59:01 +00:00 |
William Pitcock
|
ee6f15529d
|
CommonAPI post: kill \r with fire
|
2018-04-18 15:46:39 -05:00 |
lain
|
4afbef39f4
|
Format the code.
|
2018-03-30 15:01:53 +02:00 |
lain
|
eb7ce61ca5
|
Fix hashtags.
|
2018-03-24 11:03:10 +01:00 |
lain
|
c974f6544f
|
Show users their own posts in timeline.
|
2018-02-18 15:20:36 +01:00 |
lain
|
d4b08dd838
|
MastodonAPI: Post with visibility settings
|
2018-02-18 14:56:36 +01:00 |
lambda
|
4b06e46a3a
|
Merge branch 'fix/tootdon-mentions' into 'develop'
Fix Tootdon linking the whole status when mentioning someone.
See merge request pleroma/pleroma!39
|
2017-12-11 16:21:43 +00:00 |
eal
|
b00e230760
|
Add a bunch of useless HTML to mentions.
|
2017-12-11 18:14:33 +02:00 |
lambda
|
35cfbf43a0
|
Merge branch 'fix/linkify' into 'develop'
Fix links with HTML elements and/or parentheses.
See merge request pleroma/pleroma!38
|
2017-12-08 12:34:03 +00:00 |
eal
|
bf91e5659f
|
Fix HTML escape breaking some links.
|
2017-12-07 21:36:06 +02:00 |
eal
|
5436dbaeaf
|
MastoAPI: don't add attachment links.
|
2017-12-07 20:44:09 +02:00 |
Thog
|
59770c3f5c
|
Fix all compilation warnings
|
2017-11-19 02:22:07 +01:00 |
eal
|
fb118b2978
|
Don't insert newlines to generated HTML.
MastoFE doesn't like them.
|
2017-11-18 14:46:54 +02:00 |
eal
|
66e78c3ec4
|
Escape HTML instead of discarding it.
|
2017-11-18 14:43:41 +02:00 |
Roger Braun
|
4cbf17dac6
|
Save cws in the activitypub data.
|
2017-10-31 17:30:46 +01:00 |
Roger Braun
|
2b980dea2f
|
Remove tag links for now, they break some regular links.
|
2017-09-17 23:03:03 +02:00 |
Roger Braun
|
270c903220
|
Add tag links.
|
2017-09-17 15:21:44 +02:00 |
Roger Braun
|
d659fcc195
|
MastoAPI: Fix date in account view.
|
2017-09-15 17:50:47 +02:00 |
Roger Braun
|
50409326a8
|
Refactor posting and make character limit configurable.
|
2017-09-15 14:17:36 +02:00 |