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
rinpatch
301ea0dc04
Add tests for counters being updated on follow
5 years ago
Maksim
58443d0cd6
tests for TwitterApi/UtilController
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
Maksim
55341ac717
tests WebFinger
5 years ago
Roman Chvanikov
d2da3d30f3
Merge branch 'develop' into feature/digest-email
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
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
Maxim Filippov
f46805bb40
Merge branch 'develop' into feature/admin-api-user-statuses
5 years ago
Maksim
c49a09ed88
tests for Pleroma.Web.ActivityPub.Publisher
5 years ago
Maxim Filippov
14ab2fd0f4
remove pry
5 years ago
Roman Chvanikov
36049f08ef
Merge develop
5 years ago
Maxim Filippov
9570a5be40
Merge branch 'develop' into feature/admin-api-user-statuses
5 years ago
Maksim
b6b748d3e7
tests for Uploader with webhook
5 years ago
Roman Chvanikov
c729883936
Merge branch 'develop' into feature/digest-email
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
Maxim Filippov
a9459ff98f
Admin API: Endpoint for fetching latest user's statuses
5 years ago
Roman Chvanikov
eae991b06a
merge develop
5 years ago
kaniini
e4e3fd7e55
Merge branch 'fix/1019-refactor' into 'develop'
...
Fix/1019 refactor
See merge request pleroma/pleroma!1397
5 years ago
Alexander Strizhakov
a237c6a2d4
support for idna domains
5 years ago
Alex S
beba7bbc85
removing synchronization worker
5 years ago
Sergey Suprunenko
ff55e3c16f
Create mentions only for explicitly mentioned users
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
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
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
Maksim
6dadf5d6f4
[ #1043 ] fix search accounts.
5 years ago
Egor Kislitsyn
11143c542a
Remove `httpoison` from dependencies
5 years ago
Roman Chvanikov
657277ffc0
Resolve conflicts
5 years ago
Maksim Pechnikov
4ad15ad2a9
add ignore hosts and TLDs for rich_media
5 years ago
Alex S
982cad0268
support for config groups
5 years ago
Alex S
0f59265a50
salmon fix
...
removed some ownership sandbox error
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
Roman Chvanikov
b1b1a270e8
Fix conflict
5 years ago
Sergey Suprunenko
84cc131b59
Add missing HTTP Request mocks
5 years ago
Mark Felder
6ef145b4fc
Merge branch 'develop' into feature/digest-email
5 years ago
rinpatch
65db5e9f52
Resolve merge conflicts
5 years ago
Sergey Suprunenko
1690be991e
Replace missing non-nullable Card attributes with empty strings
5 years ago
Roman Chvanikov
ce47017c89
Merge develop
5 years ago
William Pitcock
56fd7dbdd7
remove @websub and @ostatus module-level constants
5 years ago
rinpatch
5ece901af3
Resolve merge conflicts and remove IO.inspects
5 years ago
Alexander Strizhakov
7ed682213f
Fix/902 random compile failing
5 years ago
Sergey Suprunenko
e2b3a27204
Add Reports to Admin API
5 years ago
rinpatch
62e42b03ab
Handle incoming Question objects
5 years ago
Roman Chvanikov
b6b5b16ba4
Merge develop
5 years ago
lain
45f790becc
Merge remote-tracking branch 'origin/develop' into conversations_three
5 years ago
Roman Chvanikov
bc7862106d
Fix tests
6 years ago
lain
64c1c3a407
Participations: Add marking as read and unread.
6 years ago
lain
d1da6b155a
Conversation: Add Conversations and Participations.
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
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
eugenijm
fc92a0fd8d
Added limits and media attachments for scheduled activities.
6 years ago
eugenijm
7bf622ce73
Add scheduled activities
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
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
lambda
180b87257c
Merge branch 'bugfix/share-mastodon' into 'develop'
...
[OStatus] adds status to pleroma instance if the url given is a status
See merge request pleroma/pleroma!1002
6 years ago
Ivan Tashkinov
15ce710460
Added "GET /oauth/authorize" tests.
6 years ago
Sachin Joshi
6386c1c9c1
fetch url for OStatus to know if it is a/c or status
6 years ago
Sachin Joshi
1d01e8e656
[OStatus] adds status to pleroma instance if the url given is a status
6 years ago
Egor
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
6 years ago
Haelwenn (lanodan) Monnier
fb82f6fc7c
[Credo] Remove parentesis on argument-less functions
6 years ago
Haelwenn (lanodan) Monnier
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
6 years ago
Maksim
bc7570c282
[ #647 ] tests for web push
6 years ago
Maxim Filippov
cc7b35e097
Add status text to notifications (mentions and reposts)
6 years ago
Ivan Tashkinov
b574d97c2e
[ #468 ] Added support for `push` OAuth scope (Mastodon 2.4+).
6 years ago
Ivan Tashkinov
c0ecbf6669
[ #468 ] Merged `upstream/develop`.
6 years ago
kaniini
833161b5d2
Merge branch 'feature/jobs' into 'develop'
...
Job Queue
See merge request pleroma/pleroma!732
6 years ago
kaniini
7456338ed3
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
...
Add OAuth tokens endpoint
See merge request pleroma/pleroma!805
6 years ago
Ivan Tashkinov
bc4f77b10b
[ #468 ] Merged `upstream/develop`, resolved conflicts.
6 years ago
Ivan Tashkinov
dcf24a3233
[ #468 ] Refactored OAuth scopes' defaults & missing selection handling.
6 years ago
Ivan Tashkinov
063baca5e4
[ #468 ] User UI for OAuth permissions restriction. Standardized storage format for `scopes` fields, updated usages.
6 years ago
Maxim Filippov
61a4bc5095
Add OAuth tokens endpoint
6 years ago
Haelwenn (lanodan) Monnier
8bb7e19b38
test: de-group alias/es
6 years ago
Egor Kislitsyn
3a3a3996b7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/federator/federator.ex
6 years ago
lain
e61f0be951
Unbreak all the tests.
6 years ago
href
b3b0855456
Merge branch '534_federation_targets_reachability' into 'develop'
...
[#534 ] Unreachable federation targets retirement
Closes #534
See merge request pleroma/pleroma!703
6 years ago
William Pitcock
106475f265
test: http mocks: formatting
6 years ago
William Pitcock
4e76f9fde1
test: add malformed OGP data fixture
6 years ago
Egor Kislitsyn
d3677d2b4d
Merge remote-tracking branch 'MAIN/develop' into feature/jobs
6 years ago
Egor Kislitsyn
55affbca7f
add a job queue
6 years ago
Ivan Tashkinov
d3f9e6f6fe
[ #534 ] Merged `upstream/develop`.
6 years ago
Ivan Tashkinov
1d2f41642c
[ #534 ] Various tweaks. Tests for Instances and Instance.
6 years ago
Haelwenn (lanodan) Monnier
d9f3af477d
Move definitions of RichMedia fixtures to test/support/http_request_mock.ex
6 years ago
Ivan Tashkinov
d99650270b
[ #534 ] Federation reachability filtering tests.
6 years ago
sxsdv1
1eb7318831
Prepare all types objects before serialising
...
Activities returned from inbox can include other types of objects like
Article
6 years ago
sxsdv1
2d7da5f437
Don't crash on AP request for tombstone
...
Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api
6 years ago
rinpatch
b73a1a33de
Merge branch 'captcha' into 'develop'
...
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
6 years ago
William Pitcock
3c08d229db
tests: add legal boilerplate
6 years ago
Ekaterina Vaartis
336e37d98f
Make captcha (kocaptcha) stateless
...
Also rename seconds_retained to seconds_valid since that's how it is
now. Put it down from 180 to 20 seconds. The answer data is now
stored in an encrypted text transfered to the client and back, so no
ETS is needed
6 years ago
lambda
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
6 years ago
href
b12a904911
Integration tests for mastodon websocket
6 years ago
Ekaterina Vaartis
ef6829382a
Clean captchas up periodically, not schedule it after theyre created
6 years ago