summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-06-11Merge branch '1794-hashtags-construction-from-uri' into 'develop'feld
2020-06-11Merge OGP parser with TwitterCardEgor Kislitsyn
2020-06-11[#1794] Fixes URI query handling for hashtags extraction in search.Ivan Tashkinov
2020-06-10Apply suggestion to lib/pleroma/web/controller_helper.exlain
2020-06-10Add command to reload emoji packs from cli for OTP usersMark Felder
2020-06-10HTTP security plug: add media proxy base url host to csprinpatch
2020-06-10ActivityPubTest: Update test for atomized parameters.lain
2020-06-10Add testThibaut Girka
2020-06-10Merge branch 'remake-remodel-dms' into 'develop'rinpatch
2020-06-10ActivityPubTest: Make test easier to understand.lain
2020-06-10ActivityPub: Don't show announces of your own objects in timeline.lain
2020-06-10ControllerHelper: Fix wrong comparison.lain
2020-06-10Apply suggestion to lib/pleroma/web/controller_helper.exlain
2020-06-10Apply suggestion to lib/pleroma/web/controller_helper.exlain
2020-06-10Apply suggestion to lib/pleroma/web/controller_helper.exlain
2020-06-09Merge branch 'release/2.0.6' into 'stable'rinpatch
2020-06-09Merge branch 'add-url-to-admin-account-view' into 'develop'lain
2020-06-09Add `url` field to AdminAPI.AccountViewEgor Kislitsyn
2020-06-09StatusController: Correctly paginate favorites.lain
2020-06-09Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-06-09Merge branch 'features/mediatype-mime-valid' into 'develop'lain
2020-06-09Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into ...lain
2020-06-09MigrationHelper: Move notification backfilling to own module.lain
2020-06-08Apply suggestion to lib/pleroma/notification.exlain
2020-06-08transmogrifier: MIME.valid?/1 for mediaTypeHaelwenn (lanodan) Monnier
2020-06-08CHANGELOG.md: add 2.0.6 entryrinpatch
2020-06-08merge developRoman Chvanikov
2020-06-08Restrict ActivityExpirationPolicy to Notes onlyEgor Kislitsyn
2020-06-08Merge branch 'develop' into global-status-expirationEgor Kislitsyn
2020-06-08Merge branch 'openapi/admin/relay' into 'develop'lain
2020-06-08Merge branch 'feature/delete-follow-requests-on-user-deletion' into 'develop'lain
2020-06-08Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-06-08Merge branch 'activity-pub-use-atoms-as-keys' into 'develop'lain
2020-06-08ChatController: Remove nonsensical pagination.lain
2020-06-08Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remo...lain
2020-06-08mix.exs: bump version to 2.0.6rinpatch
2020-06-08Merge branch 'recipients-query-speedup' into 'develop'rinpatch
2020-06-08Migrations: Add index on client_id and client_secret for apps.lain
2020-06-08Activity.Queries: Use correct actor restriction.lain
2020-06-08ActivityPub: Change ordering to `nulls last` in favorites querylain
2020-06-08Merge branch 'notification-fixes' into 'develop'rinpatch
2020-06-08[stable rewrite]: fix streamer streaming out announces from a muted threadrinpatch
2020-06-08Merge branch 'features/apc2s-pagination' into 'develop'Haelwenn
2020-06-08Update crypt libraryRoman Chvanikov
2020-06-08fix for syslog compile with updated rebar3Alexander Strizhakov
2020-06-08[stable rewrite] update hackney to 1.16.0 and add support for tlsv1.3rinpatch
2020-06-08Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop'rinpatch
2020-06-07Docs: Document new mandatory parameter.lain
2020-06-07ChatController: Make last_read_id mandatory.lain
2020-06-07Delete pending follow requests on user deletionSergey Suprunenko