Alex Gleason
83ae45b000
Preload `/api/pleroma/frontend_configurations`, fixes #1932
4 years ago
feld
03855f9789
Merge branch 'improve/instance-gen' into 'develop'
...
#2159 Support enabling upload filters during instance gen
See merge request pleroma/pleroma!3070
4 years ago
Mark Felder
8539e386c3
Add missing Copyright headers
4 years ago
Mark Felder
6c61ef14c3
Support enabling upload filters during instance gen
4 years ago
Mark Felder
3ca98878d2
Deep link to the user account in AdminFE in account confirmation emails
4 years ago
Haelwenn
74be4de3f6
Merge branch 'fix/2209-remoteip' into 'develop'
...
#2209 RemoteIP CIDR helper, config and doc improvements
See merge request pleroma/pleroma!3057
4 years ago
feld
d0eca5b125
Apply 2 suggestion(s) to 2 file(s)
4 years ago
Mark Felder
7a2ed2fc90
Credo
4 years ago
Mark Felder
d43d05005a
Move hardcoded default configuration into config.exs
4 years ago
Mark Felder
cddca85c84
Merge branch 'develop' into revert/rich-media-censorship
4 years ago
rinpatch
2698bbc9f6
Merge branch 'filtering-following' into 'develop'
...
ActivityPub: Return Announces when filtering by `following`.
See merge request pleroma/pleroma!3022
4 years ago
Mark Felder
346cc3ac24
Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
4 years ago
Mark Felder
35ee759e74
Add helper function to convert single IPs into CIDR format if they were not provided that way
4 years ago
rinpatch
9e96c9ae48
Merge branch 'fix/empty-params-openapi' into 'develop'
...
OpenAPI CastAndValidate: filter out empty params
Closes #2198
See merge request pleroma/pleroma!3047
4 years ago
Alexander Strizhakov
cbdaabad34
web push http_client fix
4 years ago
rinpatch
2566467782
Merge branch '2201-i-hate-this' into 'develop'
...
User search: Once again, change uri handling.
Closes #2201
See merge request pleroma/pleroma!3048
4 years ago
lain
90fee49c52
User search: Once again, change uri handling.
...
They can indeed be non-unique.
4 years ago
rinpatch
006b62fd12
OpenAPI CastAndValidate: filter out empty params
...
Closes #2198
4 years ago
Mark Felder
b3a9ba09ec
More robust expires_at timestamp processing
4 years ago
lain
2a11068a11
Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'
...
`ffmpeg` / `ImageMagick` handling as optional dependencies
See merge request pleroma/pleroma!3031
4 years ago
Ivan Tashkinov
7d5c3883ac
[ #3031 ] Refactoring: moved system commands checks to ApplicationRequirements.
4 years ago
Mark Felder
ba7f9459b4
Revert Rich Media censorship for sensitive statuses
...
The #NSFW hashtag test was broken anyway.
4 years ago
Maksim Pechnikov
de993b856b
added `force` option to the unfollow operation
4 years ago
Ivan Tashkinov
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).
4 years ago
Mark Felder
dcdf75fbac
Merge branch 'develop' into fix/deprecation-warning-welcome-message
4 years ago
feld
1672d8b37c
Merge branch 'feature/bulk-confirmation' into 'develop'
...
Bulk account confirmation actions
Closes #2085
See merge request pleroma/pleroma!2975
4 years ago
Mark Felder
2bf2c68dee
Merge branch 'develop' into fix/deprecation-warning-welcome-message
4 years ago
Mark Felder
8b84ca4901
Simplify the value comparison
4 years ago
rinpatch
5cd71208d9
Merge branch 'search-even-more' into 'develop'
...
More user search improvements
See merge request pleroma/pleroma!3032
4 years ago
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
4 years ago
lain
05b5241314
Linter fixes
4 years ago
lain
a8c17ea25a
User Search: Also find user by uri
4 years ago
Mark Felder
81faf540b3
Add some user feedback
4 years ago
Mark Felder
e33360fdb9
Cannot use batches with User.try_send_confirmation_email/1
4 years ago
Mark Felder
935ef21b02
Use the import
4 years ago
lain
d0078bc404
User Search: Boost resolved results and exact ap_id matches.
4 years ago
Alexander Strizhakov
5d7ec00bed
fixes after rebase
4 years ago
Alexander Strizhakov
8c6ec4c111
pack routes change
4 years ago
Alexander Strizhakov
dbbc801667
pagination for remote emoji packs
4 years ago
Alexander Strizhakov
9b6d89ff8c
support for special chars in pack name
4 years ago
Mark Felder
8af8eb5ce7
Chase Pleroma.RepoStreamer.chunk_stream -> Pleroma.Repo.chunk_stream
4 years ago
Mark Felder
f3a1f9c3bb
Merge branch 'develop' into feature/bulk-confirmation
4 years ago
lain
e02101e15c
Merge branch 'issue/2115' into 'develop'
...
[#2115 ] added paginate links to headers for /chats/:id/messages
See merge request pleroma/pleroma!2981
4 years ago
lain
4dadb7c433
Merge branch 'user-query/filter-out-internal' into 'develop'
...
Filter out internal users by default
Closes #2147
See merge request pleroma/pleroma!3024
4 years ago
lain
436d1a3c41
Merge branch 'develop' into 'issue/2115'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Haelwenn (lanodan) Monnier
5e86a2809e
transmogrifier: Drop incoming create early if it already exists
4 years ago
lain
a6c14041c4
Merge branch 'develop' into 'issue/1975'
...
# Conflicts:
# CHANGELOG.md
4 years ago
Maksim Pechnikov
72d2b34d3b
Merge branch 'develop' into issue/1975
4 years ago
Alex Gleason
3104367931
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
4 years ago
Mark Felder
e2dcf039d2
Fix gun_pool_options deprecation warning message
4 years ago