aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-03-31updating docsAlexander Strizhakov
2020-03-31test for default features and changelog entryAlexander Strizhakov
2020-03-24node_info_test: Bump default features listHaelwenn (lanodan) Monnier
2020-03-24Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactionsHaelwenn (lanodan) Monnier
2020-03-24node_info_test.exs: Add test on the default feature listHaelwenn (lanodan) Monnier
2020-03-24Merge branch 'fix/activity-deletion' into 'develop'feld
2020-03-24Merge branch 'admin-api-change-password' into 'develop'lain
2020-03-24Fix activity deletionEgor Kislitsyn
2020-03-23Merge branch 'bugfix/profile-bio-newline' into 'develop'rinpatch
2020-03-23Merge branch 'support-emoji-staticfe' into 'develop'rinpatch
2020-03-23Add emoji support in statuses in staticfeEgor Kislitsyn
2020-03-22AccountView: fix for other forms of <br> in bioHaelwenn (lanodan) Monnier
2020-03-22Merge branch 'fix/ecto_ssl_option' into 'develop'rinpatch
2020-03-22Merge branch 'relationship-remove-outdated-hack' into 'develop'Haelwenn
2020-03-22Mastodon API Account view: Remove an outdated hackrinpatch
2020-03-20Merge branch 'fix-feed-pagination' into 'develop'lain
2020-03-20Merge branch 'clear-config-test-improvements' into 'develop'lain
2020-03-20Improved in-test `clear_config/n` applicability (setup / setup_all / in-test ...Ivan Tashkinov
2020-03-20Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-...Ivan Tashkinov
2020-03-20Merge branch 'feature/1206-restrict-unauthenticated' into 'develop'lain
2020-03-20restrict_unauthenticated settingAlexander Strizhakov
2020-03-20Merge branch 'feature/1635-notifications-include-types' into 'develop'lain
2020-03-20include_types parameter in /api/v1/notificationsAlexander Strizhakov
2020-03-19Merge branch 'fix-testing' into 'develop'lain
2020-03-19remove federated testingstwf
2020-03-19Add emoji reactions to features in nodeinfoMark Felder
2020-03-18Improved in-test config management functions.Ivan Tashkinov
2020-03-18Merge branch 'feature/1530-removing-with_move' into 'develop'rinpatch
2020-03-16Fix ssl option on Ecto config breaking releaseCevado
2020-03-16Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/...eugenijm
2020-03-16Merge branch 'docs/mrf_object_age' into 'develop'Haelwenn
2020-03-16Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`eugenijm
2020-03-16removing with_move parameterAlexander Strizhakov
2020-03-16Improve documentation of mrf_object_ageMark Felder
2020-03-16Merge branch 'feat/templates' into 'develop'rinpatch
2020-03-16gitlab: create templates for bug reports and release MRsrinpatch
2020-03-16Merge branch 'fix-warnings-in-tests' into 'develop'rinpatch
2020-03-16warnings fixAlexander Strizhakov
2020-03-16Merge branch 'removing-deprecated' into 'develop'rinpatch
2020-03-16removing from descriptions.exs deprecated settingsAlexander Strizhakov
2020-03-16fix for content-type header for tag feedAlexander Strizhakov
2020-03-16adding rss for user feedAlexander Strizhakov
2020-03-16fix for feed page paginationAlexander Strizhakov
2020-03-15Merge branch 'bugfix/earmark_renderer_test' into 'develop'rinpatch
2020-03-15Merge branch 'features/staticfe-sanitization' into 'develop'rinpatch
2020-03-15static_fe: Sanitize HTML in usersHaelwenn (lanodan) Monnier
2020-03-15mix.lock: [minor] last hash appendedHaelwenn (lanodan) Monnier
2020-03-15static_fe: Sanitize HTML in postsHaelwenn (lanodan) Monnier
2020-03-15Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'lain
2020-03-15Merge branch 'f' into 'develop'Haelwenn