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
lain
9688e332d0
Merge branch 'refactor/config-get' into 'develop'
...
Refactor Pleroma.Config.get to return consistent results for nil values
Closes #2001
See merge request pleroma/pleroma!2853
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
lain
e8d10237da
Merge branch 'fix/incorrect-expirations' into 'develop'
...
Add a migration to clean up activity_expirations table
See merge request pleroma/pleroma!2848
4 years ago
lain
bd157b7369
Merge branch 'fix-link-color' into 'develop'
...
templates/layout/app.html.eex: fix link color
See merge request pleroma/pleroma!2850
4 years ago
Karol Kosek
577b11167c
templates/layout/app.html.eex: fix link color
4 years ago
Mark Felder
079e410d6e
Add a migration to clean up activity_expirations table
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
rinpatch
fede37e4c6
Merge branch 'chore/consolidate-rich-media-http' into 'develop'
...
Consolidate construction of Rich Media Parser HTTP requests
See merge request pleroma/pleroma!2827
4 years ago
Alex Gleason
184742af5e
Unique apps.client_id for new installations, fixes #2022
4 years ago
lain
917aa090f0
Merge branch 'fix/activity-expiration-policy' into 'develop'
...
Fix ActivityExpirationPolicy
Closes #2019
See merge request pleroma/pleroma!2847
4 years ago
Egor Kislitsyn
91fbb5b21f
Fix ActivityExpirationPolicy
4 years ago
lain
b55e26e816
Merge branch 'chore/credo-alias' into 'develop'
...
Add a simple credo mix alias to run the same checks we use in CI
See merge request pleroma/pleroma!2846
4 years ago
Mark Felder
697e3db01c
Add analyze mix alias to run the same credo checks we use in CI
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
988ca4ab6a
Test Config: Don't have any MRFs by default
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
lain
2f4289d455
Changelog: Add info about email blacklist
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
Mark Felder
016d8d6c56
Consolidate construction of Rich Media Parser HTTP requests
4 years ago
Ilja
13e5540c2c
Apply 1 suggestion(s) to 1 file(s)
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
66ebd88634
Merge branch 'config/default_ok_oldage' into 'develop'
...
config: :mrf, :policies default to ObjectAgePolicy
Closes #2000
See merge request pleroma/pleroma!2814
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
lain
e45e07d2b5
Merge branch 'indigenous-client' into 'develop'
...
Add indigenous to clients
See merge request pleroma/pleroma!2835
4 years ago
lain
8fcbfd961d
Merge branch 'reportnote-test' into 'develop'
...
ReportNote test
Closes #2014
See merge request pleroma/pleroma!2839
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
swentel
0012894d4e
Add indigenous to clients
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
Alex Gleason
cb1e3893aa
SimpleMRF: Add missing :followers_only to config.exs
4 years ago
lain
70951d042b
Merge branch '1985-unobtrusive-autologin-on-registration' into 'develop'
...
[#1985 ] Prevented force login on registration if account approval and/or email confirmation needed
Closes #1985
See merge request pleroma/pleroma!2823
4 years ago