Alexander Strizhakov
|
e267991a44
|
renaming LimiterSupervisor
|
2020-10-13 16:42:48 +03:00 |
|
Alexander Strizhakov
|
6a87f94ee2
|
renaming ratelimiter supervisor
|
2020-10-13 16:38:48 +03:00 |
|
Alexander Strizhakov
|
2501793f81
|
moving plugs into web dir
|
2020-10-13 16:38:19 +03:00 |
|
Alexander Strizhakov
|
0374df1d12
|
other files consistency
|
2020-10-13 16:38:19 +03:00 |
|
Alexander Strizhakov
|
fc7151a9c4
|
more files renamings
|
2020-10-13 16:38:19 +03:00 |
|
Alexander Strizhakov
|
e8e4034c48
|
metadata providers consistency
|
2020-10-13 16:38:18 +03:00 |
|
Alexander Strizhakov
|
b5b4395e4a
|
oauth consistency
|
2020-10-13 16:38:18 +03:00 |
|
Alexander Strizhakov
|
103f3dcb9e
|
rich media parser ttl files consistency
|
2020-10-13 16:38:15 +03:00 |
|
Alex Gleason
|
83ae45b000
|
Preload /api/pleroma/frontend_configurations , fixes #1932
|
2020-10-12 18:49:37 -05:00 |
|
Mark Felder
|
8539e386c3
|
Add missing Copyright headers
|
2020-10-12 12:00:50 -05:00 |
|
Mark Felder
|
cddca85c84
|
Merge branch 'develop' into revert/rich-media-censorship
|
2020-10-06 14:25:20 -05:00 |
|
rinpatch
|
2698bbc9f6
|
Merge branch 'filtering-following' into 'develop'
ActivityPub: Return Announces when filtering by `following`.
See merge request pleroma/pleroma!3022
|
2020-10-06 18:11:34 +00:00 |
|
Mark Felder
|
346cc3ac24
|
Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
|
2020-10-05 12:40:53 -05:00 |
|
rinpatch
|
9e96c9ae48
|
Merge branch 'fix/empty-params-openapi' into 'develop'
OpenAPI CastAndValidate: filter out empty params
Closes #2198
See merge request pleroma/pleroma!3047
|
2020-10-03 12:35:49 +00:00 |
|
Alexander Strizhakov
|
cbdaabad34
|
web push http_client fix
|
2020-10-01 13:32:11 +03:00 |
|
rinpatch
|
006b62fd12
|
OpenAPI CastAndValidate: filter out empty params
Closes #2198
|
2020-09-29 21:52:16 +03:00 |
|
Mark Felder
|
ba7f9459b4
|
Revert Rich Media censorship for sensitive statuses
The #NSFW hashtag test was broken anyway.
|
2020-09-28 18:22:59 -05:00 |
|
Maksim Pechnikov
|
de993b856b
|
added force option to the unfollow operation
|
2020-09-28 09:16:42 +03:00 |
|
rinpatch
|
f67c967c4a
|
Merge branch 'features/incoming-create-exists' into 'develop'
transmogrifier: Drop incoming create early if it already exists
See merge request pleroma/pleroma!3026
|
2020-09-25 12:44:33 +00:00 |
|
Alexander Strizhakov
|
5d7ec00bed
|
fixes after rebase
|
2020-09-24 09:42:30 +03:00 |
|
Alexander Strizhakov
|
8c6ec4c111
|
pack routes change
|
2020-09-24 09:16:14 +03:00 |
|
Alexander Strizhakov
|
dbbc801667
|
pagination for remote emoji packs
|
2020-09-24 09:12:39 +03:00 |
|
Alexander Strizhakov
|
9b6d89ff8c
|
support for special chars in pack name
|
2020-09-24 09:12:37 +03:00 |
|
lain
|
436d1a3c41
|
Merge branch 'develop' into 'issue/2115'
# Conflicts:
# CHANGELOG.md
|
2020-09-23 11:49:19 +00:00 |
|
Haelwenn (lanodan) Monnier
|
5e86a2809e
|
transmogrifier: Drop incoming create early if it already exists
|
2020-09-23 13:40:45 +02:00 |
|
lain
|
a6c14041c4
|
Merge branch 'develop' into 'issue/1975'
# Conflicts:
# CHANGELOG.md
|
2020-09-23 09:16:00 +00:00 |
|
Maksim Pechnikov
|
72d2b34d3b
|
Merge branch 'develop' into issue/1975
|
2020-09-22 21:42:10 +03:00 |
|
Alex Gleason
|
3104367931
|
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
|
2020-09-22 13:37:02 -05:00 |
|
lain
|
c95859e45b
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
|
2020-09-22 17:13:46 +02:00 |
|
lain
|
ee3052a2d8
|
ActivityPub: Return Announces when filtering by following .
|
2020-09-22 14:20:19 +02:00 |
|
feld
|
a5c34e3123
|
Merge branch 'fix/fedsocket-useragent' into 'develop'
Minor Fedsocket improvements
See merge request pleroma/pleroma!3012
|
2020-09-21 21:06:32 +00:00 |
|
Alex Gleason
|
23d5d7cf59
|
Fix #2172 HTTP error on password reset
|
2020-09-21 14:09:26 -05:00 |
|
lain
|
59680f27ff
|
Merge branch 'bugfix/federator-actor-error' into 'develop'
federator: normalize only actor, catch actor error
See merge request pleroma/pleroma!2986
|
2020-09-21 17:24:14 +00:00 |
|
lain
|
9108e27c2f
|
Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop'
[#2074] OAuth scope checking in Streaming API
Closes #2074
See merge request pleroma/pleroma!3013
|
2020-09-21 17:15:54 +00:00 |
|
lain
|
b36b6259d8
|
Merge branch 'issue/2099' into 'develop'
[#2099] Import/export mutes [BE]
See merge request pleroma/pleroma!2965
|
2020-09-21 16:25:17 +00:00 |
|
Mark Felder
|
8afdbcdb1c
|
Force HTTP for fedsockets
|
2020-09-21 10:13:41 -05:00 |
|
lain
|
f2f0a0260f
|
ActivityPub: Don't block-filter your own posts
We are filtering out replies to people you block, but that should
not include your own posts.
|
2020-09-21 16:08:38 +02:00 |
|
Ivan Tashkinov
|
60b025b782
|
[#2074] OAuth scope checking in Streaming API.
|
2020-09-19 19:16:55 +03:00 |
|
rinpatch
|
4b12e071ac
|
OpenAPI: make it possible to generate a spec without starting the app
Needed for api docs generation on pleroma.social that will come later
|
2020-09-19 16:26:15 +03:00 |
|
rinpatch
|
51116b5392
|
OpenAPI: fix various errors pointed out by editor.swagger.io
|
2020-09-19 16:26:15 +03:00 |
|
Mark Felder
|
26859c549c
|
Add user agent to fedsocket requests
|
2020-09-19 07:26:46 -05:00 |
|
Maksim Pechnikov
|
ed3bc53fa1
|
Merge branch 'develop' into issue/2099
|
2020-09-18 22:13:05 +03:00 |
|
feld
|
6c052bd5b6
|
Merge branch 'media-preview-proxy-nostream' into 'develop'
Media preview proxy
See merge request pleroma/pleroma!3001
|
2020-09-18 18:38:20 +00:00 |
|
rinpatch
|
26c571df33
|
FedSockets: fix log spam on cached rejects
|
2020-09-18 16:09:37 +03:00 |
|
Steven Fuchs
|
f2ef9735c5
|
Federate data through persistent websocket connections
|
2020-09-18 11:58:22 +00:00 |
|
Maksim Pechnikov
|
2ec0dcf001
|
Merge branch 'develop' into issue/2099
|
2020-09-18 07:08:37 +03:00 |
|
Ivan Tashkinov
|
a428800405
|
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
# Conflicts:
# CHANGELOG.md
|
2020-09-17 22:22:59 +03:00 |
|
Haelwenn (lanodan) Monnier
|
7bf269fe83
|
Fix MRF reject for ChatMessage
|
2020-09-17 22:07:54 +03:00 |
|
Haelwenn (lanodan) Monnier
|
abf25e5d52
|
Create MRF.filter_pipeline to inject :object_data when present
|
2020-09-17 22:07:54 +03:00 |
|
Haelwenn (lanodan) Monnier
|
3a0f99ed35
|
KeywordPolicy: Still match when fields are absent
|
2020-09-17 22:07:54 +03:00 |
|