1fb9452131
Merge branch 'develop' into feature/account-export
2020-10-14 15:27:15 -05:00
4c4ea9a348
changes after rebase
2020-10-13 17:10:34 +03:00
5f2071c458
changes after rebase
2020-10-13 16:44:03 +03:00
b081080dd9
fixes after rebase
2020-10-13 16:44:02 +03:00
f679486540
rebase
2020-10-13 16:44:02 +03:00
c4c5caedd8
changes after rebase
2020-10-13 16:44:02 +03:00
b720ad2264
files consistency after rebase
2020-10-13 16:44:01 +03:00
c5efded5fd
files consistency for new files
2020-10-13 16:44:00 +03:00
207211a2b3
update files consistency after rebase
2020-10-13 16:44:00 +03:00
e33782455d
updates after rebase
2020-10-13 16:43:59 +03:00
7dffaef479
tests consistency
2020-10-13 16:35:09 +03:00
83ae45b000
Preload `/api/pleroma/frontend_configurations`, fixes #1932
2020-10-12 18:49:37 -05:00
8539e386c3
Add missing Copyright headers
2020-10-12 12:00:50 -05:00
bc3db72403
Use ModerationLog instead of Logger
2020-10-07 18:35:29 +04:00
f1e4333dd7
Fix test
2020-10-07 18:35:28 +04:00
e4792ce76a
Do not limit admins
2020-10-07 18:35:27 +04:00
17562bf414
Move API endpoints to `/api/v1/pleroma/backups`
2020-10-07 18:35:27 +04:00
7c22c9afb4
Allow admins request user backups
2020-10-07 18:34:31 +04:00
86ce4afd93
Improve backup urls
2020-10-07 18:34:29 +04:00
2c73bfe122
Add API endpoints for Backups
2020-10-07 18:34:29 +04:00
cddca85c84
Merge branch 'develop' into revert/rich-media-censorship
2020-10-06 14:25:20 -05:00
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
346cc3ac24
Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
2020-10-05 12:40:53 -05:00
cbdaabad34
web push http_client fix
2020-10-01 13:32:11 +03:00
2a11068a11
Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'
...
`ffmpeg` / `ImageMagick` handling as optional dependencies
See merge request pleroma/pleroma!3031
2020-09-29 14:48:30 +00:00
ba7f9459b4
Revert Rich Media censorship for sensitive statuses
...
The #NSFW hashtag test was broken anyway.
2020-09-28 18:22:59 -05:00
de993b856b
added `force` option to the unfollow operation
2020-09-28 09:16:42 +03:00
4e4f771082
Adjusted MediaProxyControllerTest to gracefully fail on missing dependencies. Installation docs update.
...
Added ffmpeg/imagemagick checks to launch checks (if media preview proxy is enabled). Added documentation on installing optional media / graphics packages (imagemagick, ffmpeg, exiftool).
2020-09-26 19:32:16 +03:00
93b674b66d
Fix test failures for NoOpPolicy describe/0
2020-09-25 12:46:49 -05:00
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
47cd59342f
Merge branch 'smol-test' into 'develop'
...
CommonAPI test: Add test for polls
See merge request pleroma/pleroma!3028
2020-09-24 09:41:28 +00:00
35d62a4a56
CommonAPI test: Add test for polls
2020-09-24 11:12:03 +02:00
5d7ec00bed
fixes after rebase
2020-09-24 09:42:30 +03:00
8c6ec4c111
pack routes change
2020-09-24 09:16:14 +03:00
dbbc801667
pagination for remote emoji packs
2020-09-24 09:12:39 +03:00
9b6d89ff8c
support for special chars in pack name
2020-09-24 09:12:37 +03:00
436d1a3c41
Merge branch 'develop' into 'issue/2115'
...
# Conflicts:
# CHANGELOG.md
2020-09-23 11:49:19 +00:00
5e86a2809e
transmogrifier: Drop incoming create early if it already exists
2020-09-23 13:40:45 +02:00
a6c14041c4
Merge branch 'develop' into 'issue/1975'
...
# Conflicts:
# CHANGELOG.md
2020-09-23 09:16:00 +00:00
8e4f043ac7
finland-emojis.zip -> emojis.zip
2020-09-22 21:58:30 +03:00
72d2b34d3b
Merge branch 'develop' into issue/1975
2020-09-22 21:42:10 +03:00
3104367931
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
2020-09-22 13:37:02 -05:00
c95859e45b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
2020-09-22 17:13:46 +02:00
ee3052a2d8
ActivityPub: Return Announces when filtering by `following`.
2020-09-22 14:20:19 +02:00
bf181ca968
Fix MastoAPI.AuthControllerTest, json_response(:no_content) --> empty_json_response()
2020-09-21 16:03:22 -05:00
0b728ccc44
Pass hackney tls config into email tests, #2101
2020-09-21 15:26:10 -05:00
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
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
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
60b025b782
[ #2074 ] OAuth scope checking in Streaming API.
2020-09-19 19:16:55 +03:00
Mark Felder