Alex Gleason
cc196e2cd5
Merge remote-tracking branch 'upstream/develop' into restrict-domain
4 years ago
Alex Gleason
ad9c925efb
Speed up instance timeline query
4 years ago
lain
7755f49e28
Merge branch 'migrate-legacy-tags' into 'develop'
...
Migrate legacy tags set by AdminFE to match TagPolicy, #2010
See merge request pleroma/pleroma!2836
4 years ago
Roman Chvanikov
8c57a299b4
Handle non-list keys in Config.fetch/1
4 years ago
Roman Chvanikov
2299bfe4c1
Merge branch 'develop' into refactor/config-get
4 years ago
Roman Chvanikov
97b5701449
Update clear_config macro
4 years ago
Roman Chvanikov
6f60ac9f41
Refactor config
4 years ago
lain
474aba984f
Merge branch 'unique-app-id' into 'develop'
...
Add unique index for apps.client_id, fixes #2022
Closes #2022
See merge request pleroma/pleroma!2844
4 years ago
rinpatch
b1b6a7dfa8
Merge branch 'deactivated-user-posts' into 'develop'
...
Deactivated user posts
Closes #2011
See merge request pleroma/pleroma!2845
4 years ago
Alex Gleason
184742af5e
Unique apps.client_id for new installations, fixes #2022
4 years ago
Egor Kislitsyn
91fbb5b21f
Fix ActivityExpirationPolicy
4 years ago
lain
36aa34a1a8
MastodonAPITest: Do the needful
4 years ago
lain
1a00713744
CommonValidations: Treat deactivated users as not present.
4 years ago
lain
0cfadcf2ca
TransmogrifierTest: Add test for deactivated users
4 years ago
lain
e92c040ad3
CommonAPITest: Add test that deactivated users can't post.
4 years ago
lain
953f71bcfa
App Test: Make more resilient
4 years ago
Roman Chvanikov
56e9bf3393
Unify Config.get behaviour for atom/list key param
4 years ago
lain
28584bb224
Merge branch 'email-blacklist' into 'develop'
...
Add email blacklist, fixes #1404
Closes #1404
See merge request pleroma/pleroma!2837
4 years ago
Alex Gleason
4f57e85ab9
Email blacklist: Update phrasing again
4 years ago
Alex Gleason
058daf498f
Email blacklist: Update response phrasing
4 years ago
lain
e3953923ac
Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop'
...
fixes 1957 Add option to send user chatmessage instead of dm
Closes #1957
See merge request pleroma/pleroma!2782
4 years ago
Ilja
cbf8bfc694
Improved WelcomeChatMessageTest
...
* Checks if message is the same using ==/2 instead of =~/2
4 years ago
lain
56b5b9aa27
Merge branch 'follower-mrf-again' into 'develop'
...
Follower mrf again
See merge request pleroma/pleroma!2833
4 years ago
lain
de3bdc63ad
AccountControllerTest: Add test for message returned.
4 years ago
lain
5876d5123c
Merge branch 'object-age-fix' into 'develop'
...
MRF Object Age Policy: Don't break on messages without cc/to
See merge request pleroma/pleroma!2840
4 years ago
lain
10c792110e
MRF Object Age Policy: Don't break on messages without cc/to
4 years ago
Alex Gleason
f9301044ed
Add ReportNote test
4 years ago
Alex Gleason
77b48cb4ce
Factory: Add report_activity_factory
4 years ago
Alex Gleason
dc88b6f091
Add email blacklist, fixes #1404
4 years ago
Alex Gleason
c2c3dd4613
Migrate legacy tags set by AdminFE to match TagPolicy, #2010
4 years ago
Ilja
f671d7e68c
Add welcome chatmessages
...
* I added the option in config/config.exs
* created a new module lib/pleroma/user/welcome_chat_message.ex
* Added it to the registration flow
* added to the cheatsheet
* added to the config/description.ex
* added to the Changelog.md
4 years ago
lain
4b18a07392
Revert "Merge branch 'revert-1ac0969c' into 'develop'"
...
This reverts merge request !2825
4 years ago
lain
010d77ec85
Revert "Merge branch 'mrf-silence-2' into 'develop'"
...
This reverts merge request !2820
4 years ago
lain
1ac0969c72
Merge branch 'mrf-silence-2' into 'develop'
...
MRF silencing alternative solution
See merge request pleroma/pleroma!2820
4 years ago
Ivan Tashkinov
27b0a8b155
[ #1985 ] Prevented force login on registration if account approval and/or email confirmation needed.
...
Refactored login code in OAuthController, reused in AccountController. Added tests.
4 years ago
lain
1dd162a5f7
SimplePolicy: Fix problem with DM leaks.
4 years ago
Haelwenn
d1cf1108ac
Merge branch 'render-preview-cards-in-chats' into 'develop'
...
Render preview cards in chats
See merge request pleroma/pleroma!2816
4 years ago
Haelwenn
87fe31fb5c
Merge branch '1993-confirm-users-on-registration' into 'develop'
...
AccountController: Don't explicitly ask to keep users unconfirmed.
Closes #1993
See merge request pleroma/pleroma!2809
4 years ago
lain
781b270863
ChatMessageReferenceView: Display preview cards.
4 years ago
lain
873ff5ce14
Merge branch 'hide-reactions' into 'develop'
...
Let favourites and emoji reactions optionally be hidden
See merge request pleroma/pleroma!2804
4 years ago
lain
e2e66e50d3
SimplePolicyTest: Add test for leaking DMs.
4 years ago
lain
d39b72c8fa
Merge branch 'feature/captcha-expose-timeout' into 'develop'
...
Expose seconds_valid in Pleroma Captcha API endpoint
Closes #1954
See merge request pleroma/pleroma!2812
4 years ago
Maksim Pechnikov
cff7bb5cd4
Merge branch 'develop' into issue/1933-update-dependency
4 years ago
Mark Felder
33f0427809
Expose seconds_valid in Pleroma Captcha API endpoint
4 years ago
Alex Gleason
702f0fb822
Merge remote-tracking branch 'upstream/develop' into mrf-silence
4 years ago
Alex Gleason
93638935d7
SimpleMRF: :silence --> :followers_only
4 years ago
Alex Gleason
00d090004e
:show_reactions, refactor the other test
4 years ago
Alex Gleason
026a51cb27
:show_reactions, add CHANGELOG.md, refactor test
4 years ago
Alex Gleason
d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions
4 years ago
lain
a6d3bb5f30
Merge branch 'issue/1023' into 'develop'
...
[#1023 ] added generated `pleroma.env`
See merge request pleroma/pleroma!2763
4 years ago