Commit Graph

93 Commits (1881680e28273035333a121e2135781f1ae3f15a)

Author SHA1 Message Date
lambda 1881680e28 Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'
6 years ago
lain a16b17cc61 Actually put some onformation in the error user, make it actually properly parse
6 years ago
lain 7382adf407 Make TwAPI UserView more resilient to issues.
6 years ago
scarlett 52493467ac Twitter API: Add a summary_html field.
6 years ago
scarlett 145d6fe6e9 Merge branch 'emoji-in-summary' into 'develop'
6 years ago
scarlett 0787f0dfbe Strip HTML in and allow emoji in summaries.
6 years ago
Rin Toshaka 846082e54f Different caches based on the module. Remove scrubber version since it is not relevant anymore
6 years ago
kaniini 90e157ef80 Merge branch 'features/admin-api-user-views' into 'develop'
6 years ago
William Pitcock 980b5288ed update copyright years to 2019
6 years ago
Rin Toshaka 7e09c2bd7d Move scrubber cache-related functions to Pleroma.HTML
6 years ago
Rin Toshaka dec23500d8 Resolve merge conflict
6 years ago
Rin Toshaka 535fddd286 Friendship ended with Postgresql now Cachex is my best friend
6 years ago
Rin Toshaka d9f40b05b3 Added get_stripped_html_for_object. Renamed a few things
6 years ago
Rin Toshaka 19f9889fbe I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD
6 years ago
Ivan Tashkinov 0a41786624 [#467] Refactored valid / invalid user rendering.
6 years ago
Haelwenn (lanodan) Monnier b43d630f30
Web.TwitterAPI.UserView: Add rights.admin
6 years ago
Ivan Tashkinov 0d1788ce44 [#471] Factored out User.visible_for?/2.
6 years ago
Ivan Tashkinov e6aeb1d4a5 [#471] Prevented rendering of inactive local accounts.
6 years ago
William Pitcock 2791ce9a1f add license boilerplate to pleroma core
6 years ago
lambda 005b4194ff Merge branch 'bugfix/trans_fix_url_videos' into 'develop'
6 years ago
William Pitcock 34a4ed22c4 twitter api: add "Video" to supported activity types list
6 years ago
lambda a3e33fa177 Merge branch 'hotfix/activity-without-content' into 'develop'
6 years ago
href f58f20abbb
Twitter ActivityView: fix crash when activity content is nil
6 years ago
Ivan Tashkinov aed0f90287 [#114] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
6 years ago
lambda 3d980daa49 Merge branch '459_fix_user_profile_crash' into 'develop'
6 years ago
Maksim Pechnikov 92a5133c42 fix text field
6 years ago
raeno cc87880488 Support both OAuth token record and token string in UserView
6 years ago
lambda cc6689cc20 Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'
6 years ago
href 84b9a9d497
TwitterAPI.ActivityView: Ignore unhandled activities
6 years ago
Maksim Pechnikov baead4ea4b fix markdown formatting
6 years ago
eal 61ad2ce422 TwitterAPI: Include favorited post in json
6 years ago
Ivan Tashkinov 7a2162bbcb [#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
6 years ago
Ivan Tashkinov 7bcb6a183a [#394] Refactoring.
6 years ago
Ivan Tashkinov 7b19487389 [#394] Added `users.tags` and admin routes to tag and untag users. Added tests.
6 years ago
lain fbb70d25fe Several twitter api fixes.
6 years ago
scarlett cb6fd73861 Twitter API: Fall back to user.nickname if user has no name
6 years ago
Haelwenn (lanodan) Monnier 3c7d4ff271
Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI against remnant of prismo
6 years ago
William Pitcock 24ba08de13 twitter api: add support for rendering Page objects
6 years ago
William Pitcock 1ed25c963a twitterapi: activity view: add the other in_reply_to fields
6 years ago
William Pitcock fee43ae5e7 twitterapi: activity view: implement in_reply_to_screen_name using the new graph walking helper
6 years ago
Haelwenn (lanodan) Monnier 82b57ebad1
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
6 years ago
William Pitcock 56577d8b48 twitter api: add no_rich_text option to userview for account prefs
6 years ago
William Pitcock 2f5b026548 twitter api: add support for user-specified html policy
6 years ago
William Pitcock e82ce2a4b3 formatting
6 years ago
William Pitcock ac486fc59b everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly
6 years ago
kaniini b7923aa304 Merge branch 'hotfix_broken_likes' into 'develop'
6 years ago
Henry Jameson 0f1c629d65 better solution, added test.
6 years ago
Henry Jameson 9b046d2a84 fixed notifications API completely breaking if there's a like for
6 years ago
Haelwenn (lanodan) Monnier 643f373514
Run mix format
6 years ago
Haelwenn (lanodan) Monnier d5bdd55b5d
[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nil
6 years ago