rinpatch
ce3789e39a
Add default_scope to /api/v1/update_credentials
5 years ago
rinpatch
c3e9fcf098
Fix bookmarks depending on embeded object and move checking if the
...
status is bookmarked to SQL
5 years ago
kaniini
002ea343f8
Merge branch 'feature/bbcode' into 'develop'
...
BBCode support (backend)
See merge request pleroma/pleroma!1097
5 years ago
William Pitcock
501af917b5
add support for bbcode
5 years ago
lambda
4de5fef1f8
Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'
...
Feature/807 bookmark endpoint extension
Closes #807
See merge request pleroma/pleroma!1059
5 years ago
kaniini
48f68fd133
Merge branch 'feature/mastoapi-new-config' into 'develop'
...
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
This patch:
- Fixes `rights` in TwitterAPI ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
See merge request pleroma/pleroma!1093
5 years ago
Mark Felder
24c3e2db2c
Add mediaproxy whitelist capability
5 years ago
rinpatch
dfc8425659
Move settings to Source subentity
5 years ago
Alex S
a825056d4d
test fixes
5 years ago
Alex S
85953c0836
fixes for tests
5 years ago
Alex S
3c2ae80008
unused
5 years ago
Egor Kislitsyn
c157e27a00
Merge branch 'develop' into feature/disable-account
5 years ago
Alex S
1258128f4f
favourites add bookmark display
5 years ago
Alex S
73d01857e3
bookmarks in separate table
5 years ago
William Pitcock
0fd0ffcd76
activitypub: transmogrifier: send reject follow if following does not succeed
5 years ago
rinpatch
4baea6e6d9
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
...
This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
5 years ago
Sergey Suprunenko
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
5 years ago
kaniini
10c40e13d2
Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'
...
Add `in_reply_to_account_acct` to MastoAPI status entity
See merge request pleroma/pleroma!1086
5 years ago
kaniini
aa9d378985
Merge branch 'fix/normalize-activities' into 'develop'
...
Normalize acitvities instead of objects inside them
See merge request pleroma/pleroma!1085
5 years ago
Alex S
d35246c449
added healthcheck setting to instance config
5 years ago
rinpatch
f60d072bbb
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
5 years ago
rinpatch
d21d921def
Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
5 years ago
Egor
b9cdf6d3b9
Use `User.get_cached*` everywhere
5 years ago
Alexander Strizhakov
88f0be9693
Feature/826 healthcheck endpoint
5 years ago
Egor Kislitsyn
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
kaniini
7fcbda702e
Merge branch 'rework-emoji-management' into 'develop'
...
Remove finmoji and add a way to download emojis in packs
Closes #817 and #821
See merge request pleroma/pleroma!1073
5 years ago
Roman Chvanikov
4908e0eeee
Fix Credo warning
5 years ago
Roman Chvanikov
eeb093631c
Fix Credo warning
5 years ago
Roman Chvanikov
e56afefef9
Refactor conversation function in MastodonAPIController to use a View
5 years ago
Roman Chvanikov
2662bea4e0
Add accounts and last_status to conversation read response
5 years ago
Ivan Tashkinov
9256d2d4b4
[ #923 ] Refactored OAuthController#authorize definitions, added test.
5 years ago
eugenijm
375fd21055
Set correct values in the MastoAPI reblog status view
5 years ago
Roman Chvanikov
24073f829f
Refactor query to return only 1 message instead of 20
6 years ago
Ekaterina Vaartis
52ed287e87
Fix incorrect multiple emoji tag handling introduced in initial impl
6 years ago
eugenijm
fa48532387
Handle `reblogs` on the first follow request in MastoAPI
6 years ago
kaniini
9da8b287f8
Merge branch 'feature/database-compaction' into 'develop'
...
database compaction
See merge request pleroma/pleroma!473
6 years ago
Alexander Strizhakov
ada384207b
typo fix
...
docs for RelMe provider
6 years ago
lambda
218d96a26b
Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'
...
OAuth consumer params handling refactoring
See merge request pleroma/pleroma!1047
6 years ago
rinpatch
f9865cf943
Stream out deletes, mistakingly removed when resolving merge conflicts
6 years ago
Haelwenn
eba3db0966
Merge branch 'bugfix/filter-boosted-blocks' into 'develop'
...
activitypub: fix filtering of boosts from blocked users
See merge request pleroma/pleroma!1074
6 years ago
Mark Felder
1aa4994f6d
Do not require authentication for user search in MastoAPI
6 years ago
rinpatch
83589ca6a5
Merge branch 'develop' into feature/database-compaction
6 years ago
rinpatch
ac04311b3f
Fix search in TwitterAPI
6 years ago
rinpatch
6069d0fd36
Fix object search depending on embeded object
6 years ago
rinpatch
e31a22043b
Fix media timeline depending on embeded object and add some guards
6 years ago
rinpatch
2abc09570f
Use the preloaded object in tag queries
6 years ago
William Pitcock
36f78c6dcd
activitypub: fix filtering of boosts from blocked users
6 years ago
William Pitcock
2140e164d7
activitypub: properly filter out transitive activities concerning blocked users
6 years ago
rinpatch
35ac672b8d
Remove containment tests from transmogrifier and fix thread visibility solver
6 years ago
rinpatch
8e4d950f31
Remove updating reply count for embeded objects
6 years ago
rinpatch
a53b917e7f
oof
6 years ago
rinpatch
ad681877df
Make credo happy
6 years ago
rinpatch
e641651e2b
Fix unbookmarking
6 years ago
rinpatch
b09ae02c04
Added some more normalization calls all in mastodon api controller
6 years ago
rinpatch
462028688b
Fix pinned posts relying on embded objects
6 years ago
rinpatch
627e5a0a49
Merge branch 'develop' into feature/database-compaction
6 years ago
Ivan Tashkinov
128aae05f3
[ #923 ] Minor semantic adjustment.
6 years ago
kaniini
02a53d00c9
Merge branch 'fix/remote-follow-auth' into 'develop'
...
Fix: remote follows should not ask user to log-in again for authorization
See merge request pleroma/pleroma!1060
6 years ago
Haelwenn
cde7711b12
Merge branch 'bugfix/relax-spam-protection' into 'develop'
...
activitypub: allow indirect messages from users being followed at a personal inbox
See merge request pleroma/pleroma!1069
6 years ago
Normandy
d4a749cfb2
Handle new-style mastodon follow lists
...
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
6 years ago
William Pitcock
750b369d04
activitypub: allow indirect messages from users being followed at a personal inbox
6 years ago
Hakurei Reimu
6e26ac10a3
make Pleroma.Endpoint use extra_cookie_attrs in config
6 years ago
lain
76999c73a7
Conversation: Add accounts to output.
6 years ago
lain
0da985182f
Conversation: Return full status object, id is a string.
6 years ago
lambda
56956de6fa
Merge branch 'fix/status-reblogged' into 'develop'
...
Assign reblogged in the Mastodon reblog status view
Closes #812
See merge request pleroma/pleroma!1057
6 years ago
lambda
f358295cbe
Merge branch 'unfollow-oneself' into 'develop'
...
Consistent response for self follow/unfollow
Closes #819
See merge request pleroma/pleroma!1061
6 years ago
eugenijm
27d78dc526
Use User.get_cached_by*
6 years ago
rinpatch
5d73dca064
Remove inReplyToStatusId
6 years ago
eugenijm
507e7821e3
Handle follow/unfollow directed to themselves
6 years ago
eugenijm
679a8ef629
Assign reblogged in the Mastodon reblog status view
6 years ago
Egor
f9af90c5aa
Revert "simplify mentions escape"
...
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
6 years ago
lambda
184ae60b21
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
...
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
6 years ago
lambda
0a09692c7d
Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'
...
Features: mastoapi-2.6.0 `min_id` pagination
Closes #351
See merge request pleroma/pleroma!976
6 years ago
lambda
57d5ff57d6
Merge branch 'fix/732-password-align' into 'develop'
...
password reset page labels align
See merge request pleroma/pleroma!986
6 years ago
Alexander Strizhakov
711ade961e
adding destroy multiple for mastofe
6 years ago
Alexander Strizhakov
e03d24af96
in_reply_to_id - null
6 years ago
kaniini
31c06dba5a
Merge branch 'fix/hackney_max_body_param' into 'develop'
...
Add `with_body: true` to requests relying on `max_body: val`
Closes #778
See merge request pleroma/pleroma!1049
6 years ago
Roman Chvanikov
4615e56219
Add `with_body: true` to requests relying on `max_body: val`
6 years ago
Egor Kislitsyn
db4badc6aa
move user disable into deactivation
6 years ago
Egor Kislitsyn
0f2f7d2cec
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
Ivan Tashkinov
c3f12cf3c3
[ #923 ] OAuth consumer params handling refactoring.
...
Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic.
6 years ago
lain
c352a0aba6
Conversations: Make tests run.
6 years ago
lain
280172f6f6
Conversations: Create or bump on inserting a dm.
6 years ago
lambda
e5d553aa45
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
...
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
6 years ago
Sadposter
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
6 years ago
lambda
c8440b5e0c
Merge branch 'fix/emoji-api-nonsense' into 'develop'
...
Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038
6 years ago
Haelwenn (lanodan) Monnier
9c1b36856b
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
6 years ago
Haelwenn (lanodan) Monnier
cae0231731
s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/
6 years ago
Haelwenn (lanodan) Monnier
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
6 years ago
kaniini
0ab563d334
Merge branch 'hotfix/fix_undefined_summary' into 'develop'
...
transmogrifier.ex: Add fix_summary/1
See merge request pleroma/pleroma!1039
6 years ago
kaniini
97395e013e
Merge branch 'notification-pleroma-settings' into 'develop'
...
Notification controls
Closes #738
See merge request pleroma/pleroma!988
6 years ago
Haelwenn (lanodan) Monnier
cf9ba8fe1b
transmogrifier.ex: Add fix_summary/1
...
MRF.KeywordPolicy assumes that summary is present in a activity,
and this would probably simplify code elsewhere too anyway.
6 years ago
rinpatch
b57b43027c
Change response format of /api/pleroma/emoji to the one that actually makes sense
6 years ago
Sadposter
589629cf3e
Used cached user resources in subscriptions
6 years ago
lain
a9f805c871
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
6 years ago
Egor Kislitsyn
9abf832b03
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
lambda
e19590c93f
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
...
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
6 years ago
lambda
fd45cab9ec
Merge branch 'twitter_oauth' into 'develop'
...
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
6 years ago
Alexander Strizhakov
36c0a10fdf
adding language tag
6 years ago
lambda
23067908de
Merge branch 'feature/770-add-emoji-tags' into 'develop'
...
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
6 years ago
Egor Kislitsyn
c3d5c3513a
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
Egor Kislitsyn
a1a854646e
Merge branch 'develop' into use-jobs-in-webpush
6 years ago
Ivan Tashkinov
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
6 years ago
lambda
b4da2bc1d0
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
...
# Conflicts:
# config/config.exs
# docs/config.md
6 years ago
lambda
b177e1e7f3
Merge branch 'scheduled-activities' into 'develop'
...
Scheduled activities
See merge request pleroma/pleroma!989
6 years ago
Alex S
012bb5dcc9
renaming expire_at -> expires_at
...
keyword style change
6 years ago
Sadposter
76fdfd1c7f
Add check on activity visibility in sub notification
6 years ago
Alex S
56c75aec12
credo fix
6 years ago
Alex S
b810aac117
added docs to docs/api/admin_api.md
...
code style and little renamings
6 years ago
Ivan Tashkinov
e3328bc138
[ #923 ] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.
6 years ago
feld
fb2040d061
Merge branch 'fix/deactivated-user-error' into 'develop'
...
Return 403 for deactivated user on token request
Closes #785
See merge request pleroma/pleroma!1031
6 years ago
eugenijm
2056efa714
Add scheduler for sending scheduled activities to the queue
6 years ago
eugenijm
fc92a0fd8d
Added limits and media attachments for scheduled activities.
6 years ago
eugenijm
b3870df51f
Handle `scheduled_at` on status creation.
6 years ago
eugenijm
7bf622ce73
Add scheduled activities
6 years ago
eugenijm
7aa53d52bd
Return 403 on oauth token exchange for a deactivated user
6 years ago
Sadposter
c05fe4da0a
Document subscription endpoints, fix typos
...
Also adds a quick error case on the subscription endpoints
to avoid 500s
6 years ago
feld
9aeac7dcca
Merge branch 'feature/prometheus' into 'develop'
...
Upstream: Metrics and debugging
See merge request pleroma/pleroma!1020
6 years ago
Alex S
a53d591ac5
code style
6 years ago
Alex S
7410aee886
Merge develop to 770-add-emoji-tags
...
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
6 years ago
Alex S
dcc54f8cfa
admin api endpoints for invites
6 years ago
Alex S
47b07cec49
token -> invite renaming
6 years ago
Alex S
be54e40890
twitter api registration
...
fix for twitter api tests
6 years ago
Sergey Suprunenko
325a268017
Redirect to the referer url after mastofe authorization
6 years ago
Mark Felder
b5a2d384f7
Redundant Repo.get_by usage was recently removed from the codebase
6 years ago
Roger Braun
7895ee37fa
Add user following / unfollowing to the admin api.
6 years ago
Sadposter
9ca91cbb87
Change relationship direction of subscriptions
6 years ago
Sadposter
d35f6551c1
Move subscriptions endpoint to be under /pleroma
6 years ago
Sadposter
d56866c824
Add subscribed status to user view
...
Added in pleroma extensions, but can be moved whenever
6 years ago
Sadposter
316fe20d86
Make subscriptions the same direction as blocks
...
That being, user - subscribes to -> users, rather than
user - has subscribers -> users
6 years ago
Sadposter
23c4f49494
Fix subscription endpoint return formats
6 years ago
Sadposter
007762e767
Add notification checks
6 years ago
Sadposter
79910ce5cc
Add API endpoints and user column for subscription
6 years ago
Egor Kislitsyn
1c2e4f88d1
fix credo
6 years ago
Egor Kislitsyn
f1712cd2f1
Use PleromaJobQueue in Pleroma.Web.Push
6 years ago
rinpatch
f0f30019e1
Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi
6 years ago
Ivan Tashkinov
47a236f753
[ #923 ] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
6 years ago
Ivan Tashkinov
3e7f2bfc2f
[ #923 ] OAuthController#callback adjustments (with tests).
6 years ago
Ivan Tashkinov
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
Ivan Tashkinov
f7cd9131d4
[ #923 ] OAuth consumer controller tests. Misc. improvements.
6 years ago
href
bc3618a38d
Set up telemetry and prometheus
6 years ago
Egor Kislitsyn
cfa6e7289f
Improve Transmogrifier.upgrade_user_from_ap_id/2
6 years ago
Haelwenn (lanodan) Monnier
af0065a71f
mastodon_api_controller.ex: Add pleroma-tan to initial_state
6 years ago
rinpatch
79cb34a4b0
Fix preview not being usable in form data
6 years ago
Haelwenn
0cb94cfa94
Merge branch 'fix-slow-relationships' into 'develop'
...
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
See merge request pleroma/pleroma!1011
6 years ago
lambda
256b492a58
Merge branch 'bugfix/wrong-date-format' into 'develop'
...
Support activities with dates in the Unix timestamp format
Closes #763
See merge request pleroma/pleroma!1004
6 years ago
lambda
a79ce94dd4
Merge branch 'feature/fake-statuses' into 'develop'
...
Add fake status submit
See merge request pleroma/pleroma!995
6 years ago
lain
39bcf93007
Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
6 years ago
lain
fd07745d1b
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
6 years ago
Alex S
fa8483cb80
Merging develop into feature/770-add-emoji-tags
...
Conflict test/web/twitter_api/util_controller_test.exs
6 years ago