summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-05-06Merge branch 'feature/bbs' into 'develop'lambda
2019-05-06Merge branch 'feature/845-improve-status-deletion' into 'develop'lambda
2019-05-06Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into fea...Alexander Strizhakov
2019-05-04BBS: Credo fixes.lain
2019-05-04BBS: Fix tests.lain
2019-05-04BBS: Use cached user fetcher.lain
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
2019-05-03Merge branch 'fix-search-speed' into 'develop'rinpatch
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
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
2019-05-03Standardize construction of websocket URLfeld
2019-05-03Fix embeded relationships in Mastodon APIrinpatch
2019-05-02Merge branch 'iss-849' into 'develop'lambda
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
2019-05-01Refactored Pleroma.Web.Auth.AuthenticatorMaksim
2019-05-01Merge branch 'fix/remove-redundant-ensure-scrubbed-html' into 'develop'rinpatch
2019-05-01Remove redundant ensure_scrubbed_htmlrinpatch
2019-05-01Merge branch 'features/download-mastofe-build' into 'develop'lambda
2019-05-01Merge branch 'bugfix/web-notification-special-char' into 'develop'lambda
2019-05-01Merge branch 'harmonize_return_types_in_user_module' into 'develop'lambda
2019-05-01Merge branch 'docs/fix-config.md' into 'develop'rinpatch
2019-05-01Merge branch 'update_auto_linker' into 'develop'rinpatch
2019-05-01test fixesAlex S
2019-05-01Update `auto_linker`Egor Kislitsyn
2019-05-01Merging with developAlex S
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
2019-04-30Do not normalize objects in stream_out unless the activity type isrinpatch
2019-04-29Merge branch 'hotfix/migrateoldbookmarks-crashing-on-deleted-activities' into...rinpatch
2019-04-29Fix MigrateOldBookmarks migration crashing on deleted activitiesrinpatch
2019-04-29Merge branch 'fix-webpush' into 'develop'rinpatch
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
2019-04-28Merge branch 'fix/uploads-folder-issues' into 'develop'kaniini
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-01 15:23:39 +0000