4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
5 years ago
243719a965
Merge branch 'develop' into feature/masto_api_markers
5 years ago
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
5 years ago
ef659331b0
implement invisible support for remote users
5 years ago
dbfdb1f6e3
add some missing tesla fixtures
5 years ago
4f82e42e4e
websub: remove entirely
5 years ago
66b5d0ff55
add Markers /api/v1/markers
5 years ago
059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
5 years ago
dc6d20b68d
provide mocks for webfinger endpoints
5 years ago
06b3bb54c5
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
5 years ago
b1ff66dc5f
Add test for handling Announces with inlined object from different origin
5 years ago
977e711e22
Import object from self-Announce whenever possible
5 years ago
64095961fe
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
5 years ago
c3d09921e4
test: factory: implement support for generating mock audio and listen objects
5 years ago
6f67aed3ac
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/admin_api/admin_api_controller.ex
5 years ago
b0ec82d24a
Merge branch 'chores/bump-copyright-year' into 'develop'
...
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
5 years ago
447514dfa2
Bump copyright years of files changed in 2019
...
Done via the following command:
git diff 1e6c102bfc
5 years ago
7ef575d11e
Initial poll refresh support
...
Implement refreshing the object with an interval and call the function
when getting the poll.
5 years ago
01c1078015
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
5 years ago
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
5 years ago
aab264db82
Streamer refactoring
5 years ago
e6f43a831b
[ #1234 ] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
5 years ago
ca1ba1e272
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
5 years ago
b312ca3d52
Mastodon API Poll view: Fix handling of polls without an end date
5 years ago
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
5 years ago
d9d7765383
Merge branch 'fix-osada-follow' into 'develop'
...
Transmogrifier: Fix follow handling when the actor is an object.
Closes #1211
See merge request pleroma/pleroma!1604
5 years ago
00abe099cd
added tests for ActivityPub.like\unlike
5 years ago
3da65292b3
Transmogrifier: Fix follow handling when the actor is an object.
5 years ago
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
20c3f613d8
HttpRequestMock: Remove useless `error = error`
5 years ago
211e163770
Implement missing mocks for rel=me
5 years ago
e22737ffb5
HttpRequestMock: Improve non-implemented error message
5 years ago
18668447d2
HttpRequestMock: Log mock errors as warnings
5 years ago
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
c29686309e
[ #1149 ] Upgraded `oban` from 0.6.0 to 0.7.1.
5 years ago
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
a320358703
added test helpers to clear config after tests
5 years ago
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
4244e17de0
fix credo
5 years ago
dd0b71ea6d
tests: add tests for MRF.describe()
5 years ago
7089400675
test: add mock MRF module for describe() testing
5 years ago
0e1c481a94
[ #1149 ] Added more oban workers. Refactoring.
5 years ago
33a5fc4a70
[ #1149 ] Fixed failing tests. Ensured Instance.set_unreachable/2 supports ISO 8601 datetime.
5 years ago
267262491e
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
b7fad8d395
[ #1149 ] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.
5 years ago
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
5 years ago
e8ad116c2a
Do not add the "next" key to likes.json if there is no more items
5 years ago
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
5 years ago
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
301ea0dc04
Add tests for counters being updated on follow
5 years ago
58443d0cd6
tests for TwitterApi/UtilController
5 years ago
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
b20020da16
Show the url advertised in the Activity in the Status JSON response
5 years ago
8d9f43e1d1
Add WebFinger test for AP-only account
5 years ago
55341ac717
tests WebFinger
5 years ago
d2da3d30f3
Merge branch 'develop' into feature/digest-email
5 years ago
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
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
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
f46805bb40
Merge branch 'develop' into feature/admin-api-user-statuses
5 years ago
c49a09ed88
tests for Pleroma.Web.ActivityPub.Publisher
5 years ago
14ab2fd0f4
remove pry
5 years ago
36049f08ef
Merge develop
5 years ago
9570a5be40
Merge branch 'develop' into feature/admin-api-user-statuses
5 years ago
b6b748d3e7
tests for Uploader with webhook
5 years ago
c729883936
Merge branch 'develop' into feature/digest-email
5 years ago
f00562ed6b
HttpRequestMock: Add 404s on OStatus fetching for info.pleroma.site
5 years ago
efa9a13d4e
HttpRequestMock: Add missing mocks for object containment tests
5 years ago
a9459ff98f
Admin API: Endpoint for fetching latest user's statuses
5 years ago
eae991b06a
merge develop
5 years ago
e4e3fd7e55
Merge branch 'fix/1019-refactor' into 'develop'
...
Fix/1019 refactor
See merge request pleroma/pleroma!1397
5 years ago
a237c6a2d4
support for idna domains
5 years ago
beba7bbc85
removing synchronization worker
5 years ago
ff55e3c16f
Create mentions only for explicitly mentioned users
5 years ago
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
371d39e160
Merge develop
5 years ago
d6b0fce6e9
Fix/1019 correct count remote users
5 years ago
4948117fcf
Merge branch 'remove-swift' into 'develop'
...
Remove Uploaders.Swift and `httpoison` dependency
Closes #1051
See merge request pleroma/pleroma!1374
5 years ago
46cf81a544
[ #878 ] Formatting fix.
5 years ago
daff85a985
[ #878 ] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.
5 years ago
6dadf5d6f4
[ #1043 ] fix search accounts.
5 years ago
11143c542a
Remove `httpoison` from dependencies
5 years ago
657277ffc0
Resolve conflicts
5 years ago
4ad15ad2a9
add ignore hosts and TLDs for rich_media
5 years ago
982cad0268
support for config groups
5 years ago
0f59265a50
salmon fix
...
removed some ownership sandbox error
5 years ago
c2ca1f22a2
it is changed in compile time
...
we can't change module attributes and endpoint settings in runtime
5 years ago
b1b1a270e8
Fix conflict
5 years ago
84cc131b59
Add missing HTTP Request mocks
5 years ago
6ef145b4fc
Merge branch 'develop' into feature/digest-email
5 years ago
65db5e9f52
Resolve merge conflicts
5 years ago
1690be991e
Replace missing non-nullable Card attributes with empty strings
5 years ago
ce47017c89
Merge develop
5 years ago
56fd7dbdd7
remove @websub and @ostatus module-level constants
5 years ago
5ece901af3
Resolve merge conflicts and remove IO.inspects
5 years ago
7ed682213f
Fix/902 random compile failing
5 years ago
e2b3a27204
Add Reports to Admin API
5 years ago
62e42b03ab
Handle incoming Question objects
5 years ago
b6b5b16ba4
Merge develop
5 years ago
45f790becc
Merge remote-tracking branch 'origin/develop' into conversations_three
5 years ago
bc7862106d
Fix tests
6 years ago
64c1c3a407
Participations: Add marking as read and unread.
6 years ago
d1da6b155a
Conversation: Add Conversations and Participations.
6 years ago
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
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
6 years ago
fc92a0fd8d
Added limits and media attachments for scheduled activities.
6 years ago
7bf622ce73
Add scheduled activities
6 years ago
be54e40890
twitter api registration
...
fix for twitter api tests
6 years ago
325a268017
Redirect to the referer url after mastofe authorization
6 years ago
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
f7cd9131d4
[ #923 ] OAuth consumer controller tests. Misc. improvements.
6 years ago
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
15ce710460
Added "GET /oauth/authorize" tests.
6 years ago
6386c1c9c1
fetch url for OStatus to know if it is a/c or status
6 years ago
1d01e8e656
[OStatus] adds status to pleroma instance if the url given is a status
6 years ago
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
6 years ago
fb82f6fc7c
[Credo] Remove parentesis on argument-less functions
6 years ago
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
6 years ago
bc7570c282
[ #647 ] tests for web push
6 years ago
cc7b35e097
Add status text to notifications (mentions and reposts)
6 years ago
b574d97c2e
[ #468 ] Added support for `push` OAuth scope (Mastodon 2.4+).
6 years ago
c0ecbf6669
[ #468 ] Merged `upstream/develop`.
6 years ago
833161b5d2
Merge branch 'feature/jobs' into 'develop'
...
Job Queue
See merge request pleroma/pleroma!732
6 years ago
7456338ed3
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
...
Add OAuth tokens endpoint
See merge request pleroma/pleroma!805
6 years ago
bc4f77b10b
[ #468 ] Merged `upstream/develop`, resolved conflicts.
6 years ago
dcf24a3233
[ #468 ] Refactored OAuth scopes' defaults & missing selection handling.
6 years ago
063baca5e4
[ #468 ] User UI for OAuth permissions restriction. Standardized storage format for `scopes` fields, updated usages.
6 years ago
61a4bc5095
Add OAuth tokens endpoint
6 years ago
8bb7e19b38
test: de-group alias/es
6 years ago
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
e61f0be951
Unbreak all the tests.
6 years ago
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
106475f265
test: http mocks: formatting
6 years ago
4e76f9fde1
test: add malformed OGP data fixture
6 years ago
d3677d2b4d
Merge remote-tracking branch 'MAIN/develop' into feature/jobs
6 years ago
55affbca7f
add a job queue
6 years ago
d3f9e6f6fe
[ #534 ] Merged `upstream/develop`.
6 years ago
1d2f41642c
[ #534 ] Various tweaks. Tests for Instances and Instance.
6 years ago
d9f3af477d
Move definitions of RichMedia fixtures to test/support/http_request_mock.ex
6 years ago
d99650270b
[ #534 ] Federation reachability filtering tests.
6 years ago
1eb7318831
Prepare all types objects before serialising
...
Activities returned from inbox can include other types of objects like
Article
6 years ago
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
b73a1a33de
Merge branch 'captcha' into 'develop'
...
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
6 years ago
3c08d229db
tests: add legal boilerplate
6 years ago
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
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
6 years ago
b12a904911
Integration tests for mastodon websocket
6 years ago
ef6829382a
Clean captchas up periodically, not schedule it after theyre created
6 years ago
73576ab64e
Fix captcha tests
6 years ago
Egor Kislitsyn