45f790becc
Merge remote-tracking branch 'origin/develop' into conversations_three
5 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
e8537208bd
Add a captcha mock for tests
6 years ago
lain