summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-03-26Merge branch 'refactor/remove-activity-representer' into 'develop'lambda
Remove ActivityRepresenter See merge request pleroma/pleroma!980
2019-03-26Credo is upset about me not remembering the alphabetrinpatch
2019-03-26Fix formattingrinpatch
2019-03-26Remove ActivityRepresenterrinpatch
2019-03-25Merge branch 'fix/notification-id-index' into 'develop'rinpatch
Add an `id desc nulls last` index to notifications See merge request pleroma/pleroma!975
2019-03-25Add an id index to notificationsrinpatch
2019-03-25Merge branch 'bugfix/missing-announces' into 'develop'rinpatch
fix up missing announcements with preloads See merge request pleroma/pleroma!972
2019-03-25fix up missing announcements with preloadsWilliam Pitcock
2019-03-25Merge branch 'features/s3-uploader-digital-ocean' into 'develop'kaniini
add overriding truncated_namespace condition for truncating paths for digital ocean See merge request pleroma/pleroma!969
2019-03-25Merge branch 'fix/mastoapi-liked' into 'develop'kaniini
Serve non-public activities in /api/v1/favourites Closes #648 See merge request pleroma/pleroma!970
2019-03-25Serve non-public activities in /api/v1/favouritesrinpatch
Fixes #648
2019-03-24add overriding truncated_namespace condition for truncating paths for ↵Austin Lanari
digital ocean
2019-03-24Merge branch 'features/mrf-keyword-nil-summary' into 'develop'rinpatch
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil See merge request pleroma/pleroma!968
2019-03-24mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nilHaelwenn (lanodan) Monnier
2019-03-24Merge branch 'fix/eldap-warnings' into 'develop'rinpatch
Ignore compilation warnings for undefined module :eldap See merge request pleroma/pleroma!956
2019-03-24Merge branch 'feature/object-normalize-preload' into 'develop'kaniini
preloaded object normalization See merge request pleroma/pleroma!967
2019-03-23tests: fix up activity collision testWilliam Pitcock
2019-03-23activity: use left join instead of inner join when fetching activities that ↵William Pitcock
may or may not have a child object
2019-03-23user: use preloads when deleting accountsWilliam Pitcock
2019-03-23ostatus: use preload objects with Object.normalize() when opportunisticWilliam Pitcock
2019-03-23object: downgrade normalize warning to debug severityWilliam Pitcock
2019-03-23activitypub: object view: use preloaded object when possibleWilliam Pitcock
2019-03-23activity: add get_by_ap_id_with_object()William Pitcock
2019-03-23activitypub: when fetching objects, use the preloaded object from the ↵William Pitcock
synthesized activity
2019-03-23notification: formattingWilliam Pitcock
2019-03-23streamer: use the preloaded object if possibleWilliam Pitcock
2019-03-23rich media: helpers: only crawl Create activitiesWilliam Pitcock
2019-03-23notification: preload child objectsWilliam Pitcock
2019-03-23relay: use preloaded object since we always have itWilliam Pitcock
2019-03-23relay test: don't do preloading (since follow objects are activities, it's a ↵William Pitcock
mess)
2019-03-23ostatus: fetch preloaded object in note handler for testsuiteWilliam Pitcock
2019-03-23activitypub: allow skipping preload in some cases (like certain tests where ↵William Pitcock
the preload is obnoxious)
2019-03-23activitypub: add missing with_preloaded_object()William Pitcock
2019-03-23activitypub: splice in the child object if we have oneWilliam Pitcock
2019-03-23formattingWilliam Pitcock
2019-03-23activity: fix credo nitpickWilliam Pitcock
2019-03-23rich media: use optimized Object.normalize()William Pitcock
2019-03-23common api: use the optimized Object.normalize whenever possibleWilliam Pitcock
2019-03-23activitypub: preload child objects when fetching timelinesWilliam Pitcock
2019-03-23activity: add with_preloaded_object() convenienceWilliam Pitcock
2019-03-22object: add support for preloading objects when walking an activity graph in ↵William Pitcock
normal form
2019-03-22Merge branch 'hotfix/null-content' into 'develop'rinpatch
Fix text being nullable in TwitterAPI See merge request pleroma/pleroma!966
2019-03-23Fix text being nullable in TwitterAPIrinpatch
2019-03-22Merge branch 'safe-mentions' into 'develop'lambda
NodeInfo: Return safe_dm_mentions feature flag. See merge request pleroma/pleroma!964
2019-03-22NodeInfo: Return safe_dm_mentions feature flag.lain
2019-03-22Merge branch 'fix/use-union-all' into 'develop'kaniini
Ensure fts is prefered over trigram and use union_all instead of union in user search query See merge request pleroma/pleroma!963
2019-03-22Ensure fts is prefered over trigram and use union_all instead of union in ↵rinpatch
user search query
2019-03-22Merge branch 'reports/fix-remote-reporting-emails' into 'develop'kaniini
reports: fix up email generation for remote reports See merge request pleroma/pleroma!962
2019-03-22reports: fix up email generation for remote reportsWilliam Pitcock
2019-03-22Merge branch 'safe-mentions' into 'develop'kaniini
Add safe dm mode option. See merge request pleroma/pleroma!958