Commit Graph

140 Commits (cb76faece99c706685b71ad5a13943036b481645)

Author SHA1 Message Date
Sean King 5d279a22b1 Merge develop branch upstream
3 years ago
Alex Gleason 1399b82f7b
Create WrapperAuthenticator and simplify Authenticator behaviour
3 years ago
Sean King 2e310b3ec8
Fix more build errors
3 years ago
Alex Gleason f2134e605b
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
3 years ago
Alex Gleason 51a9f97e87
Deprecate Pleroma.Web.base_url/0
3 years ago
Alex Gleason ad7d4ff8bc
Merge remote-tracking branch 'pleroma/develop' into alias-router-helpers
3 years ago
Alex Gleason 07fed0fda2
Switch to aliasing `Router.Helpers` instead of importing
3 years ago
Ivan Tashkinov 5992382cf8 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
rinpatch ed8ef80b5e RSS: Make sure post URL is the first `<link>` element
4 years ago
Ivan Tashkinov 4e14945670 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Ivan Tashkinov 60b4654038 Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).
4 years ago
Haelwenn 3966add048 Revert "Merge branch 'features/hashtag-column' into 'develop'"
4 years ago
Haelwenn (lanodan) Monnier 18b536c176
Pleroma.Object/1: take %Object{} as argument instead
4 years ago
Haelwenn (lanodan) Monnier 87b13c5430
Create Object.hashtags/1 wrapper
4 years ago
Haelwenn (lanodan) Monnier acb03d591b
Insert text representation of hashtags into object["hashtags"]
4 years ago
Ivan Tashkinov ee221277b0 Encapsulation of tags / hashtags fetching from objects.
4 years ago
Alexander Strizhakov cebe3c7def Fix for dropping posts/notifs in WS when mix task is executed
4 years ago
Ivan Tashkinov f1b07a2b2b OAuth form user remembering feature. Local MastoFE login / logout fixes.
4 years ago
Alexander Strizhakov 0c68b9ac13
escaping summary and other fields in xml templates
4 years ago
Egor Kislitsyn 3985c1b450
Fix warnings
4 years ago
Ivan Tashkinov cad69669fc [#2130] Fixed OAuth OOB authentication for users with enabled MFA.
4 years ago
Karol Kosek 577b11167c
templates/layout/app.html.eex: fix link color
4 years ago
Mark Felder 62438530e2 TOTP length is configurable, so we can't hardcode this here.
4 years ago
Mark Felder 3be64556db Improve TOTP token and recovery input fields in OAuth login
4 years ago
Egor Kislitsyn 6b84c62d4a
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
4 years ago
Maksim 3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
4 years ago
Haelwenn (lanodan) Monnier c6ddfa8f95
static-fe.css: Restore and move to /priv/static/static-fe
4 years ago
Karol Kosek 452072ec95
static_fe: Add microformats2 classes
4 years ago
rinpatch 28bcde5d98 Merge branch 'fix/1691-feed-render' into 'develop'
4 years ago
Alexander Strizhakov 4d330d9df1
fix for use of published from different entities
5 years ago
Haelwenn (lanodan) Monnier 9172d719cc
profile emojis in User.emoji instead of source_data
5 years ago
Haelwenn (lanodan) Monnier 185520d1b4
Provide known-good user.uri, remove User.profile_url/1
5 years ago
Egor Kislitsyn cb8236cda6
Add embeddable posts
5 years ago
Alexander Strizhakov 91870c8995
adding rss for user feed
5 years ago
Egor Kislitsyn 50d9fcbe29
Hotlink logo instead of attachment
5 years ago
Egor Kislitsyn 6875ccb6bf
Merge branch 'develop' into feature/new-registrations-digest
5 years ago
Maksim Pechnikov 99c0a11c58 added atom feed
5 years ago
minibikini 7c0ac54437 Apply suggestion to lib/pleroma/web/templates/layout/email_styled.html.eex
5 years ago
Egor Kislitsyn df0b8f1d08
Add new users digest email
5 years ago
Maksim Pechnikov c9f45edeac Merge branch 'develop' into feature/tag_feed
5 years ago
Maksim Pechnikov 5b84156013 moved remote follow in separate controller
5 years ago
Maksim Pechnikov b53573a837 add tag feeds
5 years ago
Maksim Pechnikov 22fc271e23 init tag feed
5 years ago
kaniini 2cc043591c Merge branch 'feature/static-fe' into 'develop'
5 years ago
Maksim Pechnikov 9d0b989521 add subject to atom feed
5 years ago
Phil Hagelberg b0080fa730 Render errors in HTML, not with JS.
5 years ago
Phil Hagelberg e27c61218d Expand subject content automatically when config is set.
5 years ago
Phil Hagelberg bfd5d79826 Include metadata in static FE conversations and profiles.
5 years ago
Phil Hagelberg df2f59be91 Pagination for user profiles.
5 years ago
Phil Hagelberg 8969c5522d Make many of the improvements suggested in review.
5 years ago