summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-07-12Update types in MRF Keyword groupAngelina Filippova
2020-07-11Remove :regex from typesAngelina Filippova
2020-07-11Update types for :params, :match_actor and :replace settingsAngelina Filippova
2020-07-10Update type for :replace settingsAngelina Filippova
2020-07-10Update type for :groups settingAngelina Filippova
2020-07-09Update types for :headers and :options settings in MediaProxy Invalidation groupAngelina Filippova
2020-07-07Merge branch 'bugfix/peertube-videos' into 'develop'lain
Fix getting videos from peertube See merge request pleroma/pleroma!2728
2020-07-07Merge branch 'feature/1392-support-irreversible-filters' into 'develop'Haelwenn
Updates for Feature/1392 support irreversible filters Closes #1392 See merge request pleroma/pleroma!2186
2020-07-07Fix getting videos from peertubeHaelwenn (lanodan) Monnier
2020-07-07Merge branch 'description-limits' into 'develop'Haelwenn
Add limits to image descriptions See merge request pleroma/pleroma!2724
2020-07-07Merge branch '1507-static-fe-prioritize-json' into 'develop'Haelwenn
StaticFE: Prioritize json in requests. Closes #1507 See merge request pleroma/pleroma!2695
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 ↵lain
1507-static-fe-prioritize-json
2020-07-06Merge branch '1915-dont-filter-announce-notifications' into 'develop'rinpatch
Streamer: Don't filter out announce notifications. Closes #1915 See merge request pleroma/pleroma!2719
2020-07-06Merge branch 'filter-tesla-config' into 'develop'lain
Filter tesla config See merge request pleroma/pleroma!2722
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-06test fixesAlexander Strizhakov
2020-07-06tests fixesAlexander Strizhakov
2020-07-06adding benchmarks in new formatAlexander Strizhakov
2020-07-06renaming back and reject nil on createAlexander Strizhakov
2020-07-06Apply suggestion to test/notification_test.exsAlexander Strizhakov
2020-07-06Apply suggestion to test/notification_test.exsAlexander Strizhakov
2020-07-06Apply suggestion to lib/pleroma/filter.exAlexander Strizhakov
2020-07-06don't filter notifications for follow and move typesAlexander Strizhakov
2020-07-06Restrict thread statuses that contain user's irreversible filtersSergey Suprunenko
2020-07-06Skip notifications for statuses that contain an irreversible filtered wordSergey Suprunenko
2020-07-06Restrict statuses that contain user's irreversible filtersSergey Suprunenko
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
MastoAPI 2.9.0: status text on deletion See merge request pleroma/pleroma!2690
2020-07-03Merge branch '1912-leading-trailing-space-search' into 'develop'lain
SearchController: Trim query. Closes #1912 See merge request pleroma/pleroma!2717
2020-07-03Update changeloglain
2020-07-03Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/mastoapi-2.9.0-status_text
2020-07-03Merge branch '1892-exclude-bots-from-search-results' into 'develop'lain
[#1892] Exclusion of service actors from user search results Closes #1892 See merge request pleroma/pleroma!2708
2020-07-03SearchController: Trim query.lain
2020-07-03Merge branch '1910-migration-fix' into 'develop'rinpatch
Notification Backfill: Explicitly select the needed fields. Closes #1910 See merge request pleroma/pleroma!2715
2020-07-03Notification Backfill: Explicitly select the needed fields.lain
Prevents a crashing migration when we change user fields.
2020-07-03[#1892] Excluded internal users (applications) from user search results, ↵Ivan Tashkinov
reinstated service actors in search results.
2020-07-02Merge branch 'feature/1885-MRF-metadata' into 'develop'feld
Feature/1885 mrf metadata Closes #1885 See merge request pleroma/pleroma!2693
2020-07-02Merge branch 'activation-meta' into 'develop'feld
Add more FE-required fields to /api/v1/instance See merge request pleroma/pleroma!2613
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