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 |
|
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 |
|
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 |
|
Sergey Suprunenko
|
84cc131b59
|
Add missing HTTP Request mocks
|
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 |
|
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 |
|
lain
|
45f790becc
|
Merge remote-tracking branch 'origin/develop' into conversations_three
|
5 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 |
