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
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
Egor Kislitsyn