summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-03-20Fix formatter warningsEgor Kislitsyn
2020-03-20Merge branch 'develop' into global-status-expirationEgor Kislitsyn
2020-03-20updating clear_configAlexander Strizhakov
2020-03-20Merge branch 'develop' into gunAlexander Strizhakov
2020-03-20Add embeddable postsEgor Kislitsyn
2020-03-20Merge branch 'fix-feed-pagination' into 'develop'lain
Fix for feed page pagination Closes #1605 See merge request pleroma/pleroma!2281
2020-03-20Merge branch 'clear-config-test-improvements' into 'develop'lain
Improved in-test config management See merge request pleroma/pleroma!2312
2020-03-20Improved in-test `clear_config/n` applicability (setup / setup_all / in-test ↵Ivan Tashkinov
usage).
2020-03-20Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
clear-config-test-improvements # Conflicts: # test/web/mastodon_api/controllers/account_controller_test.exs
2020-03-20Merge branch 'feature/1206-restrict-unauthenticated' into 'develop'lain
restrict_unauthenticated setting Closes #1206 See merge request pleroma/pleroma!2318
2020-03-20NotificationController: Fix test.lain
2020-03-20Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-2
2020-03-20restrict_unauthenticated settingAlexander Strizhakov
2020-03-20Merge branch 'feature/1635-notifications-include-types' into 'develop'lain
include_types parameter in /api/v1/notifications Closes #1635 See merge request pleroma/pleroma!2311
2020-03-20include_types parameter in /api/v1/notificationsAlexander Strizhakov
2020-03-19Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activityHaelwenn (lanodan) Monnier
2020-03-19Merge branch 'fix-testing' into 'develop'lain
Fix CI by temporarily removing federated testing See merge request pleroma/pleroma!2314
2020-03-19transmogrifier.ex: rework fix_attachment for better IRHaelwenn (lanodan) Monnier
2020-03-19Fix linting.lain
2020-03-19Merge branch 'remake-remodel' into developlain
2020-03-19remove federated testingstwf
2020-03-19Add emoji reactions to features in nodeinfoMark Felder
2020-03-19WIPHaelwenn (lanodan) Monnier
2020-03-18Improved in-test config management functions.Ivan Tashkinov
2020-03-18Merge branch 'gun' of git.pleroma.social:alex.s/pleroma into gunAlexander Strizhakov
2020-03-18Merge branch 'develop' into gunAlexander Strizhakov
2020-03-18Merge branch 'feature/1530-removing-with_move' into 'develop'rinpatch
Feature/1530 removing with move Closes #1530 See merge request pleroma/pleroma!2306
2020-03-17activity_pub_controller_test.exs: test posting with AP C2S uploaded mediaHaelwenn (lanodan) Monnier
2020-03-16Fix ssl option on Ecto config breaking releaseCevado
To use `:ssl` option on Ecto config it's required to include Erlang ssl application, this prevents releases to start when `:ssl` option is set to true.
2020-03-16Enable Gun adapter by defaultMark Felder
We need devs to dogfood this before we merge it into the 2.1 release
2020-03-16[#1364] Improved notification-related tests.Ivan Tashkinov
2020-03-16Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET ↵eugenijm
/api/pleroma/admin/users/:nickname/credentials`.
2020-03-16Merge branch 'docs/mrf_object_age' into 'develop'Haelwenn
Improve documentation of mrf_object_age See merge request pleroma/pleroma!2305
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 remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1364-notifications-sending-control
2020-03-16Merge branch 'feat/templates' into 'develop'rinpatch
gitlab: create templates for bug reports and release MRs See merge request pleroma/pleroma!2304
2020-03-16gitlab: create templates for bug reports and release MRsrinpatch
2020-03-16fixAlexander Strizhakov
2020-03-16temp fix for `:gun.info` MatchErrorAlexander Strizhakov
2020-03-16Merge remote-tracking branch 'origin/develop' into global-status-expirationEgor Kislitsyn
2020-03-16Merge branch 'develop' into gunAlexander Strizhakov
2020-03-16Merge branch 'develop' into global-status-expirationEgor Kislitsyn
2020-03-16Merge branch 'fix-warnings-in-tests' into 'develop'rinpatch
Warnings fix See merge request pleroma/pleroma!2303
2020-03-16Merge branch 'develop' into gunAlexander Strizhakov
2020-03-16warnings fixAlexander Strizhakov
2020-03-16Merge branch 'removing-deprecated' into 'develop'rinpatch
Removing from descriptions.exs deprecated settings See merge request pleroma/pleroma!2302
2020-03-16removing from descriptions.exs deprecated settingsAlexander Strizhakov
2020-03-16fix for content-type header for tag feedAlexander Strizhakov
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-06 18:48:59 +0000