summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-05-22Add tests for fallback routesAaron Tinio
2019-05-21Merge branch 'trivial/increase-hackney-timeouts' into 'develop'kaniini
http: bump connection timeout to 10 seconds See merge request pleroma/pleroma!1183
2019-05-21http: bump connection timeout to 10 secondsWilliam Pitcock
2019-05-21Merge branch 'fix/prometheus-ecto-error-when-not-configured' into 'develop'kaniini
Fix prometheus-ecto error when not configured Closes #917 See merge request pleroma/pleroma!1180
2019-05-20Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop'kaniini
Add virtual :thread_muted? field Closes #901 See merge request pleroma/pleroma!1178
2019-05-21Fix prometheus-ecto error when not configuredAaron Tinio
2019-05-20Merge branch 'feature/user-configurable-mascot' into 'develop'kaniini
Feature: user configurable mascot See merge request pleroma/pleroma!1177
2019-05-20Merge branch 'doc/mrf-simple-report-removal' into 'develop'kaniini
Document MRF.Simple :report_removal See merge request pleroma/pleroma!1179
2019-05-21Document MRF.Simple :report_removalAaron Tinio
2019-05-21Add virtual :thread_muted? fieldAaron Tinio
that may be set when fetching activities
2019-05-20Move default mascot configuration to `config/`Sadposter
2019-05-20Add changelog entry for mascot configSadposter
2019-05-20Use string map for default mascotSadposter
2019-05-20Format mascot testsSadposter
2019-05-20Add mascot get/set testsSadposter
2019-05-20Add API endpoints for a custom user mascotSadposter
2019-05-19Merge branch 'feature/mrf-simple-report-filtering' into 'develop'kaniini
Add report filtering to MRF.SimplePolicy Closes #610 See merge request pleroma/pleroma!1176
2019-05-20Add report filtering to MRF.SimplePolicyAaron Tinio
2019-05-18Merge branch 'feature/mrf-always-nsfw' into 'develop'rinpatch
suppress link previews from posts marked sensitive Closes #865 See merge request pleroma/pleroma!1173
2019-05-18Merge branch 'feature/http-ua-header-always' into 'develop'Haelwenn
http: request builder: send user-agent when making requests Closes #546 See merge request pleroma/pleroma!1174
2019-05-17add Changelog entryWilliam Pitcock
2019-05-17also suppress link previews from posts marked #nsfwWilliam Pitcock
2019-05-17add CHANGELOG entryWilliam Pitcock
2019-05-17config: make sending the user agent configurable, disable sending the user ↵William Pitcock
agent in tests
2019-05-17http: request builder: send user-agent when making requestsWilliam Pitcock
2019-05-17rich media: suppress link previews if post is marked as sensitiveWilliam Pitcock
2019-05-17mrf: simple policy: mark all posts instead of posts with media as sensitive ↵William Pitcock
if they match media_nsfw
2019-05-17Merge branch 'rum-index' into 'develop'rinpatch
Search: Use RUM index. See merge request pleroma/pleroma!1136
2019-05-17CI: Use the correct image with the correct hostname.lain
2019-05-17RUM: Set rum status by the environment.lain
2019-05-17RUM: Remove vacuum analyze from migrationlain
Can't be run in a trnasaction.
2019-05-17CI: Add rum variant testing.lain
2019-05-17Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-indexlain
2019-05-17Merge branch 'ecto_sql_update' into 'develop'lambda
Dependencies: Update Ecto SQL. See merge request pleroma/pleroma!1160
2019-05-17Merge branch 'update-tzdata' into 'develop'lambda
Dependencies: Update tzdata. Closes #910 See merge request pleroma/pleroma!1171
2019-05-17Merge branch 'bugfix/903-mastoapi-relationship-requested' into 'develop'lambda
MastoAPI account_view.ex: requested is false when following is true Closes #903 See merge request pleroma/pleroma!1169
2019-05-17Update account_view.exlambda
2019-05-17Dependencies: Update tzdata.lain
This fixes the bug that tz data could not be loaded. Closes #910.
2019-05-17Fix specs.lain
2019-05-17Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
ecto_sql_update
2019-05-17Configuration: disable migration lock.lain
2019-05-17Dependencies: Update ecto sql once more.lain
2019-05-17Merge branch 'fix/902-random-compile-failing' into 'develop'rinpatch
Fix/902 random compile failing Closes #902 See merge request pleroma/pleroma!1168
2019-05-17Fix/902 random compile failingAlexander Strizhakov
2019-05-17MastoAPI account_view.ex: requested is false when following is trueHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/903
2019-05-17Merge branch 'fix/mrf-tag-typo' into 'develop'kaniini
Fix MRF "tag" typo See merge request pleroma/pleroma!1167
2019-05-17Add tests for MRF.SimplePolicyAaron Tinio
2019-05-17Fix typo: s/"tags"/"tag"/gAaron Tinio
2019-05-16Merge branch 'feature/890-add-report-uri' into 'develop'kaniini
Feature/890 add report uri Closes #890 See merge request pleroma/pleroma!1164
2019-05-16Merge branch 'feature/task-update-following' into 'develop'feld
Remove duplicated entries in users' following lists Closes #888 See merge request pleroma/pleroma!1166