aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-05Questions: Move fixes to validators.lain
2020-08-05Apply 1 suggestion(s) to 1 file(s)lain
2020-08-05Apply 1 suggestion(s) to 1 file(s)lain
2020-08-05CommonValidations: Remove superfluous functionlain
The `is_active` functionality was integrated into the presence checker.
2020-08-05Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/poll-validation
2020-08-05Merge branch 'unique-app-id' into 'develop'lain
Add unique index for apps.client_id, fixes #2022 Closes #2022 See merge request pleroma/pleroma!2844
2020-08-05Merge branch 'fix/incorrect-expirations' into 'develop'lain
Add a migration to clean up activity_expirations table See merge request pleroma/pleroma!2848
2020-08-05Merge branch 'fix-link-color' into 'develop'lain
templates/layout/app.html.eex: fix link color See merge request pleroma/pleroma!2850
2020-08-05templates/layout/app.html.eex: fix link colorKarol Kosek
2020-08-04Add a migration to clean up activity_expirations tableMark Felder
2020-08-04Merge branch 'deactivated-user-posts' into 'develop'rinpatch
Deactivated user posts Closes #2011 See merge request pleroma/pleroma!2845
2020-08-04Merge branch 'chore/consolidate-rich-media-http' into 'develop'rinpatch
Consolidate construction of Rich Media Parser HTTP requests See merge request pleroma/pleroma!2827
2020-08-04Unique apps.client_id for new installations, fixes #2022Alex Gleason
2020-08-04Merge branch 'fix/activity-expiration-policy' into 'develop'lain
Fix ActivityExpirationPolicy Closes #2019 See merge request pleroma/pleroma!2847
2020-08-04Fix ActivityExpirationPolicyEgor Kislitsyn
2020-08-04Merge branch 'chore/credo-alias' into 'develop'lain
Add a simple credo mix alias to run the same checks we use in CI See merge request pleroma/pleroma!2846
2020-08-04Add analyze mix alias to run the same credo checks we use in CIMark Felder
2020-08-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/poll-validation
2020-08-04MastodonAPITest: Do the needfullain
2020-08-04question_validator: Allow content to be an empty-string (blank)Haelwenn (lanodan) Monnier
2020-08-04CommonValidations: Treat deactivated users as not present.lain
2020-08-04TransmogrifierTest: Add test for deactivated userslain
2020-08-04CommonAPITest: Add test that deactivated users can't post.lain
2020-08-04Test Config: Don't have any MRFs by defaultlain
2020-08-04App Test: Make more resilientlain
2020-08-04Merge branch 'email-blacklist' into 'develop'lain
Add email blacklist, fixes #1404 Closes #1404 See merge request pleroma/pleroma!2837
2020-08-04Changelog: Add info about email blacklistlain
2020-08-03Email blacklist: Update phrasing againAlex Gleason
2020-08-03Email blacklist: Update response phrasingAlex Gleason
2020-08-03Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' ↵lain
into 'develop' fixes 1957 Add option to send user chatmessage instead of dm Closes #1957 See merge request pleroma/pleroma!2782
2020-08-03Improved WelcomeChatMessageTestIlja
* Checks if message is the same using ==/2 instead of =~/2
2020-08-03Consolidate construction of Rich Media Parser HTTP requestsMark Felder
2020-08-03Apply 1 suggestion(s) to 1 file(s)Ilja
2020-08-03Merge branch 'follower-mrf-again' into 'develop'lain
Follower mrf again See merge request pleroma/pleroma!2833
2020-08-03AccountControllerTest: Add test for message returned.lain
2020-08-03Merge branch 'config/default_ok_oldage' into 'develop'lain
config: :mrf, :policies default to ObjectAgePolicy Closes #2000 See merge request pleroma/pleroma!2814
2020-08-03Merge branch 'object-age-fix' into 'develop'lain
MRF Object Age Policy: Don't break on messages without cc/to See merge request pleroma/pleroma!2840
2020-08-03MRF Object Age Policy: Don't break on messages without cc/tolain
2020-08-03Merge branch 'indigenous-client' into 'develop'lain
Add indigenous to clients See merge request pleroma/pleroma!2835
2020-08-03Merge branch 'reportnote-test' into 'develop'lain
ReportNote test Closes #2014 See merge request pleroma/pleroma!2839
2020-08-02Add ReportNote testAlex Gleason
2020-08-02Factory: Add report_activity_factoryAlex Gleason
2020-08-02Add email blacklist, fixes #1404Alex Gleason
2020-08-02Add indigenous to clientsswentel
2020-08-02Add welcome chatmessagesIlja
* 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
2020-08-01SimpleMRF: Add missing :followers_only to config.exsAlex Gleason
2020-08-01Merge branch '1985-unobtrusive-autologin-on-registration' into 'develop'lain
[#1985] Prevented force login on registration if account approval and/or email confirmation needed Closes #1985 See merge request pleroma/pleroma!2823
2020-08-01Merge branch 'fix/gun-nxdomain-no-error-tuple' into 'develop'rinpatch
ConnectionPool: fix gun open errors being returned without an error tuple Closes #2008 See merge request pleroma/pleroma!2832
2020-08-01ConnectionPool: fix gun open errors being returned without an error tuplerinpatch
When gun shuts down due to the host being unreachable, the worker process shuts down with the same shutdown reason since they are linked. Gun doesn't have error tuples in it's shutdown reason though, so we need to handle it in get_conn. Closes #2008
2020-08-01Merge branch 'fix/gun-limiter' into 'develop'rinpatch
Fix ConnecitonPool deadlocking after reaching the connection limit Closes #1977 See merge request pleroma/pleroma!2830