Commit Graph

158 Commits

Author SHA1 Message Date
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
William Pitcock 741c6ad671 common api: handle replying to orphaned threads 2018-08-26 22:37:36 +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
William Pitcock 49da04c509 common api: use Object.normalize() instead of Object.get_by_ap_id() directly. 2018-06-27 13:07:35 +00: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
lambda aeff2d6474 Merge branch 'feature/unrepeats' into 'develop'
Add unrepeats

Closes #69

See merge request pleroma/pleroma!113
2018-05-13 09:32:29 +00: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
Francis Dinh 9e0dd21ed6 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats 2018-04-25 00:46:28 -04:00
lain 0574df273c Small cleanup. 2018-04-22 10:01:10 +02:00
Francis Dinh c5dc7e6e31 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats 2018-04-20 16:48:18 -04:00
William Pitcock ee6f15529d CommonAPI post: kill \r with fire 2018-04-18 15:46:39 -05:00
Francis Dinh b949577472 Add unrepeat functionality 2018-04-14 20:19:48 -04:00
lain 4afbef39f4 Format the code. 2018-03-30 15:01:53 +02:00
lain 675839e13c Fix TwApi reply visibility. 2018-03-30 12:19:57 +02:00
lain eb7ce61ca5 Fix hashtags. 2018-03-24 11:03:10 +01:00
lain e9de04b74b Add support for outgoing update. 2018-02-25 21:08:32 +01:00
lain 8a47974217 Fix specs. 2018-02-25 18:11:03 +01:00
lain 94db9ac4db Merge branch 'develop' into feature/activitypub 2018-02-21 18:34:19 +01:00
lain eec6a87dbb Allow moderators to delete posts. 2018-02-20 18:54:13 +01:00
lain c974f6544f Show users their own posts in timeline. 2018-02-18 15:20:36 +01:00
lain 2997fe1ba9 CommonAPI: If no visibility is given, return parent visibility. 2018-02-18 15:04:26 +01:00
lain d4b08dd838 MastodonAPI: Post with visibility settings 2018-02-18 14:56:36 +01:00
lain 05ba6ca1b8 Do some transmogrifying for the output. 2018-02-17 14:11:20 +01:00
lain ae26604378 ActivityPub: Refactor create function. 2018-02-15 19:59:35 +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
Roger Braun 747a68a075 Treat internal emoji like external. 2017-11-20 17:53:21 +01:00
Thog 59770c3f5c
Fix all compilation warnings 2017-11-19 02:22:07 +01:00
lambda ed3403ad8b Merge branch 'formatting-fixes' into 'develop'
Formatting fixes

Closes #80

See merge request pleroma/pleroma!22
2017-11-18 15:58:44 +00:00
eal f53cdabcdf Add #nsfw tag if sensitive content bit is set 2017-11-18 16:30:18 +02: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 722c4614ad Allow self-rt. 2017-11-07 16:45:27 +01:00
Roger Braun e014cc6ed8 Allow using cws in mastodon api. 2017-10-31 19:44:36 +01:00
Roger Braun 4cbf17dac6 Save cws in the activitypub data. 2017-10-31 17:30:46 +01:00
Roger Braun 4dcbb64f19 Avoid potentially slow count queries for user note count.
For a variety of reasons, posgresql won't use the available actor,
type index to do an index only scan. We now just increase the user
note count, which will lead to slightly wrong counts in some cases,
but it's better than the potentially very slow count query.
2017-10-31 16:37:11 +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
Roger Braun d625d8db7d Add unfav to Mastodon API. 2017-09-09 18:30:02 +02:00
Roger Braun 454dc18570 Add favoriting to Mastodon API. 2017-09-09 18:09:37 +02:00
Roger Braun 66e4c710d4 Add reblogging to MastodonAPI. 2017-09-09 17:48:57 +02:00
Roger Braun 4dc517a0bb Add deletion to masto api. 2017-09-09 13:56:51 +02:00