Commit Graph

610 Commits (cb76faece99c706685b71ad5a13943036b481645)

Author SHA1 Message Date
marcin mikołajczak 40414bf177 MastoAPI: Add user notes on accounts
3 years ago
Haelwenn 61ba54897e Merge branch 'streamer-crash-fix' into 'develop'
3 years ago
Alex Gleason b7bbf42acd
Streamer: fix crash in MastodonAPI.StatusView
3 years ago
Haelwenn 901204df22 Merge branch 'poll-notification' into 'develop'
3 years ago
Egor Kislitsyn ad09bdb376
Improve readability
3 years ago
Ilja f4028c908c
Add key- and valuePlaceholders for quarantined_instances and mrf_simple
3 years ago
Ilja 03030b47c2
quarantine instances info
3 years ago
Ilja 7fdc3cde06
Return maps in node_info
3 years ago
Alex Gleason 62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
3 years ago
Alex Gleason 0114754db2
MastodonAPI: Support poll notification
3 years ago
Mark Felder 2743c66693 Add "chat" back as a feature for backwards compat.
3 years ago
Mark Felder d6432a65da Move shout configuration from :instance, update docs and changelog
3 years ago
Mark Felder ff00b354fa Rename the non-federating Chat feature to Shout
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 2e682788a3
Merge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f'; commit 'e3173a279dad89dfce6eae89368ad3ba180c0490'; commit '21787546c01069d1d1d8261f0bc37d13a73122a9'; commit 'fda34591cefad94277385311c6391d1ca2adb36c'; commit '0ada3fe823a3c2e6c5835431bdacfbdb8b3d02a7'; commit '32d263cb905dd7fffd43a4955295af0b2b378537'; commit 'c9e4200ed2167772294fceb4f282979b5ea04981'; commit '3ff9c5e2a67ab83c2abdb14cd246dea059079e75'; commit 'fa543a936124abee524f9a103c17d2601176dcd4'; commit 'c23b81e399d5be6fc30f4acb1d757d5eb291d8e1' into cycles-phase-1
3 years ago
feld 5d40ffe429 Merge branch 'cycles-views' into 'develop'
3 years ago
Alex Gleason 1a69f59221
Merge remote-tracking branch 'pleroma/develop' into cycles-html
3 years ago
Alex Gleason 3ff9c5e2a6
Break out activity-specific HTML functions into Pleroma.Activity.HTML
3 years ago
Alex Gleason 7c96c82b5b
Merge remote-tracking branch 'pleroma/develop' into cycles-views
3 years ago
Alex Gleason c9e4200ed2
Create real Views for all Controllers
3 years ago
Mark Felder 05d678c070 Expose user email address to user/owner; not publicly.
3 years ago
Alex Gleason ff02511057
Merge remote-tracking branch 'upstream/develop' into attachment-meta
3 years ago
Alex Gleason 02b9436494
Don't render media `meta` if nil
3 years ago
Alex Gleason ab9eabdf20
Add SetMeta filter to store uploaded image sizes
3 years ago
rinpatch 79376b4afb Merge branch 'feature/521-pinned-post-federation' into 'develop'
3 years ago
Mark Felder 0feafcc20c Use URI.merge to prevent concatenating two canonical URLs when a custom instance thumbnail was uploaded via AdminFE
4 years ago
Alexander Strizhakov 3adb43cc20
refetch user on incoming add/remove activity
4 years ago
Alexander Strizhakov 3ec1dbd922
Let pins federate
4 years ago
rinpatch 72143dd732 Merge branch 'richmedia-workaround' into 'develop'
4 years ago
Mark Felder b80f868c6b Prefer naming this function build_image_url/2
4 years ago
Mark Felder 029ff65389 Leverage function pattern matching instead
4 years ago
Mark Felder 8246db2a96 Workaround for URI.merge/2 bug https://github.com/elixir-lang/elixir/issues/10771
4 years ago
Ivan Tashkinov 92526e0230 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Mark Felder 8d601d3b23 Make the object reference in both render("show.json", _) functions consistently named
4 years ago
Mark Felder 85b2387f66 Fix build_application/1 match
4 years ago
Ivan Tashkinov 882dd46843 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Mark Felder b1e1db82bc Store application details in the object under the generator key, not application key
4 years ago
lain e6a14e1cd1 Merge branch 'feat/client_app_details' into 'develop'
4 years ago
Mark Felder d35b6254b4 Store the client application data in ActivityStreams format
4 years ago
Ivan Tashkinov 8f88a90ca3 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
Mark Felder d5ef02c7a7 Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by default
4 years ago
Alexander Strizhakov 1e6c27181e
expires_in in scheduled status params
4 years ago
Ivan Tashkinov df89b5019b [#2510] Improved support for app-bound OAuth tokens. Auth-related refactoring.
4 years ago
Mark Felder 4540e08a6a Rendering fallback for when we don't have valid data available
4 years ago
Mark Felder 981349f21d Enable rendering of the client application data details
4 years ago
Ivan Tashkinov 4e14945670 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
feld f1f773f2c7 Merge branch 'email-stub-in-verify-credentials' into 'develop'
4 years ago
Ivan Tashkinov 1b49b8efe5 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