238dd72fad
Merge branch 'conversations_three' into 'develop'
...
Conversations once more.
See merge request pleroma/pleroma!1119
5 years ago
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
5 years ago
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
5 years ago
e41a2f98d5
mrf/tag_policy.ex: Add some documentation
...
mrf_tag:disable-remote-subscription exact way of working is quite
unclear to me. Is it the requester that is denied if they have a tag,
or is it the requestee if they have one?
5 years ago
af62ace954
Add short documentation on every MRF Policy
5 years ago
d089ff2460
Merge branch 'fix/embeded-relationship-in-follows' into 'develop'
...
Fix embeded relationships in Mastodon API
See merge request pleroma/pleroma!1118
5 years ago
b5ad1715b2
MastoAPI: profile update with emoji_map
5 years ago
46bbf9e1cf
TwitterAPI: profile update with emoji_map
5 years ago
85434669bb
Web.TwitterAPI.UserView: Also view local user emojis
5 years ago
2f76a40d02
formatter.ex: Add get_emoji_map/1
5 years ago
d70af32127
Pleroma.User: remove emojify on parse_bio
5 years ago
c42ded13a2
Credo fixes.
5 years ago
acb04306b6
Standardize construction of websocket URL
...
This follows up on the change made in d747bd98
5 years ago
a0c755cc4a
MastodonApi: Bump api level.
5 years ago
81d1aa424d
Streamer: Stream out Conversations/Participations.
5 years ago
38b79461df
Fix embeded relationships in Mastodon API
...
Currently some endpoints render accounts without for user resulting in
embedded relationship being empty. It causes bugs in followers/following
tab in pleroma-fe but I fixed it for other endpoints as well just in
case
5 years ago
45f790becc
Merge remote-tracking branch 'origin/develop' into conversations_three
5 years ago
c854bff8f5
Refactored Pleroma.Web.Auth.Authenticator
5 years ago
f11e7037c2
test fixes
5 years ago
bdfa3a6fa8
Merging with develop
...
Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
5 years ago
ce4825c1dc
Do not normalize objects in stream_out unless the activity type is
...
Create
Saves quite a bit of time with delete activities because they would
always query the db
5 years ago
b0951a8849
WebPush: Use Object.normalize, rewrite tests so they test reality.
5 years ago
0fd176b990
Merge branch 'fix/add-default-scope-mastoapi' into 'develop'
...
Add default_scope to /api/v1/update_credentials
See merge request pleroma/pleroma!1100
5 years ago
292c69481b
Merge branch 'regression/rights-only-for-admin' into 'develop'
...
Fix `rights` in TwitterAPI's user entity being present only for Admins/Moderators
See merge request pleroma/pleroma!1102
5 years ago
61ca2f7a4e
Fix `rights` in TwitterAPI's user entity being present only for
...
Admins/Moderators
In !1093 I reused `maybe_with_role` for `rights` object, however I
missed that `maybe_with_role` is called only for admins/moderators.
5 years ago
ce3789e39a
Add default_scope to /api/v1/update_credentials
5 years ago
c3e9fcf098
Fix bookmarks depending on embeded object and move checking if the
...
status is bookmarked to SQL
5 years ago
002ea343f8
Merge branch 'feature/bbcode' into 'develop'
...
BBCode support (backend)
See merge request pleroma/pleroma!1097
5 years ago
501af917b5
add support for bbcode
5 years ago
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
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
24c3e2db2c
Add mediaproxy whitelist capability
5 years ago
dfc8425659
Move settings to Source subentity
5 years ago
a825056d4d
test fixes
5 years ago
85953c0836
fixes for tests
5 years ago
3c2ae80008
unused
5 years ago
c157e27a00
Merge branch 'develop' into feature/disable-account
5 years ago
1258128f4f
favourites add bookmark display
5 years ago
73d01857e3
bookmarks in separate table
5 years ago
0fd0ffcd76
activitypub: transmogrifier: send reject follow if following does not succeed
5 years ago
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
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
5 years ago
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
aa9d378985
Merge branch 'fix/normalize-activities' into 'develop'
...
Normalize acitvities instead of objects inside them
See merge request pleroma/pleroma!1085
5 years ago
d35246c449
added healthcheck setting to instance config
5 years ago
f60d072bbb
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
5 years ago
d21d921def
Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
5 years ago
b9cdf6d3b9
Use `User.get_cached*` everywhere
5 years ago
88f0be9693
Feature/826 healthcheck endpoint
5 years ago
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
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
4908e0eeee
Fix Credo warning
6 years ago
eeb093631c
Fix Credo warning
6 years ago
e56afefef9
Refactor conversation function in MastodonAPIController to use a View
6 years ago
2662bea4e0
Add accounts and last_status to conversation read response
6 years ago
9256d2d4b4
[ #923 ] Refactored OAuthController#authorize definitions, added test.
6 years ago
375fd21055
Set correct values in the MastoAPI reblog status view
6 years ago
24073f829f
Refactor query to return only 1 message instead of 20
6 years ago
52ed287e87
Fix incorrect multiple emoji tag handling introduced in initial impl
6 years ago
fa48532387
Handle `reblogs` on the first follow request in MastoAPI
6 years ago
9da8b287f8
Merge branch 'feature/database-compaction' into 'develop'
...
database compaction
See merge request pleroma/pleroma!473
6 years ago
ada384207b
typo fix
...
docs for RelMe provider
6 years ago
218d96a26b
Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'
...
OAuth consumer params handling refactoring
See merge request pleroma/pleroma!1047
6 years ago
f9865cf943
Stream out deletes, mistakingly removed when resolving merge conflicts
6 years ago
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
1aa4994f6d
Do not require authentication for user search in MastoAPI
6 years ago
83589ca6a5
Merge branch 'develop' into feature/database-compaction
6 years ago
ac04311b3f
Fix search in TwitterAPI
6 years ago
6069d0fd36
Fix object search depending on embeded object
6 years ago
e31a22043b
Fix media timeline depending on embeded object and add some guards
6 years ago
2abc09570f
Use the preloaded object in tag queries
6 years ago
36f78c6dcd
activitypub: fix filtering of boosts from blocked users
6 years ago
2140e164d7
activitypub: properly filter out transitive activities concerning blocked users
6 years ago
35ac672b8d
Remove containment tests from transmogrifier and fix thread visibility solver
6 years ago
8e4d950f31
Remove updating reply count for embeded objects
6 years ago
a53b917e7f
oof
6 years ago
ad681877df
Make credo happy
6 years ago
e641651e2b
Fix unbookmarking
6 years ago
b09ae02c04
Added some more normalization calls all in mastodon api controller
6 years ago
462028688b
Fix pinned posts relying on embded objects
6 years ago
627e5a0a49
Merge branch 'develop' into feature/database-compaction
6 years ago
128aae05f3
[ #923 ] Minor semantic adjustment.
6 years ago
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
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
d4a749cfb2
Handle new-style mastodon follow lists
...
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
6 years ago
750b369d04
activitypub: allow indirect messages from users being followed at a personal inbox
6 years ago
6e26ac10a3
make Pleroma.Endpoint use extra_cookie_attrs in config
6 years ago
76999c73a7
Conversation: Add accounts to output.
6 years ago
0da985182f
Conversation: Return full status object, id is a string.
6 years ago
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
f358295cbe
Merge branch 'unfollow-oneself' into 'develop'
...
Consistent response for self follow/unfollow
Closes #819
See merge request pleroma/pleroma!1061
6 years ago
27d78dc526
Use User.get_cached_by*
6 years ago
5d73dca064
Remove inReplyToStatusId
6 years ago
507e7821e3
Handle follow/unfollow directed to themselves
6 years ago
679a8ef629
Assign reblogged in the Mastodon reblog status view
6 years ago
f9af90c5aa
Revert "simplify mentions escape"
...
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
6 years ago
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
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
57d5ff57d6
Merge branch 'fix/732-password-align' into 'develop'
...
password reset page labels align
See merge request pleroma/pleroma!986
6 years ago
lambda