6c96d68f77
add overriding truncated_namespace condition for truncating paths for digital ocean
2019-03-24 11:32:09 -07:00
750de7d842
Merge branch 'features/mrf-keyword-nil-summary' into 'develop'
...
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
See merge request pleroma/pleroma!968
2019-03-24 15:02:13 +00:00
eab9425cc4
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
2019-03-24 15:47:50 +01:00
a32bcab04b
Merge branch 'fix/eldap-warnings' into 'develop'
...
Ignore compilation warnings for undefined module :eldap
See merge request pleroma/pleroma!956
2019-03-24 11:17:40 +00:00
9b6b2395e4
Merge branch 'feature/object-normalize-preload' into 'develop'
...
preloaded object normalization
See merge request pleroma/pleroma!967
2019-03-24 02:31:56 +00:00
4a3dd86a55
tests: fix up activity collision test
2019-03-23 03:17:51 +00:00
4aa699271c
activity: use left join instead of inner join when fetching activities that may or may not have a child object
2019-03-23 03:17:50 +00:00
332dc1371b
user: use preloads when deleting accounts
2019-03-23 03:06:00 +00:00
debf7f016d
ostatus: use preload objects with Object.normalize() when opportunistic
2019-03-23 03:05:57 +00:00
3c2350cbee
object: downgrade normalize warning to debug severity
2019-03-23 03:05:15 +00:00
8c70156157
activitypub: object view: use preloaded object when possible
2019-03-23 03:05:14 +00:00
f9d5c13b21
activity: add get_by_ap_id_with_object()
2019-03-23 03:05:13 +00:00
ce47eb8b29
activitypub: when fetching objects, use the preloaded object from the synthesized activity
2019-03-23 03:05:10 +00:00
aabcecb269
notification: formatting
2019-03-23 02:30:53 +00:00
07cdd9ed02
streamer: use the preloaded object if possible
2019-03-23 02:29:01 +00:00
c62220c500
rich media: helpers: only crawl Create activities
2019-03-23 02:28:59 +00:00
9a06d9f6e8
notification: preload child objects
2019-03-23 02:28:57 +00:00
4cedf45423
relay: use preloaded object since we always have it
2019-03-23 02:28:56 +00:00
aaec91b9a1
relay test: don't do preloading (since follow objects are activities, it's a mess)
2019-03-23 01:23:02 +00:00
e430a71d37
ostatus: fetch preloaded object in note handler for testsuite
2019-03-23 01:17:26 +00:00
73efe95368
activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)
2019-03-23 01:09:12 +00:00
ba7299fc87
activitypub: add missing with_preloaded_object()
2019-03-23 00:53:35 +00:00
e4307cadc8
activitypub: splice in the child object if we have one
2019-03-23 00:40:08 +00:00
a6973a668e
formatting
2019-03-23 00:28:16 +00:00
59518cbcd8
activity: fix credo nitpick
2019-03-23 00:26:12 +00:00
b3bf523c09
rich media: use optimized Object.normalize()
2019-03-23 00:22:57 +00:00
e75e43b949
common api: use the optimized Object.normalize whenever possible
2019-03-23 00:22:14 +00:00
9aea7cc224
activitypub: preload child objects when fetching timelines
2019-03-23 00:10:17 +00:00
092cedede5
activity: add with_preloaded_object() convenience
2019-03-23 00:09:56 +00:00
62bccddde0
object: add support for preloading objects when walking an activity graph in normal form
2019-03-22 23:51:12 +00:00
8b18955a59
Merge branch 'hotfix/null-content' into 'develop'
...
Fix text being nullable in TwitterAPI
See merge request pleroma/pleroma!966
2019-03-22 21:17:00 +00:00
1b33986bfa
Fix text being nullable in TwitterAPI
2019-03-23 00:10:50 +03:00
fee360e581
Merge branch 'safe-mentions' into 'develop'
...
NodeInfo: Return safe_dm_mentions feature flag.
See merge request pleroma/pleroma!964
2019-03-22 11:03:56 +00:00
e2afce34b6
NodeInfo: Return safe_dm_mentions feature flag.
2019-03-22 11:57:20 +01:00
e1a8541450
Merge branch 'fix/use-union-all' into 'develop'
...
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-22 07:00:04 +00:00
3229c7a1d6
Ensure fts is prefered over trigram and use union_all instead of union in user search query
2019-03-22 08:39:49 +03:00
519a294d0f
Merge branch 'reports/fix-remote-reporting-emails' into 'develop'
...
reports: fix up email generation for remote reports
See merge request pleroma/pleroma!962
2019-03-22 01:35:54 +00:00
27e03a2177
reports: fix up email generation for remote reports
2019-03-22 01:17:14 +00:00
1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
2019-03-22 00:50:24 +00:00
b548181b52
Merge branch 'feature/mastoapi-ext-conversation-id' into 'develop'
...
Mastodon API: add conversation_id extension
See merge request pleroma/pleroma!961
2019-03-22 00:25:35 +00:00
a223e65f35
tests: fixup
2019-03-21 23:56:57 +00:00
ae8fa5d0aa
docs: document `conversation_id` extension
2019-03-21 23:27:42 +00:00
3cc2554fa3
mastodon api: add conversation_id extension (ref #674 )
2019-03-21 23:25:41 +00:00
fea3696799
common api: move context functions from twitterapi
2019-03-21 23:24:04 +00:00
bf8b29e080
Merge branch 'feature/move-search-to-db' into 'develop'
...
Move gluing search results from application to database and get mutuals a higher score multiplier
See merge request pleroma/pleroma!960
2019-03-21 21:41:04 +00:00
88096c65a5
Move gluing search results from application to database and get mutuals
...
a higher score multiplier
2019-03-21 23:16:32 +03:00
b48fddef5f
Merge branch 'feature/gopher-dstport' into 'develop'
...
Add a gopher url port config option
See merge request pleroma/pleroma!959
2019-03-21 17:08:40 +00:00
80bc9ed2ba
Add a gopher url port config option
...
This lets the user advertise a different port in the gopher urls,
for example listening locally on port 7070 but telling clients to
connect to the regular port 70.
2019-03-21 19:59:43 +03:00
b92a16aa00
Merge branch 'ecto-3-migration' into 'develop'
...
Ecto 3.0.7 (ecto_sql 3.0.5) migration
See merge request pleroma/pleroma!957
2019-03-21 16:24:57 +00:00
bf27190f7f
UtilController: Return state of safe dm mentions.
2019-03-21 16:20:58 +01:00
Austin Lanari