summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-05-01Merge branch 'fix/remove-redundant-ensure-scrubbed-html' into 'develop'rinpatch
Remove redundant ensure_scrubbed_html See merge request pleroma/pleroma!1114
2019-05-01Remove redundant ensure_scrubbed_htmlrinpatch
It is never used as handling for fake and non-fake activities was merged into one function above it
2019-05-01Merge branch 'features/download-mastofe-build' into 'develop'lambda
installation/download-mastofe-build.sh: Add mastofe CI-artifacts download See merge request pleroma/pleroma!1052
2019-05-01Merge branch 'bugfix/web-notification-special-char' into 'develop'lambda
fix the web push notification with special char for status created See merge request pleroma/pleroma!1092
2019-05-01Merge branch 'harmonize_return_types_in_user_module' into 'develop'lambda
Harmonize return types in user module Closes #718 See merge request pleroma/pleroma!1112
2019-05-01Merge branch 'docs/fix-config.md' into 'develop'rinpatch
[docs/config.md]Fix syntax highlighting + clarify :frontend_configuration See merge request pleroma/pleroma!1110
2019-05-01Merge branch 'update_auto_linker' into 'develop'rinpatch
Update `auto_linker` See merge request pleroma/pleroma!1111
2019-05-01test fixesAlex S
2019-05-01Update `auto_linker`Egor Kislitsyn
2019-05-01Merging with developAlex S
Conflicts: lib/pleroma/web/activity_pub/transmogrifier.ex lib/pleroma/user.ex
2019-05-01Fix syntax highlighting + clarify :frontend_configurationxse
2019-05-01add scrubber for html special charSachin Joshi
2019-05-01Merge branch 'develop' into bugfix/web-notification-special-charSachin Joshi
2019-04-30Merge branch 'fix/stream_out-normalize-only-creates' into 'develop'rinpatch
Do not normalize objects in stream_out unless the activity type is Create See merge request pleroma/pleroma!1109
2019-04-30Do not normalize objects in stream_out unless the activity type isrinpatch
Create Saves quite a bit of time with delete activities because they would always query the db
2019-04-29Merge branch 'hotfix/migrateoldbookmarks-crashing-on-deleted-activities' ↵rinpatch
into 'develop' Fix MigrateOldBookmarks migration crashing on deleted activities See merge request pleroma/pleroma!1106
2019-04-29Fix MigrateOldBookmarks migration crashing on deleted activitiesrinpatch
2019-04-29Merge branch 'fix-webpush' into 'develop'rinpatch
WebPush: Use Object.normalize, rewrite tests so they test reality. See merge request pleroma/pleroma!1105
2019-04-29WebPush: Use Object.normalize, rewrite tests so they test reality.lain
2019-04-29Merge branch 'fix/add-default-scope-mastoapi' into 'develop'rinpatch
Add default_scope to /api/v1/update_credentials See merge request pleroma/pleroma!1100
2019-04-28Merge branch 'fix/uploads-folder-issues' into 'develop'kaniini
fix issues with the uploads directory See merge request pleroma/pleroma!1101
2019-04-28Merge branch 'regression/rights-only-for-admin' into 'develop'kaniini
Fix `rights` in TwitterAPI's user entity being present only for Admins/Moderators See merge request pleroma/pleroma!1102
2019-04-28Fix `rights` in TwitterAPI's user entity being present only forrinpatch
Admins/Moderators In !1093 I reused `maybe_with_role` for `rights` object, however I missed that `maybe_with_role` is called only for admins/moderators.
2019-04-28fix issues with the uploads directoryxse
2019-04-28Merge branch 'fix/bookmark-depend-on-embeded-object' into 'develop'kaniini
Fix bookmarks depending on embeded object and move checking if the status is bookmarked to SQL See merge request pleroma/pleroma!1099
2019-04-27Add default_scope to /api/v1/update_credentialsrinpatch
2019-04-27Fix bookmarks depending on embeded object and move checking if therinpatch
status is bookmarked to SQL
2019-04-27Merge branch 'feature/bbcode' into 'develop'kaniini
BBCode support (backend) See merge request pleroma/pleroma!1097
2019-04-27Merge branch 'update/pleroma-fe-20190426' into 'develop'kaniini
update pleroma frontend See merge request pleroma/pleroma!1098
2019-04-27update pleroma frontendWilliam Pitcock
2019-04-26tests: fix up for changed bbcode library output and verify html is properly ↵William Pitcock
escaped
2019-04-26add support for bbcodeWilliam Pitcock
2019-04-26mix: add bbcode dependencyWilliam Pitcock
2019-04-26Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'lambda
Feature/807 bookmark endpoint extension Closes #807 See merge request pleroma/pleroma!1059
2019-04-26Merge branch 'feature/mastoapi-new-config' into 'develop'kaniini
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API This patch: - Fixes `rights` in TwitterAPI ignoring `show_role` - Fixes exposing default scope of the user to anyone in Mastodon API - Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674) Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs See merge request pleroma/pleroma!1093
2019-04-25Merge branch 'chore/update-changelog' into 'develop'kaniini
update Changelog See merge request pleroma/pleroma!1096
2019-04-25update ChangelogWilliam Pitcock
2019-04-25Merge branch 'feature/mediaproxy-whitelist' into 'develop'kaniini
Add mediaproxy whitelist capability Closes #837 See merge request pleroma/pleroma!1095
2019-04-25Add mediaproxy whitelist capabilityMark Felder
2019-04-25Merge branch 'feature/auto-reject-follow-requests-blocked' into 'develop'Haelwenn
activitypub: transmogrifier: send reject follow if following does not succeed See merge request pleroma/pleroma!1094
2019-04-25Move settings to Source subentityrinpatch
2019-04-25test fixesAlex S
2019-04-25fixes for testsAlex S
2019-04-25migration without using old field nameAlex S
removing old field from db, after bookmarks migration
2019-04-25unusedAlex S
2019-04-25removing useless transactionAlex S
2019-04-25migration optimizationAlex S
changelog wording
2019-04-25changelog file updateAlex S
2019-04-25favourites add bookmark displayAlex S
2019-04-25migrate user.bookmarks to separate tableAlex S
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-30 09:34:45 +0000