Commit graph

4626 commits

Author SHA1 Message Date
William Pitcock
b3bf523c09 rich media: use optimized Object.normalize() 2019-03-23 00:22:57 +00:00
William Pitcock
e75e43b949 common api: use the optimized Object.normalize whenever possible 2019-03-23 00:22:14 +00:00
William Pitcock
9aea7cc224 activitypub: preload child objects when fetching timelines 2019-03-23 00:10:17 +00:00
William Pitcock
092cedede5 activity: add with_preloaded_object() convenience 2019-03-23 00:09:56 +00:00
William Pitcock
62bccddde0 object: add support for preloading objects when walking an activity graph in normal form 2019-03-22 23:51:12 +00:00
rinpatch
4bf327b664 Remove postgres from documentation related jobs 2019-03-23 01:01:01 +03:00
rinpatch
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
rinpatch
1b33986bfa Fix text being nullable in TwitterAPI 2019-03-23 00:10:50 +03:00
rinpatch
55cf85376f Add automatic doc build and deploy 2019-03-22 23:31:04 +03:00
lambda
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
lain
e2afce34b6 NodeInfo: Return safe_dm_mentions feature flag. 2019-03-22 11:57:20 +01:00
kaniini
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
rinpatch
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
kaniini
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
William Pitcock
27e03a2177 reports: fix up email generation for remote reports 2019-03-22 01:17:14 +00:00
kaniini
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
kaniini
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
William Pitcock
a223e65f35 tests: fixup 2019-03-21 23:56:57 +00:00
William Pitcock
ae8fa5d0aa docs: document conversation_id extension 2019-03-21 23:27:42 +00:00
William Pitcock
3cc2554fa3 mastodon api: add conversation_id extension (ref #674) 2019-03-21 23:25:41 +00:00
William Pitcock
fea3696799 common api: move context functions from twitterapi 2019-03-21 23:24:04 +00:00
kaniini
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
rinpatch
88096c65a5 Move gluing search results from application to database and get mutuals
a higher score multiplier
2019-03-21 23:16:32 +03:00
rinpatch
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
Quentin Rameau
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
rinpatch
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
lain
bf27190f7f UtilController: Return state of safe dm mentions. 2019-03-21 16:20:58 +01:00
link0ff
f858df819b Skip tests in LDAPAuthorizationTest if :eldap module is unavailable 2019-03-21 12:31:16 +02:00
kaniini
b68fb3dc17 Merge branch 'imageoptim' into 'develop'
used imageOptim to reduce size of image files

See merge request pleroma/pleroma!944
2019-03-21 00:59:24 +00:00
lain
8468f3f6d4 Add safe dm mode option. 2019-03-20 21:09:36 +01:00
Ivan Tashkinov
81bf6d9e6a [#923] Typo fix. 2019-03-20 20:29:08 +03:00
Ivan Tashkinov
af68a42ef7 [#923] Support for multiple OAuth consumer strategies. 2019-03-20 20:25:48 +03:00
rinpatch
e59cfa7cac modify the migrations to use naive_datetime_usec 2019-03-20 16:16:29 +03:00
rinpatch
cbc4a76b43 Fix filter migration 2019-03-20 16:13:23 +03:00
rinpatch
19a19bdd81 Fix migration timestamp type 2019-03-20 16:04:59 +03:00
rinpatch
9a7b817c9a Ecto 3.0.5 migration
kms
2019-03-20 15:59:54 +03:00
link0ff
40c58d3383 Ignore compilation warnings for undefined module :eldap 2019-03-20 13:28:06 +02:00
lambda
0d14def0ca Merge branch '2019-03-20-update-frontend' into 'develop'
Update frontend

See merge request pleroma/pleroma!955
2019-03-20 08:07:25 +00:00
lain
41511d1926 Update frontend 2019-03-20 08:58:25 +01:00
Ivan Tashkinov
e17a9a1f66 [#923] Nickname & email selection for external registrations, option to connect to existing account. 2019-03-20 10:35:31 +03:00
kaniini
606766b010 Merge branch 'fix/search-users-for-admin' into 'develop'
Rework users search

Closes admin-fe#12

See merge request pleroma/pleroma!954
2019-03-20 00:37:20 +00:00
Maxim Filippov
7ac9fff437 Format 2019-03-20 01:40:50 +03:00
Maxim Filippov
ed8a2935f5 Use ILIKE to search users 2019-03-20 01:37:40 +03:00
kaniini
9b80203ea5 Merge branch 'bugfix/activitypub-public' into 'develop'
activitypub addressing improvements

Closes #730 and #739

See merge request pleroma/pleroma!953
2019-03-19 21:36:20 +00:00
William Pitcock
1685e4258f transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection 2019-03-19 18:39:33 +00:00
William Pitcock
67ff8d9311 user: properly cope with actors which do not declare a followers collection 2019-03-19 18:23:06 +00:00
William Pitcock
cd055983c3 transmogrifier: when determining followers collection URI, we may need to fetch the actor 2019-03-19 18:04:57 +00:00
William Pitcock
455bb526f6 test: add test for list sanitization 2019-03-19 17:53:40 +00:00
William Pitcock
fd0aa58ee0 tests: add test for as:Public issues 2019-03-19 17:49:29 +00:00
William Pitcock
d487b753c3 activitypub: transmogrifier: do not allow missing lists to be interpreted as nil 2019-03-19 17:30:25 +00:00