summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-07-07added hyper:// to default protocolsDYM
2020-07-07Merge branch 'description-limits' into 'develop'Haelwenn
2020-07-07Merge branch '1507-static-fe-prioritize-json' into 'develop'Haelwenn
2020-07-06StaticFE Plug: Use phoenix helper to get the requested format.lain
2020-07-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static...lain
2020-07-06Merge branch '1915-dont-filter-announce-notifications' into 'develop'rinpatch
2020-07-06Merge branch 'filter-tesla-config' into 'develop'lain
2020-07-06Changelog: Document description limits.lain
2020-07-06Docs: document instance differenceslain
2020-07-06InstanceView: Add chat limit, description limitlain
2020-07-06Docs: Add description limits to cheat sheetlain
2020-07-06Upload: Restrict description lengthlain
2020-07-06migration to delete migrated tesla settingAlexander Strizhakov
2020-07-06don't save tesla settings into dbAlexander Strizhakov
2020-07-04Streamer: Don't filter out announce notifications.lain
2020-07-03Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'lain
2020-07-03Merge branch '1912-leading-trailing-space-search' into 'develop'lain
2020-07-03Update changeloglain
2020-07-03Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/ma...lain
2020-07-03Merge branch '1892-exclude-bots-from-search-results' into 'develop'lain
2020-07-03SearchController: Trim query.lain
2020-07-03Merge branch '1910-migration-fix' into 'develop'rinpatch
2020-07-03Notification Backfill: Explicitly select the needed fields.lain
2020-07-03[#1892] Excluded internal users (applications) from user search results, rein...Ivan Tashkinov
2020-07-02Merge branch 'feature/1885-MRF-metadata' into 'develop'feld
2020-07-02Merge branch 'activation-meta' into 'develop'feld
2020-07-02Merge branch 'develop' into activation-metaMark Felder
2020-07-02Document the new API extension of /api/v1/instanceMark Felder
2020-07-02Remove camelCase from the keysMark Felder
2020-07-02Lint, long linesMark Felder
2020-07-02Improve descriptions, move primary MRF settings to top for AdminFE orderingMark Felder
2020-07-02Update AdminFE build to utilize new MRF metadataMark Felder
2020-07-02Merge branch 'develop' into feature/1885-MRF-metadataMark Felder
2020-07-02Merge branch 'fetcher-fixes' into 'develop'rinpatch
2020-07-02Merge branch '1907-fix-announce-streaming' into 'develop'rinpatch
2020-07-02Merge branch 'feature/update-description' into 'develop'lain
2020-07-02Credo fixes.lain
2020-07-02Changelog: Update with stream changes.lain
2020-07-02Streamer: Align announce streaming with polling.lain
2020-07-02SideEffects: Refactor.lain
2020-07-01Merge branch '1716-handle-nickname-clashes' into 'develop'rinpatch
2020-07-01ActivityPub: Handle clashing nicknames for the same ap idlain
2020-07-01Fetcher: Work when we can't get the OP.lain
2020-07-01Fixtures: Pretty print.lain
2020-07-01Merge branch 'revert-651f2695' into 'develop'lain
2020-07-01Revert "Merge branch 'avatar-removing' into 'develop'"lain
2020-07-01Add labels, update descriptions and labelsAngelina Filippova
2020-06-30Merge branch 'chore/rename-user-settings-column' into 'develop'Haelwenn
2020-06-30Add fields limits to instance metadata, add testsMark Felder
2020-06-30Merge branch 'develop' into activation-metaMark Felder