lain
3da65292b3
Transmogrifier: Fix follow handling when the actor is an object.
5 years ago
Maxim Filippov
c338224c93
Fix sporadic test
5 years ago
Egor Kislitsyn
019ced0558
Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views
5 years ago
Egor Kislitsyn
30510ade0e
Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests
5 years ago
Egor Kislitsyn
3b1b631c2a
Add validation in Pleroma.List.create/2
5 years ago
kPherox
eb75ea502d
Update test for custom fields when content-type urlencoded
5 years ago
kaniini
6dc24422dc
Merge branch 'issue/1177' into 'develop'
...
[#1177 ] fixed unfollow for relay actor
See merge request pleroma/pleroma!1589
5 years ago
Maxim Filippov
37dd3867bb
Log admin/moderator actions
5 years ago
kaniini
503139b343
Merge branch 'fix-all-custom-fields-deleted' into 'develop'
...
Fix not to use unupdated attachments when all fields are deleted
See merge request pleroma/pleroma!1596
5 years ago
kPherox
b8777b01ae
Update test for custom fields when name empty string
5 years ago
kPherox
d74efde94e
Update test for custom profile fields
5 years ago
lain
5e7098cf69
Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'
...
Implement missing mocks for rel=me
See merge request pleroma/pleroma!1598
5 years ago
Haelwenn (lanodan) Monnier
20c3f613d8
HttpRequestMock: Remove useless `error = error`
5 years ago
Haelwenn (lanodan) Monnier
f3b1266273
user_test.exs: fix rel=me tests
5 years ago
Haelwenn (lanodan) Monnier
211e163770
Implement missing mocks for rel=me
5 years ago
Haelwenn (lanodan) Monnier
e22737ffb5
HttpRequestMock: Improve non-implemented error message
5 years ago
Haelwenn (lanodan) Monnier
18668447d2
HttpRequestMock: Log mock errors as warnings
5 years ago
kPherox
45e21a9df4
Rename fields to fields_attributes
5 years ago
lain
90986667ce
Merge branch 'admin-create-users' into 'develop'
...
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
5 years ago
lain
efb8818e9e
Activity Expiration: Switch to 'expires_in' system.
5 years ago
Maksim Pechnikov
654d291b6d
update tests
5 years ago
lain
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
Maksim Pechnikov
73bcbf4fa3
add tests
5 years ago
Ivan Tashkinov
71700ea6d4
[ #1149 ] Updated docs & tests.
5 years ago
Ivan Tashkinov
c29686309e
[ #1149 ] Upgraded `oban` from 0.6.0 to 0.7.1.
5 years ago
Maksim Pechnikov
399ca9133b
fix test
5 years ago
Maksim Pechnikov
f95b67c933
Merge branch 'develop' into issue/1177
5 years ago
Ivan Tashkinov
7101ba1a21
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Ivan Tashkinov
256ff09aa8
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
5 years ago
Maksim Pechnikov
64bfb41c55
fixed unfollow for relay actor
5 years ago
Maksim Pechnikov
85bd8a4e31
fixed clear config after test
5 years ago
Ariadne Conill
76bb3572dd
test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1
5 years ago
lain
74f7f308f8
Merge branch 'fix/admin-api-user-deletion' into 'develop'
...
Fix deactivated user deletion
See merge request pleroma/pleroma!1546
5 years ago
lain
8340fe8fcc
Merge branch 'digest-template' into 'develop'
...
Improve digest email template
See merge request pleroma/pleroma!1565
5 years ago
lain
ef43016b2c
Merge branch 'feature/custom-fields' into 'develop'
...
Add custom profile fields
See merge request pleroma/pleroma!1488
5 years ago
lain
d2c9befc64
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Sergey Suprunenko
75a5dd41ee
Add more tests for Database tasks and DigestEmailWorker
5 years ago
Maksim
a320358703
added test helpers to clear config after tests
5 years ago
lain
49ae3191df
Merge branch 'hotfix/user_unfollow' into 'develop'
...
[#1177 ] fixed User.unfollow with synchronization external user
See merge request pleroma/pleroma!1579
5 years ago
Maksim Pechnikov
e652cef76b
removes duplicates from relay subscription list
5 years ago
Ariadne Conill
a2fdc32368
tests: activitypub: fix typo
5 years ago
kaniini
475fcb3e6c
Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'
...
Clear follow requests when blocking a user
See merge request pleroma/pleroma!1583
5 years ago
kaniini
18c8c8d176
Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'
...
Hide muted theads from home/public timelines unless `with_muted` is set
See merge request pleroma/pleroma!1575
5 years ago
Sadposter
58c1391c4d
use commonAPI in tests
5 years ago
Sadposter
94e336d9d5
clear follow requests when blocking a user
5 years ago
Maksim Pechnikov
3315a2a1c3
fixed User.unfollow with synchronization external user
5 years ago
lain
7ab2dbbdb6
Merge branch 'pleroma-conversations' into 'develop'
...
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
5 years ago
Mark Felder
6a3b1a526e
max_body_size -> max_body_length, as it should be
5 years ago
rinpatch
a4a3e3becd
Hide muted theads from home/public timelines unless `with_muted` is set
5 years ago
Maxim Filippov
ec969eec51
Merge branch 'develop' into 'fix/admin-api-user-deletion'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Maxim Filippov
2b94ae3b39
Do not check if actor is active when deleting a user
5 years ago
Ivan Tashkinov
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Ivan Tashkinov
a180c1360e
[ #1149 ] Oban mailer job. Adjusted tests.
5 years ago
stwf
d81f63845a
Implement Pleroma.Stats as GenServer
5 years ago
stwf
51bdf0cab6
use default child_specs
5 years ago
lain
d3af9e19ed
Conversations: Load relations in one query.
5 years ago
Egor Kislitsyn
4b7f1c6995
Improve digest email template
5 years ago
lain
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
Egor Kislitsyn
e457fcc479
Add `:max_remote_account_fields` config option
5 years ago
Egor Kislitsyn
f7bbf99caa
Use info.fields instead of source_data for remote users
5 years ago
Egor Kislitsyn
2c35d4b0b0
Add configurable account field name length limit
5 years ago
Egor Kislitsyn
db3c05f6b4
Add configurable account field value length limit
5 years ago
Egor Kislitsyn
7d6f8a7fd7
Linkify custom fields values in ActivityPub.UserViewx
5 years ago
Egor Kislitsyn
5178f960c3
Support user attachment update in Transmogrifier
5 years ago
Egor Kislitsyn
88598c9baf
Add profile custom fields to ActivityPub.UserView
5 years ago
Egor Kislitsyn
d6094b405d
Fix tests
5 years ago
Egor Kislitsyn
e0ac5c7a66
Add custom profile fields
5 years ago
rinpatch
9ef31767f2
Merge branch 'feature/mrf-vocabulary' into 'develop'
...
MRF Vocabulary
See merge request pleroma/pleroma!1559
5 years ago
kaniini
c3a54cc34d
Merge branch 'feature/mrf-describe' into 'develop'
...
MRF describe API
See merge request pleroma/pleroma!1561
5 years ago
rinpatch
83a3de8cc4
Merge branch 'length-limit-bio' into 'develop'
...
Add configurable length limits for `User.bio` and `User.name`
See merge request pleroma/pleroma!1515
5 years ago
Ariadne Conill
4244e17de0
fix credo
5 years ago
Ariadne Conill
10fef2fcee
tests: fix up nodeinfo tests
5 years ago
Ariadne Conill
dd0b71ea6d
tests: add tests for MRF.describe()
5 years ago
Ariadne Conill
7089400675
test: add mock MRF module for describe() testing
5 years ago
Maksim
fea4d89e9f
tests for Web/ActivityPub/Relay
5 years ago
Maksim
04da1166db
tests for /web/mastodon_api/mastodon_api.ex
5 years ago
Ariadne Conill
f7e3b7ff75
tests: add tests for mrf_vocabulary
5 years ago
Ivan Tashkinov
0e1c481a94
[ #1149 ] Added more oban workers. Refactoring.
5 years ago
lain
511ccea5aa
ConversationView: Align parameter names with other views.
5 years ago
lain
60231ec7bd
Conversation: Add endpoint to get a conversation by id.
5 years ago
lain
23c46f7e72
Conversations: Use 'recipients' for accounts in conversation view.
...
According to gargron, this is the intended usage.
5 years ago
Ariadne Conill
9cfc289594
MRF: ensure that subdomain_match calls are case-insensitive
5 years ago
kaniini
84808e1697
Merge branch 'develop' into 'fix/hide-follows-counters'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Sergey Suprunenko
af4cf35e20
Strip internal fields including likes from incoming and outgoing activities
5 years ago
Maksim
11d08c2de0
tests for Pleroma.Uploaders
5 years ago
Ivan Tashkinov
33a5fc4a70
[ #1149 ] Fixed failing tests. Ensured Instance.set_unreachable/2 supports ISO 8601 datetime.
5 years ago
rinpatch
0802a08871
Mastodon API: Fix thread mute detection
...
It was calling CommonAPI.thread_muted? with post author's account
instead of viewer's one.
5 years ago
Maksim
bb9c539580
Uploader.S3 added support stream uploads
5 years ago
Maxim Filippov
dfae61c25c
Fix deactivated user deletion
5 years ago
Ivan Tashkinov
267262491e
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Ivan Tashkinov
b7fad8d395
[ #1149 ] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.
5 years ago
rinpatch
409bcad54b
Mastodon API: Set follower/following counters to 0 when hiding
...
followers/following is enabled
We are already doing that in AP representation, so I think we should do
it here as well for consistency.
5 years ago
lain
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
5 years ago
lain
a2b98f6d58
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
Haelwenn
aa718ab8f6
Merge branch 'fix/object-reembeds' into 'develop'
...
Do not rembed the object after updating it
Closes #1142
See merge request pleroma/pleroma!1538
5 years ago
rinpatch
5329e84d62
OStatus tests: stop relying on embedded objects
5 years ago
rinpatch
32018a4ee0
ActivityPub tests: remove assertions of embedded object being updated,
...
because the objects are no longer supposed to be embedded
5 years ago
Maksim
139b196bc0
[ #1150 ] fixed parser TwitterCard
5 years ago
lain
a49c92f6ae
Participation: Setting recipients will always add the owner.
5 years ago
Maksim
bdc9a7222c
tests for CommonApi/Utils
5 years ago
lain
d6fe220e32
Linting.
5 years ago
lain
b64b6fee2a
CommonAPI: Replies to conversations also get the correct context id.
5 years ago
lain
3af6d14da7
Pleroma Conversations API: Add a way to set recipients.
5 years ago
Eugenij
96028cd585
Remove Reply-To from report emails
5 years ago
Sergey Suprunenko
e8ad116c2a
Do not add the "next" key to likes.json if there is no more items
5 years ago
Alexander Strizhakov
de0f3b73dd
Admin fixes
5 years ago
Sergey Suprunenko
040347b248
Remove spaces from the domain search
5 years ago
Sergey Suprunenko
8b2fa31fed
Handle MRF rejections of incoming AP activities
5 years ago
lain
eee98aaa73
Pleroma API: Add endpoint to get conversation statuses.
5 years ago
feld
d93d777915
Fix/mediaproxy whitelist base url
5 years ago
Roman Chvanikov
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
5 years ago
lain
56b1c3af13
CommonAPI: Extend api with conversation replies.
5 years ago
lain
5ff8f07ca9
Merge branch 'feature/hide-follows-remote' into 'develop'
...
Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users
See merge request pleroma/pleroma!1411
5 years ago
lain
f88560accd
Conversations: Add recipient list to conversation participation.
...
This enables to address the same group of people every time.
5 years ago
Ivan Tashkinov
23d279e03e
[ #1149 ] Replaced RetryQueue with oban-based retries.
5 years ago
Egor Kislitsyn
f98235f2ad
Clean up tests output
5 years ago
Egor Kislitsyn
9ca4506355
Add configurable length limits for `User.bio` and `User.name`
5 years ago
kaniini
6c06529cd4
Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop'
...
Disallow following locked accounts over OStatus
See merge request pleroma/pleroma!1512
5 years ago
rinpatch
813c686dd7
Disallow following locked accounts over OStatus
5 years ago
Maksim
6eb33e7303
test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id
5 years ago
Ariadne Conill
f72e0b7cad
ostatus: explicitly disallow protocol downgrade from activitypub
...
This closes embargoed bug #1135 .
5 years ago
rinpatch
301ea0dc04
Add tests for counters being updated on follow
5 years ago
Maksim
58443d0cd6
tests for TwitterApi/UtilController
5 years ago
lain
7483679a7b
StatusView: Return direct conversation id.
5 years ago
rinpatch
c88a5d3251
Merge branch 'develop' into feature/hide-follows-remote
5 years ago
Alexander Strizhakov
51b3b6d816
Admin changes
5 years ago
kaniini
5835069215
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
...
This reverts merge request !1504
5 years ago
Ariadne Conill
5795a890e9
markdown: clean up html generated by earmark
5 years ago
lain
1dfde4151c
Merge branch 'refactor/use-constants' into 'develop'
...
refactoring: begin to use constants
See merge request pleroma/pleroma!1500
5 years ago
Sergey Suprunenko
c0e258cf21
Redirect not logged-in users to the MastoFE login page on private instances
5 years ago
Maksim
159bbec570
added tests for OstatusController
5 years ago
Ariadne Conill
b93498eb52
constants: add as_public constant and use it everywhere
5 years ago
Ariadne Conill
492d854e7a
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users
...
Closes #1104
5 years ago
Sachin Joshi
242f5c585e
add account confirmation email resend in mastodon api
5 years ago
Maksim
6a4b8b2681
fixed User.update_and_set_cache for stale user
5 years ago
Maksim
6b77a88365
[ #1097 ] added redirect: /pleroma/admin -> /pleroma/admin/
5 years ago
rinpatch
41e0304757
Merge branch 'develop' into feature/hide-follows-remote
5 years ago
Maksim
03c386614f
fixed test for elixir 1.7.4
5 years ago
kaniini
19835be067
Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'
...
Fix remote follow from /ostatus_subscribe
Closes #1103
See merge request pleroma/pleroma!1472
5 years ago
Sergey Suprunenko
b20020da16
Show the url advertised in the Activity in the Status JSON response
5 years ago
kPherox
8d9f43e1d1
Add WebFinger test for AP-only account
5 years ago
feld
84fca14c3c
Do not prepend /media/ when using base_url
...
This ensures admin has full control over the path where media resides.
5 years ago
Mike Verdone
0e2b5a3e6a
WIP
5 years ago
Maksim
55341ac717
tests WebFinger
5 years ago
Eugenij
4504135894
Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)
5 years ago
Mike Verdone
2c83eb0b15
Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor"
...
This reverts commit 2981821db8
.
5 years ago
Mike Verdone
2981821db8
squash! Expose expires_at datetime in mastoAPI only for the activity actor
...
NOTE: rewrite the commit msg
5 years ago
Roman Chvanikov
d2da3d30f3
Merge branch 'develop' into feature/digest-email
5 years ago
Mike Verdone
3cb471ec06
Expose expires_at datetime in mastoAPI only for the activity actor
...
In the "pleroma" section of the MastoAPI for status activities you can
see an expires_at item that states when the activity will expire, or
nothing if the activity will not expire.
The expires_at date is only visible to the person who posted the
activity. This is the conservative approach in case some attacker
decides to write a logger for expiring posts. However, in the future of
OCAP, signed requests, and all that stuff, this attack might not be that
likely. Some other pleroma dev should remove the restriction in the code
at that time, if they're satisfied with the security implications of
doing so.
5 years ago
Mike Verdone
36012ef6c1
Require that ephemeral posts live for at least one hour
...
If we didn't put some kind of lifetime requirement on these, I guess you
could annoy people by sending large numbers of ephemeral posts that
provoke notifications but then disappear before anyone can read them.
5 years ago
Mike Verdone
704960b3c1
Add support for activity expiration to common and Masto API
...
The "expires_at" parameter accepts an ISO8601-formatted date which
defines when the activity will expire.
At this point the API will not give you any feedback about if your post
will expire or not.
5 years ago
Mike Verdone
378f5f0fbe
Add activity expiration worker
...
This is a worker that runs every minute and deletes expired activities.
It's based heavily on the scheduled activities worker.
5 years ago
Mike Verdone
666514194a
Add activity expirations table
...
Add a table to store activity expirations. An activity can have zero or
one expirations. The expiration has a scheduled_at field which stores
the time at which the activity should expire and be deleted.
5 years ago
Mike Verdone
8ba7a151ad
Cleanup: fix a comment
5 years ago
sadposter
f5d574f4ed
check both item and parent domain blocks
5 years ago
Sadposter
4af4f6166b
honour domain blocks on streaming notifications
5 years ago
kaniini
9c6357324e
Merge branch 'feature/admin-api-user-statuses' into 'develop'
...
Admin API: Endpoint for fetching latest user's statuses
See merge request pleroma/pleroma!1413
5 years ago
Ariadne Conill
d3bdb8e704
rich media: parser: splice the given URL into the result
5 years ago
Maxim Filippov
f46805bb40
Merge branch 'develop' into feature/admin-api-user-statuses
5 years ago
Maxim Filippov
03471151d6
AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)
5 years ago
Alexander Strizhakov
5e72554f3c
Admin config fix
5 years ago
Maksim
c49a09ed88
tests for Pleroma.Web.ActivityPub.Publisher
5 years ago
kaniini
8d3cf7e519
Merge branch 'bugfix/unauthed-liked-by' into 'develop'
...
Bugfix: don't error out on unauthorized request to liked/favourited_by
See merge request pleroma/pleroma!1474
5 years ago
kaniini
03d89e182e
Merge branch 'fix/subscriber-notifications' into 'develop'
...
Do not notify subscribers for messages from users which are replies to others
See merge request pleroma/pleroma!1477
5 years ago
Mark Felder
ec7b085b76
Fix test
5 years ago
Mark Felder
fd287387a0
Do not notify subscribers for messages from users which are replies to others
5 years ago
Ariadne Conill
e7c64f106e
signature: properly deduce the actor from misskey key IDs
5 years ago
Sadposter
c400565427
fix test names because i cannot type
5 years ago
Sadposter
299c0e965b
actually reblog on the reblog test
5 years ago
Sadposter
7026018c8c
Use correct URL for tests
5 years ago
Sadposter
452980652d
Mix format
5 years ago
Sadposter
fd1fa5a2ec
add tests for unauthed reqs to liked/reblogged_by
5 years ago
Maxim Filippov
14ab2fd0f4
remove pry
5 years ago
Sergey Suprunenko
9340896c9e
Exclude tests that use :crypt.crypt/2 on macOS
5 years ago
Alexander Strizhakov
b70e659304
Feature/1087 wildcard option for blocks
5 years ago
Haelwenn
674ad5e1df
Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop'
...
activitypub: publisher: align sharedinbox usage with AP specification rules
See merge request pleroma/pleroma!1464
5 years ago
Sadposter
f712ee879a
Bugfix: muted/blocked user notification streaming
5 years ago
Sergey Suprunenko
05b5af8075
Add tests for users tasks and PleromaAuthenticator
5 years ago
Sadposter
a5d6287ba8
Hide blocked users from interactions
5 years ago
Ariadne Conill
56019d53a8
activitypub: publisher: align sharedinbox usage with AP specification rules
...
While debugging the follow breakage, I observed that our sharedInbox usage
did not match the rules in the specification. Accordingly, I have better
aligned our usage of sharedInbox with the rules outlined in the ActivityPub
specification.
5 years ago
rinpatch
196cad46f3
Resolve merge conflicts
5 years ago
Roman Chvanikov
8292331b35
Merge branch 'develop' into feature/digest-email
5 years ago
Sergey Suprunenko
43a7cd27fe
[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest
5 years ago
Roman Chvanikov
36049f08ef
Merge develop
5 years ago
kaniini
33729bbb28
Merge branch 'feature/richmedia-ttl' into 'develop'
...
add the rich media ttl based on image exp time
See merge request pleroma/pleroma!1438
5 years ago
kaniini
716afc83ce
Merge branch 'refactor/http-signature-plug' into 'develop'
...
http signature plug: separation of concerns
See merge request pleroma/pleroma!1449
5 years ago
Maksim
c2e2aadc42
#1110 fixed /api/pleroma/healthcheck
5 years ago
Sachin Joshi
de9906ad56
change the structure of image ttl parsar
5 years ago
Maxim Filippov
9570a5be40
Merge branch 'develop' into feature/admin-api-user-statuses
5 years ago
Ariadne Conill
c947cfec5a
mapped signature plug: use `user` assign like authentication plug
5 years ago
Maksim
f435217e50
tests for Plugs.AuthenticationPlug
5 years ago
Ariadne Conill
621cacf667
tests: add tests for mapped signature plug
5 years ago
Ariadne Conill
88d064d80e
http signature plug: remove redundant checks handled by HTTPSignatures library
...
the redundant checks assumed a POST request, which will not work for signed GETs.
this check was originally needed because the HTTPSignatures adapter assumed that
the requests were also POST requests. but now, the adapter has been corrected.
5 years ago
kaniini
f9a0014681
Merge branch 'feature/signed-object-fetches' into 'develop'
...
signed object fetches
See merge request pleroma/pleroma!1446
5 years ago
Maksim
b6b748d3e7
tests for Uploader with webhook
5 years ago
Ariadne Conill
1345e0c2bf
tests: add tests for signed object fetches
5 years ago
kaniini
1e48af9acf
Merge branch 'feature/instance-fetch-actor' into 'develop'
...
instance fetch service actor
See merge request pleroma/pleroma!1440
5 years ago
kaniini
60b54ee64a
Merge branch 'feature/http-signatures-keyid' into 'develop'
...
http signatures: derive actor from key IDs
See merge request pleroma/pleroma!1442
5 years ago
Ariadne Conill
f84fb340b7
http signatures: derive actor ID from key ID.
...
Almost all AP servers return their key ID as the actor URI with #main-key
added. Hubzilla, which doesn't, uses a URL which refers to the actor
anyway, so worst case, Hubzilla users get refetched.
5 years ago
Eugenij
4bf2bb9cff
Fix password reset for non-test env
...
Fixes `Plug.Conn.NotSentError` that causes a 5xx error in response
instead of 404 and 400.
Fixes pattern matching error caused by different response format
in test and non-test env: `Pleroma.Emails.Mailer.deliver_async` returns
:ok when PleromaJobQueue is enabled and `{:ok, _}` when it's disabled.
In tests, it's disabled.
5 years ago
Ariadne Conill
3d23a12d75
tests: add test for fetching the internal fetch actor
5 years ago
Ariadne Conill
62e5ff624e
user: add is_internal_user? helper function
5 years ago
kaniini
ce73d5f6a5
Merge branch 'feature/mention-mrf' into 'develop'
...
Add MRF MentionPolicy for dropping posts which mention specific actors
See merge request pleroma/pleroma!1439
5 years ago
RX14
96a2890a9e
Add MRF MentionPolicy for dropping posts which mention specific actors
5 years ago
Alexander Strizhakov
10f82c88b8
mastoapi password reset
...
added rate limit to password reset
configure rate limit in runtime
5 years ago
Maksim
21e3f9ac69
added tests for Pleroma.Upload.Filter
5 years ago
Sachin Joshi
18234cc44e
add the rich media ttl based on image exp time
5 years ago
Roman Chvanikov
9bca70b10a
Merge develop
5 years ago
Eugenij
520ee6c591
Add `pleroma.deactivated` to the Account entity (Mastodon API)
5 years ago
Eugenij
c4ca142e14
Add the `blocked_by` attribute to the relationship API (`GET /api/v1/accounts/relationships`)
5 years ago
rinpatch
996fd58ac4
Merge branch 'bugfix/poll-id-as-string' into 'develop'
...
Status View: Poll ids are strings.
See merge request pleroma/pleroma!1430
5 years ago
lain
7a24def473
Mastodon Controller: Fix tests.
5 years ago
lain
1ed24bcc76
Status View: Poll ids are strings.
...
All ids in mastodon are strings, in general.
5 years ago
feld
9f987dd017
Merge branch 'match-file-name' into 'develop'
...
try to always match the filename for proxy url
See merge request pleroma/pleroma!1405
5 years ago
Sergey Suprunenko
b74300bc7a
Add more tests for MastodonAPIController and CommonAPI
5 years ago
Sachin Joshi
1d906ffa82
Merge branch 'develop' into match-file-name
...
# Conflicts:
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
5 years ago
kaniini
03c4ea44ad
Merge branch 'admin-configure-atom-keys' into 'develop'
...
admin configure - atom keys with leading :
See merge request pleroma/pleroma!1424
5 years ago
Maksim
c32384c1ea
tests for Pleroma.Signature
5 years ago
Alex S
b8607c151c
migrating task refactor
5 years ago
Alex S
c66044b923
atom keys with leading :
5 years ago
Egor Kislitsyn
de13c9bb8f
List messages must be visible for mentioned users
5 years ago
Egor Kislitsyn
64a946643e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Egor Kislitsyn
a87c313309
Support `list` visibility in StatusView
5 years ago
Maksim
fa17879c20
added tests for Web.MediaProxy
5 years ago
Sergey Suprunenko
dce8ebc9ea
Unfollow should also unsubscribe
5 years ago
Ariadne Conill
841314c2d5
tests: fix object containment violations in the transmogrifier tests
...
Some objects were not completely rewritten in the tests, which caused object
containment violations. Fix them by rewriting the object IDs to be in an
appropriate namespace.
5 years ago
Roman Chvanikov
c729883936
Merge branch 'develop' into feature/digest-email
5 years ago
Ariadne Conill
739bbe0d3b
security: detect object containment violations at the IR level
...
It is more efficient to check for object containment violations at the IR
level instead of in the protocol handlers. OStatus containment is especially
a tricky situation, as the containment rules don't match those of IR and
ActivityPub.
Accordingly, we just always do a final containment check at the IR level
before the object is added to the IR object graph.
5 years ago
kaniini
cef4337f95
Merge branch 'bugfix/llal-object-containment' into 'develop'
...
Object.Fetcher: Handle error on Containment.contain_origin/2
See merge request pleroma/pleroma!1414
5 years ago
Haelwenn (lanodan) Monnier
a2c601acb5
FetcherTest: Containment refute called(OStatus.fetch_activity_from_url)
5 years ago
Alexander Strizhakov
e7c39b7ac8
Feature/1072 muting notifications
5 years ago
Haelwenn (lanodan) Monnier
f00562ed6b
HttpRequestMock: Add 404s on OStatus fetching for info.pleroma.site
5 years ago
Haelwenn (lanodan) Monnier
efa9a13d4e
HttpRequestMock: Add missing mocks for object containment tests
5 years ago
rinpatch
0c2dcb4c69
Add follow information refetching after following/unfollowing
5 years ago
rinpatch
183da33e00
Add tests for fetch_follow_information_for_user and check object type
...
when fetching the page
5 years ago
Maxim Filippov
418ae6638d
Merge branch 'develop' into feature/admin-api-user-statuses
5 years ago
Maxim Filippov
a9459ff98f
Admin API: Endpoint for fetching latest user's statuses
5 years ago
Ariadne Conill
80c46d6d8b
nodeinfo: implement MRF transparency exclusions
5 years ago
rinpatch
e8fa477793
Refactor Follows/Followers counter syncronization
...
- Actually sync counters in the database instead of info cache (which got
overriden after user update was finished anyway)
- Add following count field to user info
- Set hide_followers/hide_follows for remote users based on http status
codes for the first collection page
5 years ago
Ivan Tashkinov
369e9bb42f
[ #1041 ] Rate-limited status actions (per user and per user+status).
5 years ago
rinpatch
095117a58c
Merge branch 'develop' into fix/ap-hide-follows
5 years ago
rinpatch
97b79efbcd
ActivityPub Controller: Actually pass for_user to following/followers
...
views and give 403 errors when trying to request hidden follower pages
when unauthenticated
5 years ago
Sachin Joshi
f8e3ae6154
try to always match the filename for proxy url
5 years ago
Maksim
92055941bd
Pleroma.Web.Metadata - tests
5 years ago
rinpatch
1f6ac7680d
ActivityPub User view: Following/Followers refactoring
...
- Render the collection items if the user requesting == the user
rendered
- Do not render the first page if hide_{followers,follows} is set, just
give the URI to it
5 years ago
Mark Felder
360e4cdaa2
Move these to pleroma namespace in Mastodon API
5 years ago
rinpatch
27ed260eed
AP user view: Add a test for hiding totalItems in following/followers
5 years ago
Sachin Joshi
6a6c4d134b
preserve the original path/filename (no encoding/decoding) for proxy
5 years ago
Roman Chvanikov
eae991b06a
merge develop
5 years ago
Eugenij
4198c3ac39
Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel
5 years ago
Alexander Strizhakov
846ad9a463
admin api configure changes
5 years ago
kaniini
e4e3fd7e55
Merge branch 'fix/1019-refactor' into 'develop'
...
Fix/1019 refactor
See merge request pleroma/pleroma!1397
5 years ago
Egor Kislitsyn
9e06873d58
Add `list` to Visibility
5 years ago
Egor Kislitsyn
958fb9aa80
Add "listMessage"
5 years ago
Egor Kislitsyn
182f7bbb11
Merge branch 'develop' into feature/addressable-lists
5 years ago
Alexander Strizhakov
a237c6a2d4
support for idna domains
5 years ago
Haelwenn (lanodan) Monnier
252e129b1e
MastoAPI: Add categories to custom emojis
...
Note: This isn’t in a release yet, can be seen in mastofe on the
rebase/glitch-soc branch.
5 years ago
Alex S
beba7bbc85
removing synchronization worker
5 years ago
Alex S
ade213cb35
robots txt test fix
5 years ago
Alex S
f8786fa6f2
adding following_address field to user
5 years ago
Sergey Suprunenko
ff55e3c16f
Create mentions only for explicitly mentioned users
5 years ago
Egor Kislitsyn
c2a589d9a3
Fix credo warning
5 years ago
Egor Kislitsyn
0d54a571ca
Add SetLocalePlug
5 years ago
Maksim
008c55e4e9
add test for search_controller/ 100% coverage
5 years ago
Maksim
12b1454245
[ #1062 ] added option to disable send email
5 years ago
Sergey Suprunenko
2d2b50ccca
Send and handle "Delete" activity for deleted users
5 years ago
kaniini
75be90a6d1
Merge branch 'release/listener' into 'develop'
...
add listener port and ip option for 'pleroma.instance gen' and enable its test
See merge request pleroma/pleroma!1393
5 years ago
feld
93a0eeab16
Add license/copyright to all project files
5 years ago
Maksim
bb8065a1fd
tests MRF filters
5 years ago
Sachin Joshi
6d0ae264fc
add listener port and ip option for 'pleroma.instance gen' and enable its test
5 years ago
Ivan Tashkinov
8a41d34673
[ #878 ] Tests improvements per code review.
5 years ago
Ivan Tashkinov
6fc0c27be3
[ #878 ] Uncommented test statement.
5 years ago
Ivan Tashkinov
829e997223
[ #878 ] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests
...
# Conflicts:
# lib/pleroma/object.ex
# test/web/activity_pub/transmogrifier_test.exs
# test/web/ostatus/ostatus_test.exs
5 years ago
Roman Chvanikov
371d39e160
Merge develop
5 years ago
kaniini
1417627d07
Merge branch 'remove-avatar-header' into 'develop'
...
Ability to reset avatar, profile banner and backgroud
See merge request pleroma/pleroma!1187
5 years ago
Alexander Strizhakov
d6b0fce6e9
Fix/1019 correct count remote users
5 years ago
kaniini
4948117fcf
Merge branch 'remove-swift' into 'develop'
...
Remove Uploaders.Swift and `httpoison` dependency
Closes #1051
See merge request pleroma/pleroma!1374
5 years ago
Alexander Strizhakov
4e6e5d8042
reverse proxy tests
5 years ago
kaniini
1179a13533
Merge branch 'features/sec-websocket-protocol-header' into 'develop'
...
Features: MastoAPI streaming Sec-WebSocket-Protocol header
See merge request pleroma/pleroma!1381
5 years ago
feld
167f810ff1
Merge branch 'proxy-error' into 'develop'
...
make sure the url used by proxy is same as original url
See merge request pleroma/pleroma!1383
5 years ago
Mark Felder
e143747445
Add test for URLs with Unicode characters too
5 years ago
Haelwenn
95c085174d
Merge branch 'test-speedup' into 'develop'
...
Testing: Don't federate in testing.
See merge request pleroma/pleroma!1391
5 years ago
Mark Felder
ce3ffad13a
Remove duplicated test. New one is more comprehensive.
5 years ago
Mark Felder
31a59d6f23
Merge branch 'develop' into proxy-error
5 years ago
Mark Felder
98f13eac9e
Capitalize
5 years ago
Mark Felder
4213a4e2aa
Test that all ASCII encoded characters are preserved
5 years ago
rinpatch
376a55c97f
Merge branch '161-incoming-replies-depth-limit' into 'develop'
...
[#161 ] Limited replies depth on incoming federation (memory leaks fix)
Closes #161
See merge request pleroma/pleroma!1361
5 years ago
Alexander Strizhakov
23d4781e73
change for local user search
5 years ago
lain
abe2e8881f
Testing: Don't federate in testing.
5 years ago
Ivan Tashkinov
46cf81a544
[ #878 ] Formatting fix.
5 years ago
Ivan Tashkinov
daff85a985
[ #878 ] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.
5 years ago
rinpatch
72b88c82bc
Mastodon API: Fix embedded relationships not being rendered inside of statuses
5 years ago
Sachin Joshi
f5ad430974
make sure the url used by proxy is same as origin url
...
encoding or decoding it breaks some of the signed url
5 years ago
Haelwenn (lanodan) Monnier
b5ba41a725
mastodon_websocket_test.exs: Test for Sec-WebSocket-Protocol header
5 years ago
Ivan Tashkinov
ad8d86e7c6
Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
5 years ago
Maksim
6dadf5d6f4
[ #1043 ] fix search accounts.
5 years ago
Egor Kislitsyn
11143c542a
Remove `httpoison` from dependencies
5 years ago
Eugenij
ab50c6b3ca
Add fallback value to the admin report view.
...
This is to avoid 500 error when the reported user no longer exists
in the database.
5 years ago
Roman Chvanikov
d2cb18b2a3
Merge branch 'develop' into feature/digest-email
5 years ago
Ivan Tashkinov
a799418573
[ #161 ] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
...
# Conflicts:
# CHANGELOG.md
5 years ago
Ivan Tashkinov
2b9d914089
[ #161 ] Refactoring, documentation.
5 years ago
Eugenij
1f76740e10
Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
5 years ago
Maksim
acd20f166b
[ #1026 ] Filter.AnonymizeFilename added ability to retain file extension with custom text
5 years ago
rinpatch
4c60a562a7
Fix not being able to pin unlisted posts
...
Closes #1038
5 years ago
Ivan Tashkinov
5b7b1040b3
[ #161 ] Limited replies depth on incoming federation in order to prevent memory leaks on recursive replies fetching.
5 years ago
kaniini
d1549a6375
Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop'
...
Merge admin and mastodon user views for reports
See merge request pleroma/pleroma!1346
5 years ago
William Pitcock
c22f0bfb80
test: add tests for mediaproxy warming policy
5 years ago
Roman Chvanikov
657277ffc0
Resolve conflicts
5 years ago
Maxim Filippov
90927e6a9a
Kowalski, analysis!
5 years ago
Maxim Filippov
452ca5250d
Merge admin and mastodon user views for reports
5 years ago
kaniini
0369a5db16
Merge branch 'idempotency-plug' into 'develop'
...
Add IdempotencyPlug and use it in all of the api
Closes #1003
See merge request pleroma/pleroma!1339
5 years ago
Alexander Strizhakov
c6705144a2
don't delete config settings on admin update
5 years ago
Egor Kislitsyn
889a9c3a3f
Polish IdempotencyPlug
5 years ago
Egor Kislitsyn
825077a5b0
Add Idempotency plug
5 years ago
Sergey Suprunenko
d53fb55bb7
Return correct response when reply to a direct message is not direct itself
5 years ago
Maksim Pechnikov
4ad15ad2a9
add ignore hosts and TLDs for rich_media
5 years ago
Maksim Pechnikov
0cb8e710fb
add test
5 years ago
Maksim
a0c4ebb4d7
[ #184 ] small refactoring reset password
5 years ago
Sergey Suprunenko
2c63c67512
Rework user deletion
5 years ago
Eugenij
f2c03425b0
Broadcast conversation update when DM is deleted
5 years ago
kaniini
27b9605de0
Merge branch 'rich_media_titles_two' into 'develop'
...
Rich media titles two
See merge request pleroma/pleroma!1325
5 years ago
Alex S
b37ede5df3
log capturing
5 years ago
Alex S
982cad0268
support for config groups
5 years ago
Sachin Joshi
a0c65bbd6c
Merge branch 'develop' into 'remove-avatar-header'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Alex S
410add1c30
support for tuples with more than 2 values
5 years ago
lain
0e415921cd
Rich Media Parser: Do not return just a title if nothing else is there.
5 years ago
lain
58c4d5312b
Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'""
...
This reverts commit b6af80f769
.
5 years ago
Alex S
f0fccb7578
fix for int and modules
5 years ago
kaniini
55742d978d
Merge branch 'feature/mrf-anti-link-spam' into 'develop'
...
implement anti link spam MRF
See merge request pleroma/pleroma!1307
5 years ago
kaniini
e3534f5b3c
Merge branch 'oauth_secure_redirect' into 'develop'
...
OAuth security improvements (`redirect_uri` listing enforcement)
See merge request pleroma/pleroma!1302
5 years ago
kaniini
720412bf24
Merge branch 'revert-6f5a0cc1' into 'develop'
...
Revert "Merge branch 'fix/ogp-title' into 'develop'"
See merge request pleroma/pleroma!1317
5 years ago
feld
b6af80f769
Revert "Merge branch 'fix/ogp-title' into 'develop'"
...
This reverts merge request !1277
5 years ago
Egor Kislitsyn
fc6e661672
Fix rate limiter tests
5 years ago
Alexander Strizhakov
32320c1ee9
Fixes for dynamic configuration
5 years ago
William Pitcock
21dacd4b15
unbreak polls
5 years ago
William Pitcock
736d8ad6be
implement anti link spam MRF
5 years ago
Alexander Strizhakov
e4fa6b99ac
aliases for mix tasks
...
ecto.migrate
ecto.rollback
5 years ago
lain
5c6c4ce634
Merge branch 'fix/rich-media-hashtags-again' into 'develop'
...
Rich Media: Skip Microformats hashtags
See merge request pleroma/pleroma!1304
5 years ago
rinpatch
035368d363
Rich Media: Skip Microformats hashtags
...
When fixing this problem I incorrectly assumed a.hashtag is
the proper way for detecting hashtags, but it is just something Pleroma and
Mastodon add. Per microformats it should be detected by the presense of rel=tag.
This MR adds a check for rel=tag, but I still left a.hashtag just in case
5 years ago
Ivan Tashkinov
9f45f93949
Added more `redirect_uri` checks to prevent redirect to not explicitly listed URI.
5 years ago
rinpatch
c7acca2abb
Mastodon API: Sanitize display names
...
Closes #1000
5 years ago
rinpatch
49a49d3763
Merge branch 'removing-test-errors' into 'develop'
...
Removing test errors
See merge request pleroma/pleroma!1296
5 years ago
Haelwenn
c34327b22e
Merge branch 'fix/sanitize-report-content' into 'develop'
...
Sanitize HTML in ReportView
Closes #990
See merge request pleroma/pleroma!1293
5 years ago
Alex S
2e2edcb461
capturing errors
5 years ago
Alex S
0f59265a50
salmon fix
...
removed some ownership sandbox error
5 years ago
Maksim
a04bf131e0
[ #570 ] add user:notification stream
5 years ago
rinpatch
bf6aa6f1a8
Fix report content stopping to be nullable
5 years ago
rinpatch
44de34d170
Credo fixes
5 years ago
rinpatch
e943905bd7
Add tests for report view
5 years ago
kaniini
52b1b0e45d
Merge branch '963_oob_oauth_redirect_fix' into 'develop'
...
[#963 ] No redirect on OOB OAuth authorize request with existing authorization
See merge request pleroma/pleroma!1276
5 years ago
lain
a440cf856d
Mastodon API: Return the token needed for the chat.
5 years ago
rinpatch
62ffc00a5d
Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'
...
AccountView: Add user background.
See merge request pleroma/pleroma!1280
5 years ago
Alexander Strizhakov
c2ca1f22a2
it is changed in compile time
...
we can't change module attributes and endpoint settings in runtime
5 years ago
lain
7f48b90bfb
Merge branch 'fix/hashtag-rich-media' into 'develop'
...
Fix hashtags being picked up by rich media parser
Closes #989
See merge request pleroma/pleroma!1288
5 years ago
Maksim
ee4ed87fb4
[ #948 ] /api/v1/account_search added optional parameters (limit, offset, following)
5 years ago
rinpatch
d0ebc0edf3
Fix hashtags being picked up by rich media parser
...
Closes #989
5 years ago
lain
eac298083f
MastodonAPI: Add a way to update the background image.
5 years ago
lain
5965efb216
AccountView: Add user background.
5 years ago
lain
6f5a0cc14e
Merge branch 'fix/ogp-title' into 'develop'
...
Rich Media Parser: Attempt to use <title> from HTML as a fallback
Closes #979
See merge request pleroma/pleroma!1277
5 years ago
Egor Kislitsyn
30e54fd7e2
Handle HTTP 404 response
5 years ago
Egor Kislitsyn
afae3ada22
Handle HTTP "410 Gone" response
5 years ago
Egor Kislitsyn
a12f8e13c8
Improve <title> fallback; Add a test
5 years ago
Ivan Tashkinov
4b2c29016c
[ #963 ] No redirect on OOB OAuth authorize request with existing authorization. OAuth-related refactoring.
5 years ago
Egor Kislitsyn
6f29865d43
Add option to restrict all users to local content
5 years ago
lain
63ab3c30eb
Merge branch 'feature/rate-limiter' into 'develop'
...
Feature/Rate Limiter
Closes #943
See merge request pleroma/pleroma!1266
5 years ago
Egor Kislitsyn
ad04d12de6
Replace `MastodonAPIController.account_register/2` rate limiter
5 years ago
Egor Kislitsyn
2e5affce61
Add RateLimiter
5 years ago
kaniini
f2d72b1fe4
Merge branch 'preload-changes' into 'develop'
...
Conversations: Fetch users in one query.
See merge request pleroma/pleroma!1258
5 years ago
Sergey Suprunenko
365268d522
Add more tests for using media_proxy and whitelists
5 years ago
rinpatch
dffc9f060a
replace missing mock with a 404
5 years ago
rinpatch
d020f68e87
Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
5 years ago
lain
970f71e222
Conversations: Fetch users in one query.
5 years ago
Roman Chvanikov
01fe5abad1
Resolve conflicts
5 years ago
lain
cb2bcee842
User Search: Boost friends more strongly.
5 years ago
lain
7e9f7ea0c2
MastodonAPI: Add test for user search.
5 years ago
Egor
f82382de22
[ #943 ] Make the unauthenticated users limitation optional
5 years ago
kaniini
3f6da9c45a
Merge branch 'bugfix/377-stuck-follow-request' into 'develop'
...
Bugfix/377 stuck follow request
Closes #377
See merge request pleroma/pleroma!1250
5 years ago
kaniini
a511d2f900
Merge branch 'improve-search' into 'develop'
...
[#943 ] Contain search for unauthenticated users
See merge request pleroma/pleroma!1220
5 years ago
lain
ad19bfc7fe
Utils: Split update_follow_state and update_follow_state_for_all.
5 years ago
lain
827a51e777
CommonAPI: Add test for accept_follow_request.
5 years ago
lain
076c9ae40e
User: Remove superfluous `maybe_follow`.
5 years ago
lain
3115b64cfe
Transmogrifier: Add tests for incoming follows to locked accounts.
5 years ago
Egor Kislitsyn
cfa5572d28
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
lain
024dfdc39c
Typo + Linting.
5 years ago
lain
8b9a0dd4a7
User: Don't error out when following a user that's already followed.
...
This leads to a few situations where it is impossible to follow a user.
5 years ago
Egor Kislitsyn
5b04f07a1e
Limit search for unauthenticated users to local users only
5 years ago
Egor Kislitsyn
17a6f81f7b
Fix tests with enabled RUM
5 years ago
Egor Kislitsyn
93397fce3d
Contain search for unauthenticated users
5 years ago
kaniini
e4babb1c9f
Merge branch 'explicit-addressing' into 'develop'
...
Explicit addressing
See merge request pleroma/pleroma!1239
5 years ago
Egor Kislitsyn
6ba9055b51
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Roman Chvanikov
b1b1a270e8
Fix conflict
5 years ago
Haelwenn
ab4915edcb
Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop'
...
Participations: Filter out participations without activities.
Closes #956 and #953
See merge request pleroma/pleroma!1246
5 years ago
Maksim Pechnikov
d3d1704e84
Merge branch 'develop' into issue/941
5 years ago
lain
a3a7178b60
Participations: Filter out participations without activities.
5 years ago
rinpatch
bbff7554de
Add tests for get_existing_votes
5 years ago
Egor Kislitsyn
9ce928d823
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
lain
4cab98b7bf
Merge remote-tracking branch 'origin/develop' into explicit-addressing
5 years ago
Maksim Pechnikov
4f2e359687
Merge branch 'develop' into issue/941
5 years ago
kaniini
9f0d0d0805
Merge branch 'feature/mrf-subchain' into 'develop'
...
MRF: subchain policy
See merge request pleroma/pleroma!1233
5 years ago
Sergey Suprunenko
84cc131b59
Add missing HTTP Request mocks
5 years ago
kaniini
9d2563a3de
Merge branch 'generic-fe-settings' into 'develop'
...
Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221
5 years ago
Roman Chvanikov
f6036ce3b9
Fix tests
5 years ago
Roman Chvanikov
bd325132ca
Fix tests
5 years ago
Roman Chvanikov
3e17610587
Add task to test emails
5 years ago
Mark Felder
6ef145b4fc
Merge branch 'develop' into feature/digest-email
5 years ago
Maksim Pechnikov
64ada7f960
fix tests
5 years ago
Maksim Pechnikov
f13d6c7f78
update api to set skip_thread_containment
5 years ago
lain
804b6a4d8f
CommonAPI.Utils: Add tests.
5 years ago
lain
80d4d83aac
CommonAPI: Add explicit addressing.
5 years ago
lain
2b664b048e
User: Add function to get AP ids from nicknames.
5 years ago
Maksim Pechnikov
080e1aa70e
add option skip_thread_containment
5 years ago
rinpatch
dc91bcc0af
Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
lambda
314758c25b
Merge branch 'align-mastodon-conversations' into 'develop'
...
Mastodon Conversations API: Align to Mastodon behavior
See merge request pleroma/pleroma!1215
5 years ago
rinpatch
026b245dbc
Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
rinpatch
2fe3a20638
Make error message about author's inability to vote more sensible
5 years ago
rinpatch
c47da0e65d
Add tests for poll view
5 years ago
William Pitcock
38a275b31f
test: add tests for subchain policy
5 years ago
kaniini
5402d04e3c
Merge branch 'feature/notification-control-part-2' into 'develop'
...
notification controls, part 2
See merge request pleroma/pleroma!1204
5 years ago
Sachin Joshi
e394fc2eef
fix the flaky test for users creation by admin
5 years ago
rinpatch
cfa588e357
Fix Credo issues
5 years ago
rinpatch
65db5e9f52
Resolve merge conflicts
5 years ago
rinpatch
300d94c628
Add poll votes
...
Also in this commit by accident:
- Fix query ordering causing exclude_poll_votes to not work
- Do not create notifications for Answer objects
5 years ago
Sachin Joshi
ad5263c647
Merge remote-tracking branch 'upstream/develop' into admin-create-users
5 years ago
Sachin Joshi
5534d4c676
make bulk user creation from admin works as a transaction
5 years ago
kaniini
e706b42f51
Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'
...
visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
See merge request pleroma/pleroma!1230
5 years ago
Sergey Suprunenko
2bbc2a801f
Remove all follower collections but actor's from "cc"
5 years ago
kaniini
d46cc7896e
Merge branch 'bugfix/remove-vanilla-flavour' into 'develop'
...
Bugfix: remove vanilla flavour
See merge request pleroma/pleroma!1228
5 years ago
William Pitcock
f2efe24cf8
visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
5 years ago
Sachin Joshi
d4304a3945
add the missing mock file
5 years ago
Haelwenn (lanodan) Monnier
5d3ece2861
Remove now useless flavours switching
5 years ago
lambda
2993361075
Merge branch 'hotfix/leaking-lists' into 'develop'
...
Mastodon API: Fix lists leaking private posts
See merge request pleroma/pleroma!1222
5 years ago
lain
7861974ab2
MastodonAPI: Add extension to set and get pleroma_settings_store.
5 years ago
lain
aaad85c4d9
AccountView: settings -> settings_store
5 years ago
lain
eb2963bc43
User: Add settings store to Info, AccountView
...
This is to provide a generic frontend settings storage mechanism for all kinds
of frontends.
5 years ago
rinpatch
d9c0650ff9
Mastodon API: Fix lists leaking private posts
...
Our previous list visibility resolver grabbed posts if either follower
collection of the user in a list who is followed is in `to` or if
follower collection of the user in a list was in `cc`. This not only
missed unlisted posts but also lead to leaking private posts when
`fix_explicit_addressing` mistakingly started putting follower collections
to `cc` (also fixed in this MR).
Reported by @kurisu@iscute.moe via a DM
5 years ago
rinpatch
a9eaa55885
Fix fix_explicit_addressing moving follower collection to cc and add tests for it
5 years ago
lain
97fb50d9fa
Mastodon Conversation API: Don't return own account in 'accounts'.
5 years ago
Sergey Suprunenko
1690be991e
Replace missing non-nullable Card attributes with empty strings
5 years ago
lambda
91ac8b075b
Merge branch 'use-pleroma-config' into 'develop'
...
Use Pleroma.Config everywhere
See merge request pleroma/pleroma!1214
5 years ago
Egor Kislitsyn
99f70c7e20
Use Pleroma.Config everywhere
5 years ago
Roman Chvanikov
ce47017c89
Merge develop
5 years ago
Maksim
db94294dfb
[ #936 ] fix tests
5 years ago
Sachin Joshi
1452a96ad6
ability to set and reset avatar, profile banner and backgroud in Mastodon API
5 years ago
lambda
5bb843ceec
Merge branch 'refactor/die-httpoison-die' into 'develop'
...
remove @httpoison, @ostatus and @websub compile-time constants
See merge request pleroma/pleroma!1203
5 years ago
William Pitcock
79503ce90f
mrf: simple policy: fix matching imported activitypub and ostatus statuses
5 years ago
William Pitcock
45e4642a58
tests: chase remote/local removal
5 years ago
William Pitcock
59a703fcbe
twitter api: user view: expose user notification settings under pleroma object
5 years ago
William Pitcock
0f7eeb0943
tests: add tests for non-follows/non-followers settings
5 years ago
William Pitcock
1542cccbbc
tests: chase notification setting changes
5 years ago
William Pitcock
56fd7dbdd7
remove @websub and @ostatus module-level constants
5 years ago
William Pitcock
80d55d428f
tests: websub: check only that signature validation succeeds or fails
5 years ago
Aaron Tinio
9415932af5
Keep nodeinfo available when not federating
5 years ago
Sergey Suprunenko
bbea5691da
Mention all people in the beginning of DM
5 years ago
feld
f916e4cdd9
Move the Cache Control header test to its own file
...
We can consolidate our cache control header tests here
5 years ago
Egor Kislitsyn
a7affbdd6d
Fix tests
5 years ago
Egor Kislitsyn
f333041a0a
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Sachin Joshi
0c53d91f3b
fix merge conflict
5 years ago
William Pitcock
8086c7aed6
tests: add tests for banner and avatar removal
5 years ago
rinpatch
19c90d47c4
Normalize poll votes to Answer objects
5 years ago
Maksim
620908a2db
[ #699 ] add worker to clean expired oauth tokens
5 years ago
lambda
714d8d4ef9
Merge branch 'feature/object-pruning' into 'develop'
...
Object pruning
See merge request pleroma/pleroma!1181
5 years ago
lambda
ff363f70b5
Merge branch 'refactor/keys' into 'develop'
...
move key generation functions into Pleroma.Keys module
See merge request pleroma/pleroma!1186
5 years ago
rinpatch
cdac5efd10
Merge branch 'bugfix/account_view_source.note' into 'develop'
...
MastoAPI AccountView: fill source.note with plaintext version of note
Closes #926
See merge request pleroma/pleroma!1189
5 years ago
Haelwenn (lanodan) Monnier
0e2c215a00
MastoAPI AccountView: fill source.note with plaintext version of note
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/926
5 years ago
Sachin Joshi
17bfd000d7
Ability to reset avatar, profile banner and backgroud
5 years ago
kaniini
79c2cef2fb
Merge branch 'mongooseim-support' into 'develop'
...
MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172
5 years ago
kaniini
ab6e15622b
Merge branch 'fix/api-fallback' into 'develop'
...
Do not fallback to index.html for /api/* routes
Closes #920
See merge request pleroma/pleroma!1182
5 years ago
Sergey Suprunenko
9134848170
Do not truncate DM when it contains newlines and safe_dm_mentions is set to true
5 years ago
William Pitcock
045803346d
move key generation functions into Pleroma.Keys module
5 years ago
Aaron Tinio
f76268135c
Fix failing test
5 years ago
Aaron Tinio
3ab9255eda
Respond with a 404 Not implemented JSON error message
...
when requested API is not implemented
5 years ago
Aaron Tinio
a13d449b24
Add tests for fallback routes
5 years ago
William Pitcock
73df9d690d
object: fetcher: add support for reinjecting pruned objects
5 years ago
rinpatch
63b0b7190c
MastoAPI: Add GET /api/v1/polls/:id
5 years ago
rinpatch
0407ffe75f
Change validation error status codes to be more appropriate
5 years ago
rinpatch
aafe30d94e
Handle poll votes
5 years ago
rinpatch
3f96b3e4b8
Enforce poll limits and add error handling for MastodonAPI's post endpoint
5 years ago
rinpatch
76a7429bef
Add poll limits to /api/v1/instance and initial state
5 years ago
kaniini
d4847b17ca
Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop'
...
Add virtual :thread_muted? field
Closes #901
See merge request pleroma/pleroma!1178
5 years ago
Aaron Tinio
eb02edcad9
Add virtual :thread_muted? field
...
that may be set when fetching activities
5 years ago
Sadposter
dc916ba15f
Format mascot tests
5 years ago
Sadposter
e81f0fc6d4
Add mascot get/set tests
5 years ago
Aaron Tinio
2375e9a95b
Add report filtering to MRF.SimplePolicy
5 years ago
rinpatch
5ece901af3
Resolve merge conflicts and remove IO.inspects
5 years ago
rinpatch
fd920c8973
Mastodon API: Add support for posting polls
5 years ago
William Pitcock
dc08159538
also suppress link previews from posts marked #nsfw
5 years ago
William Pitcock
0da1233e8e
rich media: suppress link previews if post is marked as sensitive
5 years ago
lain
f959bf7aa6
MongooseIM: Add basic integration endpoints.
5 years ago
Egor Kislitsyn
557f0e33a7
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Egor Kislitsyn
f2936e0a07
Add `ap_id` to List
5 years ago
lain
249b31ffe5
Fix specs.
5 years ago
Alexander Strizhakov
7ed682213f
Fix/902 random compile failing
5 years ago
Sachin Joshi
5c028b8f92
user creation admin api will create multiple users
5 years ago
Aaron Tinio
443cd68a4c
Add tests for MRF.SimplePolicy
5 years ago
kaniini
bf84d50c76
Merge branch 'feature/890-add-report-uri' into 'develop'
...
Feature/890 add report uri
Closes #890
See merge request pleroma/pleroma!1164
5 years ago
Sergey Suprunenko
2c303afc8b
Remove duplicated entries in users' following lists
5 years ago
Sergey Suprunenko
e2b3a27204
Add Reports to Admin API
5 years ago
feld
e190b3022b
Merge branch 'fix/domain-unblocked-reblogs' into 'develop'
...
Fix domain-unblocked reblogs
Closes #892
See merge request pleroma/pleroma!1157
5 years ago
Mark Felder
ebb0482116
Merge branch 'develop' into conversations-import
5 years ago
lambda
fde30aee43
Merge branch 'feature/sql-thread-sat' into 'develop'
...
SQL thread visibility solver
See merge request pleroma/pleroma!971
5 years ago
Alexander Strizhakov
73ae58fdfa
Feature/896 toggling confirmation
5 years ago
Egor Kislitsyn
fc7246d715
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Alex S
4711d8151c
try this
5 years ago
Alex S
aa11fa4864
add report uri and report to
5 years ago
Aaron Tinio
2b6119dfbf
Restrict reblogs of activities from blocked domains
5 years ago
Aaron Tinio
64495b96e9
Add test for blocked domains
5 years ago
rinpatch
62e42b03ab
Handle incoming Question objects
5 years ago
William Pitcock
f09c3afdf5
chase test failures
5 years ago
William Pitcock
c7644313e7
test: update obsolete test
5 years ago
lain
f168a1cbdc
Merge remote-tracking branch 'origin/develop' into conversations-import
5 years ago
kaniini
62516be9c4
Merge branch 'fix/public-option-not-working' into 'develop'
...
Fix public option not working
Closes #873
See merge request pleroma/pleroma!1143
5 years ago
lambda
4440e23547
Merge branch 'chore/extricate-http-signatures' into 'develop'
...
switch to pleroma/http_signatures library
See merge request pleroma/pleroma!1155
5 years ago
William Pitcock
4429c1b7da
tests: fixup
5 years ago
lain
cbb3451023
CommonAPI: Refactor visibility, forbid public to private replies.
5 years ago
Sachin Joshi
ee22fff5ac
remove deprecated PleromaFE configuration
5 years ago
Egor Kislitsyn
a7a8f3bc2c
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Aaron Tinio
70c81b95d0
Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug
5 years ago
Aaron Tinio
7b8dc99ef1
Implement Pleroma.Plugs.EnsurePublicOrAuthenticated
5 years ago
William Pitcock
071f78733a
switch to pleroma/http_signatures library
5 years ago
kaniini
dfd031c26a
Merge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop'
...
Fix Pleroma.Config.get!/1 raising an error when value is false
See merge request pleroma/pleroma!1148
5 years ago
Maksim
52297920e7
Refactoring oauth response.
5 years ago
Egor Kislitsyn
d474995efa
Add Tests
5 years ago
Egor Kislitsyn
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Aaron Tinio
a18b2c0b12
Fix Pleroma.Config.get!/1 raising an error when value is false
5 years ago
lambda
b14a314ce7
Merge branch 'feature/federator-behaviours' into 'develop'
...
federator modularization (outgoing)
See merge request pleroma/pleroma!1140
5 years ago
Alexander Strizhakov
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
5 years ago
Sachin Joshi
7701a4c841
Make irreversible field default to false in filters
5 years ago
rinpatch
15cda998f3
Add a test to ensure create_or_bump_for does not normalize objects before checking the activity type
5 years ago
William Pitcock
582bd9d170
tests: fix AP test failures
5 years ago
William Pitcock
d823eb921b
tests: fix salmon tests
5 years ago
William Pitcock
2b847d4add
tests: chase federator publish_single_foo removals
5 years ago
kaniini
131f883207
Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop'
...
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
See merge request pleroma/pleroma!1129
5 years ago
Sachin Joshi
f01f995816
make url uniform in admin api
5 years ago
Roman Chvanikov
f1f7a11222
Merge develop
5 years ago
Francis Dinh
2a54e8c1f5
Use "repeated" instead of "retweeted" for repeated statuses in Twitter API
...
This makes it consistent with the language used in Pleroma FE (at least
in English).
Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533
5 years ago
rinpatch
e4523c3010
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
5 years ago
lain
a33bec7d58
Conversations: Import order, import as read.
5 years ago
lain
a4598b5e8b
Visibility: Make it more resilient.
5 years ago
lain
fcf2f38d20
Conversations: Add a function to 'import' old DMs.
5 years ago
Alexander Strizhakov
bfeb33e951
Merge develop
...
Merge conflict in lib/pleroma/activity.ex
5 years ago
Roman Chvanikov
b6b5b16ba4
Merge develop
5 years ago
rinpatch
4c5125dedc
Remove `bookmarks` assoc and add a fake `bookmark` assoc instead
5 years ago
rinpatch
3a7c14645e
- Actually use preloaded bookmarks in views
...
- Preload bookmarks in bookmark timeline
- Rework bookmark preload tests
5 years ago
rinpatch
f841eb7cdb
Preload bookmarks wherever the object is preloaded
5 years ago
lambda
238dd72fad
Merge branch 'conversations_three' into 'develop'
...
Conversations once more.
See merge request pleroma/pleroma!1119
5 years ago
Egor Kislitsyn
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Maksim
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
5 years ago
lambda
aacac9da0b
Merge branch 'feature/bbs' into 'develop'
...
BBS / SSH
See merge request pleroma/pleroma!997
5 years ago
Alexander Strizhakov
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
5 years ago
lain
eb0fb73ddb
BBS: Credo fixes.
5 years ago
lain
c58fd4c038
BBS: Fix tests.
5 years ago
lain
4c76f49e60
BBS: small fixes.
5 years ago
lain
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
5 years ago
Haelwenn (lanodan) Monnier
b5ad1715b2
MastoAPI: profile update with emoji_map
5 years ago
Haelwenn (lanodan) Monnier
2f76a40d02
formatter.ex: Add get_emoji_map/1
5 years ago
Haelwenn (lanodan) Monnier
d70af32127
Pleroma.User: remove emojify on parse_bio
5 years ago
Haelwenn (lanodan) Monnier
85b5c60694
Pleroma.Formatter: width/height to class=emoji
5 years ago
lain
81d1aa424d
Streamer: Stream out Conversations/Participations.
5 years ago
lambda
497d34b825
Merge branch 'iss-849' into 'develop'
...
Parse access_token from body parameters and URL parameters
See merge request pleroma/pleroma!1103
5 years ago
AkiraFukushima
a53a6c9d64
Add oauth plug tests for url and body parameters
5 years ago
Roman Chvanikov
8af55728e4
Fix tests
5 years ago
lain
45f790becc
Merge remote-tracking branch 'origin/develop' into conversations_three
5 years ago
Maksim
c854bff8f5
Refactored Pleroma.Web.Auth.Authenticator
5 years ago
lambda
0bcdaf378e
Merge branch 'bugfix/web-notification-special-char' into 'develop'
...
fix the web push notification with special char for status created
See merge request pleroma/pleroma!1092
5 years ago
Alex S
f11e7037c2
test fixes
5 years ago
Sachin Joshi
cd6da3606b
Merge branch 'develop' into bugfix/web-notification-special-char
5 years ago
Roman Chvanikov
0f0cc2703b
Merge develop
5 years ago
lain
b0951a8849
WebPush: Use Object.normalize, rewrite tests so they test reality.
5 years ago
rinpatch
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
kaniini
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
rinpatch
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
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
6 years ago
William Pitcock
ef52aa0e66
tests: fix up for changed bbcode library output and verify html is properly escaped
6 years ago
William Pitcock
501af917b5
add support for bbcode
6 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
6 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
6 years ago
Mark Felder
24c3e2db2c
Add mediaproxy whitelist capability
6 years ago
rinpatch
dfc8425659
Move settings to Source subentity
6 years ago
Alex S
85953c0836
fixes for tests
6 years ago
Egor Kislitsyn
c157e27a00
Merge branch 'develop' into feature/disable-account
6 years ago
Alex S
73d01857e3
bookmarks in separate table
6 years ago
William Pitcock
0fd0ffcd76
activitypub: transmogrifier: send reject follow if following does not succeed
6 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
6 years ago
Sachin Joshi
963d5774af
fix the status notification with special char
6 years ago
kaniini
030a7876b4
Merge branch 'security/fix-html-class-scrubbing' into 'develop'
...
html: lock down allowed class attributes to only those related to microformats
See merge request pleroma/pleroma!1090
6 years ago
William Pitcock
f5535e5743
html: lock down allowed class attributes to only those related to microformats
6 years ago
Sergey Suprunenko
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
6 years ago
rinpatch
f60d072bbb
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
6 years ago
Egor
b9cdf6d3b9
Use `User.get_cached*` everywhere
6 years ago
Alexander Strizhakov
88f0be9693
Feature/826 healthcheck endpoint
6 years ago
Egor Kislitsyn
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 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
6 years ago
Roman Chvanikov
2662bea4e0
Add accounts and last_status to conversation read response
6 years ago
Ivan Tashkinov
9256d2d4b4
[ #923 ] Refactored OAuthController#authorize definitions, added test.
6 years ago
eugenijm
375fd21055
Set correct values in the MastoAPI reblog status view
6 years ago
Roman Chvanikov
724311e151
Fix Credo warnings
6 years ago
Roman Chvanikov
60f213bb1a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
6 years ago
Ekaterina Vaartis
aef3a3ca46
Fix tests that used finmoji
6 years ago