summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2020-03-16adding rss for user feedAlexander Strizhakov
2020-03-16fix for feed page paginationAlexander Strizhakov
2020-03-15Merge branch 'release/2.0.1' into 'stable'rinpatch
2.0.1 release See merge request pleroma/pleroma!2298
2020-03-16CHANGELOG.md: Add upgrade notes for 2.0.1rinpatch
2020-03-16CHANGELOG.md: Add remaining entries for 2.0.1rinpatch
2020-03-16static-fe tests: fix to work on stablerinpatch
2020-03-16rate limiter: disable based on if remote ip was found, not on if the plug ↵rinpatch
was enabled The current rate limiter disable logic won't trigger when the remote ip is not forwarded, only when the remoteip plug is not enabled, which is not the case on most instances since it's enabled by default. This changes the behavior to warn and disable when the remote ip was not forwarded, even if the RemoteIP plug is enabled. Also closes #1620
2020-03-16rip out fetch_initial_postsrinpatch
Every time someone tries to use it, it goes mad and tries to scrape the entire fediverse for no visible reason, it's better to just remove it than continue shipping it in it's current state. idea acked by lain and feld on irc Closes #1595 #1422
2020-03-16Merge branch 'features/staticfe-sanitization' into 'develop'rinpatch
static_fe: Sanitize HTML Closes #1614 See merge request pleroma/pleroma!2299
2020-03-15Merge branch 'bugfix/earmark_renderer_test' into 'develop'rinpatch
test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex See merge request pleroma/pleroma!2300
2020-03-15Merge branch 'features/staticfe-sanitization' into 'develop'rinpatch
static_fe: Sanitize HTML Closes #1614 See merge request pleroma/pleroma!2299
2020-03-15static_fe: Sanitize HTML in usersHaelwenn (lanodan) Monnier
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-11 21:36:42 +0000