summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-05-04BBS: small fixes.lain
2019-05-04Merge remote-tracking branch 'origin/develop' into feature/bbslain
2019-05-03Merge branch 'fix/embeded-relationship-in-follows' into 'develop'rinpatch
Fix embeded relationships in Mastodon API See merge request pleroma/pleroma!1118
2019-05-03Merge branch 'fix-search-speed' into 'develop'rinpatch
Search: Add fts index on objects table. See merge request pleroma/pleroma!1120
2019-05-03Just have Benchee in all environments.lain
2019-05-03Mix: Also have benchee in test.lain
2019-05-03Merge branch 'bugfix/emoji-size' into 'develop'lambda
Bugfix: emoji size in profile Closes #269 See merge request pleroma/pleroma!792
2019-05-03Search: Add fts index on objects table.lain
2019-05-03MastoAPI: profile update with emoji_mapHaelwenn (lanodan) Monnier
2019-05-03TwitterAPI: profile update with emoji_mapHaelwenn (lanodan) Monnier
2019-05-03Web.TwitterAPI.UserView: Also view local user emojisHaelwenn (lanodan) Monnier
2019-05-03formatter.ex: Add get_emoji_map/1Haelwenn (lanodan) Monnier
2019-05-03Pleroma.User: remove emojify on parse_bioHaelwenn (lanodan) Monnier
2019-05-03Pleroma.Formatter: width/height to class=emojiHaelwenn (lanodan) Monnier
2019-05-03Merge branch 'fix/replace-ws' into 'develop'lambda
Standardize construction of websocket URL See merge request pleroma/pleroma!1115
2019-05-03Standardize construction of websocket URLfeld
This follows up on the change made in d747bd98
2019-05-03Fix embeded relationships in Mastodon APIrinpatch
Currently some endpoints render accounts without for user resulting in embedded relationship being empty. It causes bugs in followers/following tab in pleroma-fe but I fixed it for other endpoints as well just in case
2019-05-02Merge branch 'iss-849' into 'develop'lambda
Parse access_token from body parameters and URL parameters See merge request pleroma/pleroma!1103
2019-05-02Add oauth plug tests for url and body parametersAkiraFukushima
2019-05-02fix: Add mix deps.get before unit-testingAkiraFukushima
2019-05-02Parse access_token from body parameters and URL parametersAkiraFukushima
2019-05-01Merge branch 'support/oauth' into 'develop'lambda
Refactored Pleroma.Web.Auth.Authenticator See merge request pleroma/pleroma!1108
2019-05-01Refactored Pleroma.Web.Auth.AuthenticatorMaksim
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-04 05:09:28 +0000