William Pitcock
9aea7cc224
activitypub: preload child objects when fetching timelines
2019-03-23 00:10:17 +00:00
rinpatch
1b33986bfa
Fix text being nullable in TwitterAPI
2019-03-23 00:10:50 +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
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
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
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
lain
8468f3f6d4
Add safe dm mode option.
2019-03-20 21:09:36 +01:00
rinpatch
9a7b817c9a
Ecto 3.0.5 migration
...
kms
2019-03-20 15:59:54 +03: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
cd055983c3
transmogrifier: when determining followers collection URI, we may need to fetch the actor
2019-03-19 18:04:57 +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
William Pitcock
798da28812
activitypub: transmogrifier: ensure as:Public activities are delivered to followers
2019-03-19 17:27:42 +00:00
eugenijm
1588688a11
Added support for exclude_types, limit, and min_id in Mastodon
...
notifications.
Unify Mastodon-compatible pagination logic.
2019-03-18 11:27:27 +03:00
kaniini
6d6f48d079
Merge branch 'feature/federated-flags' into 'develop'
...
Federated reports
See merge request pleroma/pleroma!935
2019-03-16 19:27:56 +00:00
lambda
28df397454
Merge branch 'feature/oauth-me' into 'develop'
...
oauth: add me property to token responses
See merge request pleroma/pleroma!942
2019-03-16 08:44:02 +00:00
kaniini
c69dc2acf1
Merge branch 'feature/reblog-muting' into 'develop'
...
Implement mastodon's reblog hiding feature
See merge request pleroma/pleroma!916
2019-03-16 04:31:31 +00:00
William Pitcock
e0edc706cf
oauth: add me property to token responses
2019-03-16 01:12:50 +00:00
eugenijm
43fb03be5a
Allow to mark a single notification as read
2019-03-15 23:56:14 +03:00
kaniini
8b352af4dd
Merge branch 'feature/openldap-support' into 'develop'
...
OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859
2019-03-15 19:57:09 +00:00
Karen Konou
d8244c2a1b
remove unused function
2019-03-15 15:03:03 +01:00
Karen Konou
dfeb3aec44
fix credo warning
2019-03-15 14:36:07 +01:00
Karen Konou
da53c079db
Refactor to store user ap_id, add tests
2019-03-15 14:20:08 +01:00
Karen Konou
be465c762b
formatting
2019-03-15 14:18:53 +01:00
Karen Konou
15b21d1983
refactor filtering mechanism
2019-03-15 14:18:53 +01:00
Karen Konou
aa71139e4a
Fix elixir 1.8 vs 1.7 format conflict
2019-03-15 14:18:53 +01:00
Karen Konou
fe4c1d26fc
Add ActivityPub.contain_activity checks to streamer
2019-03-15 14:18:53 +01:00
Karen Konou
c8f31e0bc2
Implement mastodon's reblog hiding feature
2019-03-15 14:18:21 +01:00
Haelwenn
41fc67aa49
Merge branch 'mastoapi/mime_type' into 'develop'
...
Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938
2019-03-15 09:48:50 +00:00
rinpatch
d7a34b604b
Extend MastoAPI to provide attachment mimetypes
2019-03-15 11:58:12 +03:00
kaniini
0f42ea87d6
Merge branch 'notifications-is-seen' into 'develop'
...
MastoAPI notifications is_seen
See merge request pleroma/pleroma!934
2019-03-15 02:59:17 +00:00
kaniini
c708656b5e
Merge branch 'robotstxt' into 'develop'
...
Add robots.txt
Closes #723
See merge request pleroma/pleroma!929
2019-03-15 02:50:27 +00:00
William Pearson
3dadaa4432
robots.txt
...
Add default robots.txt that allows bots access to all paths.
Add mix task to generate robots.txt taht allows bots access to no paths.
Document custom emojis, MRF and static_dir
static_dir documentation includes docs for the robots.txt Mix task.
2019-03-15 02:28:18 +00:00
eugenijm
100413bf2c
Add is_seen
to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
2019-03-15 01:35:48 +03:00
William Pitcock
423fd07928
activitypub: inject to/cc fields on non-forwarded reports since Flag activities are now Forwardable
2019-03-14 19:52:08 +00:00
William Pitcock
5c7b774f09
reports: unify sending e-mail for both remote and local reports
2019-03-14 19:44:08 +00:00
William Pitcock
64b0120d67
activitypub: add support for forwarding reports
2019-03-14 19:36:17 +00:00
William Pitcock
3b48d5f0c2
common api: add support for forwarding reports
2019-03-14 19:29:33 +00:00
William Pitcock
379442ad17
activitypub: utils: also match Activity objects
2019-03-14 19:29:04 +00:00
William Pitcock
0f3ecb2bfb
activitypub: transmogrifier: accept remote Flag activities
2019-03-14 19:06:02 +00:00
William Pitcock
f86f7dbb8f
activitypub: utils: rework make_flag_data to accept either activity payloads or IRIs
2019-03-14 19:05:42 +00:00
rinpatch
34fc0dca2e
Merge branch 'hotfix/delete-activities' into 'develop'
...
Fix delete activities not federating
See merge request pleroma/pleroma!933
2019-03-14 17:49:00 +00:00
rinpatch
e630e5e135
Fix delete activities not federating
2019-03-14 20:43:14 +03:00
link0ff
54e7087ab4
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
2019-03-14 17:43:30 +02:00
kaniini
59333f2d56
Merge branch 'admin-api-account-view-namespace' into 'develop'
...
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
See merge request pleroma/pleroma!930
2019-03-14 02:01:10 +00:00
kaniini
86871c8a04
Merge branch 'feature/add-local-to-users-admin-api' into 'develop'
...
Add "local" & "tags" to users admin API
See merge request pleroma/pleroma!932
2019-03-14 02:00:47 +00:00
Maxim Filippov
f3964f4024
Ensure empty array is returned for tags
2019-03-14 03:17:09 +03:00
Maxim Filippov
257d8e78e5
Add tags
2019-03-14 01:52:24 +03:00