summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-03-25Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1364-notifications-sending-control
2020-03-25Fixed incorrect usage of "relations" as a short form of "relationships".Ivan Tashkinov
2020-03-24Merge branch 'fix/activity-deletion' into 'develop'feld
Fix activity deletion Closes #1640 See merge request pleroma/pleroma!2328
2020-03-24Merge branch 'admin-api-change-password' into 'develop'lain
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials` See merge request pleroma/pleroma!2149
2020-03-24Fix activity deletionEgor Kislitsyn
2020-03-23Merge branch 'bugfix/profile-bio-newline' into 'develop'rinpatch
AccountView: fix for other forms of <br> in bio Closes #1643 See merge request pleroma/pleroma!2322
2020-03-23Merge branch 'support-emoji-staticfe' into 'develop'rinpatch
Add emoji support in statuses in staticfe Closes #1453 See merge request pleroma/pleroma!2324
2020-03-23Add emoji support in statuses in staticfeEgor Kislitsyn
2020-03-22AccountView: fix for other forms of <br> in bioHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
2020-03-22Merge branch 'fix/ecto_ssl_option' into 'develop'rinpatch
Fix ssl option on Ecto config breaking release See merge request pleroma/pleroma!2307
2020-03-22Merge branch 'relationship-remove-outdated-hack' into 'develop'Haelwenn
Mastodon API Account view: Remove an outdated hack See merge request pleroma/pleroma!2321
2020-03-22Mastodon API Account view: Remove an outdated hackrinpatch
The hack with caching the follow relationship was introduced when we still were storing it inside the follow activity, resulting in slow queries. Now we store follow state in `FollowRelationship` table, so this is no longer necessary.
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-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 branch 'fix-testing' into 'develop'lain
Fix CI by temporarily removing federated testing See merge request pleroma/pleroma!2314
2020-03-19remove federated testingstwf
2020-03-18Improved in-test config management functions.Ivan Tashkinov
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-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-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-16Merge branch 'fix-warnings-in-tests' into 'develop'rinpatch
Warnings fix See merge request pleroma/pleroma!2303
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 '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
2020-03-15mix.lock: [minor] last hash appendedHaelwenn (lanodan) Monnier
2020-03-15static_fe: Sanitize HTML in postsHaelwenn (lanodan) Monnier
Note: Seems to have different sanitization with TwitterCard generator giving the following: <meta content=\"“alert(&#39;xss&#39;)”\" property=\"twitter:description\">
2020-03-15Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'lain
[#1560] Restricted AP- & OStatus-related routes for non-federating instances Closes #1560 See merge request pleroma/pleroma!2235
2020-03-15[#1364] Improved control over generation / sending of notifications. Fixed ↵Ivan Tashkinov
blocking / muting users notifications issue. Added tests.
2020-03-15Merge branch 'f' into 'develop'Haelwenn
rip out fetch_initial_posts Closes #1422 and #1595 See merge request pleroma/pleroma!2297
2020-03-15test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.exHaelwenn (lanodan) Monnier
Wasn't in the test suite otherwise
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-28 09:01:09 +0000