aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-05Update filter_view.ex to return whole_word actual valueMK Fain
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-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
frontend-bundles-downloads
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-04Update descriptions in :frontends groupAngelina Filippova
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-04Unify Config.get behaviour for atom/list key paramRoman Chvanikov
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-04Add label to :restrict_unauthenticated setting, fix typosAngelina Filippova
2020-08-04Update :welcome settings descriptionAngelina Filippova
2020-08-04Fix :args settings description in Upload.Filter.Mogrify groupAngelina Filippova
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-03Changelog: Update with frontend mix task.lain
2020-08-03Docs: Add info about installing from a local path.lain
2020-08-03Docs: Document installation of frontendslain
Co-authored-by: Roman Chvanikov <chvanikoff@pm.me>
2020-08-03Description: Add new fields for frontend configuration.lain
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