Haelwenn (lanodan) Monnier [Sun, 24 Mar 2019 14:47:50 +0000 (15:47 +0100)]
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
rinpatch [Fri, 22 Mar 2019 21:17:00 +0000 (21:17 +0000)]
Merge branch 'hotfix/null-content' into 'develop'
Fix text being nullable in TwitterAPI
See merge request pleroma/pleroma!966
rinpatch [Fri, 22 Mar 2019 21:10:50 +0000 (00:10 +0300)]
Fix text being nullable in TwitterAPI
lambda [Fri, 22 Mar 2019 11:03:56 +0000 (11:03 +0000)]
Merge branch 'safe-mentions' into 'develop'
NodeInfo: Return safe_dm_mentions feature flag.
See merge request pleroma/pleroma!964
lain [Fri, 22 Mar 2019 10:57:20 +0000 (11:57 +0100)]
NodeInfo: Return safe_dm_mentions feature flag.
kaniini [Fri, 22 Mar 2019 07:00:04 +0000 (07:00 +0000)]
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
rinpatch [Fri, 22 Mar 2019 05:39:49 +0000 (08:39 +0300)]
Ensure fts is prefered over trigram and use union_all instead of union in user search query
kaniini [Fri, 22 Mar 2019 01:35:54 +0000 (01:35 +0000)]
Merge branch 'reports/fix-remote-reporting-emails' into 'develop'
reports: fix up email generation for remote reports
See merge request pleroma/pleroma!962
William Pitcock [Fri, 22 Mar 2019 01:17:14 +0000 (01:17 +0000)]
reports: fix up email generation for remote reports
kaniini [Fri, 22 Mar 2019 00:50:24 +0000 (00:50 +0000)]
Merge branch 'safe-mentions' into 'develop'
Add safe dm mode option.
See merge request pleroma/pleroma!958
kaniini [Fri, 22 Mar 2019 00:25:35 +0000 (00:25 +0000)]
Merge branch 'feature/mastoapi-ext-conversation-id' into 'develop'
Mastodon API: add conversation_id extension
See merge request pleroma/pleroma!961
William Pitcock [Thu, 21 Mar 2019 23:37:00 +0000 (23:37 +0000)]
tests: fixup
William Pitcock [Thu, 21 Mar 2019 23:27:42 +0000 (23:27 +0000)]
docs: document `conversation_id` extension
William Pitcock [Thu, 21 Mar 2019 23:25:41 +0000 (23:25 +0000)]
mastodon api: add conversation_id extension (ref #674)
William Pitcock [Thu, 21 Mar 2019 23:17:53 +0000 (23:17 +0000)]
common api: move context functions from twitterapi
kaniini [Thu, 21 Mar 2019 21:41:04 +0000 (21:41 +0000)]
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
rinpatch [Thu, 21 Mar 2019 20:16:32 +0000 (23:16 +0300)]
Move gluing search results from application to database and get mutuals
a higher score multiplier
rinpatch [Thu, 21 Mar 2019 17:08:40 +0000 (17:08 +0000)]
Merge branch 'feature/gopher-dstport' into 'develop'
Add a gopher url port config option
See merge request pleroma/pleroma!959
Quentin Rameau [Mon, 18 Mar 2019 14:47:58 +0000 (15:47 +0100)]
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.
rinpatch [Thu, 21 Mar 2019 16:24:57 +0000 (16:24 +0000)]
Merge branch 'ecto-3-migration' into 'develop'
Ecto 3.0.7 (ecto_sql 3.0.5) migration
See merge request pleroma/pleroma!957
lain [Thu, 21 Mar 2019 15:16:26 +0000 (16:16 +0100)]
UtilController: Return state of safe dm mentions.
kaniini [Thu, 21 Mar 2019 00:59:24 +0000 (00:59 +0000)]
Merge branch 'imageoptim' into 'develop'
used imageOptim to reduce size of image files
See merge request pleroma/pleroma!944
lain [Wed, 20 Mar 2019 20:09:36 +0000 (21:09 +0100)]
Add safe dm mode option.
rinpatch [Wed, 20 Mar 2019 13:16:29 +0000 (16:16 +0300)]
modify the migrations to use naive_datetime_usec
rinpatch [Wed, 20 Mar 2019 13:13:23 +0000 (16:13 +0300)]
Fix filter migration
rinpatch [Wed, 20 Mar 2019 13:04:59 +0000 (16:04 +0300)]
Fix migration timestamp type
rinpatch [Wed, 20 Mar 2019 12:59:27 +0000 (15:59 +0300)]
Ecto 3.0.5 migration
kms
lambda [Wed, 20 Mar 2019 08:07:25 +0000 (08:07 +0000)]
Merge branch '2019-03-20-update-frontend' into 'develop'
Update frontend
See merge request pleroma/pleroma!955
lain [Wed, 20 Mar 2019 07:58:25 +0000 (08:58 +0100)]
Update frontend
kaniini [Wed, 20 Mar 2019 00:37:20 +0000 (00:37 +0000)]
Merge branch 'fix/search-users-for-admin' into 'develop'
Rework users search
Closes admin-fe#12
See merge request pleroma/pleroma!954
Maxim Filippov [Tue, 19 Mar 2019 22:40:50 +0000 (01:40 +0300)]
Format
Maxim Filippov [Tue, 19 Mar 2019 22:37:40 +0000 (01:37 +0300)]
Use ILIKE to search users
kaniini [Tue, 19 Mar 2019 21:36:20 +0000 (21:36 +0000)]
Merge branch 'bugfix/activitypub-public' into 'develop'
activitypub addressing improvements
Closes #730 and #739
See merge request pleroma/pleroma!953
William Pitcock [Tue, 19 Mar 2019 18:39:33 +0000 (18:39 +0000)]
transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection
William Pitcock [Tue, 19 Mar 2019 18:23:06 +0000 (18:23 +0000)]
user: properly cope with actors which do not declare a followers collection
William Pitcock [Tue, 19 Mar 2019 18:04:57 +0000 (18:04 +0000)]
transmogrifier: when determining followers collection URI, we may need to fetch the actor
William Pitcock [Tue, 19 Mar 2019 17:53:40 +0000 (17:53 +0000)]
test: add test for list sanitization
William Pitcock [Tue, 19 Mar 2019 17:49:29 +0000 (17:49 +0000)]
tests: add test for as:Public issues
William Pitcock [Tue, 19 Mar 2019 17:30:25 +0000 (17:30 +0000)]
activitypub: transmogrifier: do not allow missing lists to be interpreted as nil
William Pitcock [Tue, 19 Mar 2019 17:27:42 +0000 (17:27 +0000)]
activitypub: transmogrifier: ensure as:Public activities are delivered to followers
optikfluffel [Tue, 19 Mar 2019 09:02:24 +0000 (10:02 +0100)]
fix UploadTest to use new image_tmp.jpg
optikfluffel [Sat, 16 Mar 2019 13:08:18 +0000 (14:08 +0100)]
used imageOptim to reduce size of image files
kaniini [Mon, 18 Mar 2019 23:08:31 +0000 (23:08 +0000)]
Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'
Order users by nickname
See merge request pleroma/pleroma!945
kaniini [Mon, 18 Mar 2019 20:32:24 +0000 (20:32 +0000)]
Merge branch 'doc/mastodon-api-accounts-extension' into 'develop'
Document additional pleroma changes to /api/v1/accounts/:id
See merge request pleroma/pleroma!952
Mark Felder [Mon, 18 Mar 2019 19:48:56 +0000 (19:48 +0000)]
Document additional pleroma changes to /api/v1/accounts/:id
kaniini [Mon, 18 Mar 2019 19:17:36 +0000 (19:17 +0000)]
Merge branch 'masto-api-notifications' into 'develop'
Add support for exclude_types, limit and min_id in Mastodon notifications
See merge request pleroma/pleroma!949
rinpatch [Mon, 18 Mar 2019 17:57:19 +0000 (17:57 +0000)]
Merge branch 'fix-initial-posts' into 'develop'
Check if the user has indeed not been federated with before fetching initial posts
See merge request pleroma/pleroma!951
Ekaterina Vaartis [Mon, 18 Mar 2019 17:14:49 +0000 (20:14 +0300)]
Check if the user has indeed not been federated with
Just updating the user triggered post fetching too, now it
shouldn't. It only happened in the AP user fetching since that's
what's used to update users
rinpatch [Mon, 18 Mar 2019 09:58:51 +0000 (09:58 +0000)]
Merge branch 'add-is-seen-mastodon-api-doc' into 'develop'
Added documentation for Pleroma-specific is_seen in Mastodon API
See merge request pleroma/pleroma!948
eugenijm [Mon, 18 Mar 2019 01:32:23 +0000 (04:32 +0300)]
Added support for exclude_types, limit, and min_id in Mastodon
notifications.
Unify Mastodon-compatible pagination logic.
eugenijm [Mon, 18 Mar 2019 00:54:50 +0000 (03:54 +0300)]
Added documentation for Pleroma-specific is_seen in Mastodon API
kaniini [Mon, 18 Mar 2019 00:38:09 +0000 (00:38 +0000)]
Merge branch 'feature/allow-link-rel-attribute' into 'develop'
Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition).
See merge request pleroma/pleroma!946
Fong-Wan Chau [Sun, 17 Mar 2019 13:46:46 +0000 (09:46 -0400)]
Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition).
Maxim Filippov [Sun, 17 Mar 2019 10:30:05 +0000 (13:30 +0300)]
Merge branch 'feature/order-users-by-nickname-admin-api' of git.pleroma.social:maxf/pleroma into feature/order-users-by-nickname-admin-api
Maxim Filippov [Sun, 17 Mar 2019 10:29:28 +0000 (13:29 +0300)]
Fix test
Maxim Filippov [Sun, 17 Mar 2019 10:23:08 +0000 (13:23 +0300)]
Order users by nickname
Maxim Filippov [Sun, 17 Mar 2019 10:23:08 +0000 (13:23 +0300)]
Order users by nickname
kaniini [Sat, 16 Mar 2019 19:27:56 +0000 (19:27 +0000)]
Merge branch 'feature/federated-flags' into 'develop'
Federated reports
See merge request pleroma/pleroma!935
lambda [Sat, 16 Mar 2019 08:44:02 +0000 (08:44 +0000)]
Merge branch 'feature/oauth-me' into 'develop'
oauth: add me property to token responses
See merge request pleroma/pleroma!942
kaniini [Sat, 16 Mar 2019 04:31:31 +0000 (04:31 +0000)]
Merge branch 'feature/reblog-muting' into 'develop'
Implement mastodon's reblog hiding feature
See merge request pleroma/pleroma!916
kaniini [Sat, 16 Mar 2019 04:13:53 +0000 (04:13 +0000)]
Merge branch 'bugfix/ldap-test-fix' into 'develop'
test: fix defective ldap setup/teardown
See merge request pleroma/pleroma!943
William Pitcock [Sat, 16 Mar 2019 04:05:19 +0000 (04:05 +0000)]
test: fix defective ldap setup/teardown
William Pitcock [Sat, 16 Mar 2019 01:12:50 +0000 (01:12 +0000)]
oauth: add me property to token responses
kaniini [Sat, 16 Mar 2019 00:30:04 +0000 (00:30 +0000)]
Merge branch 'mark-notifications-as-read' into 'develop'
Allow to mark a single notification as read
See merge request pleroma/pleroma!941
eugenijm [Fri, 15 Mar 2019 17:06:28 +0000 (20:06 +0300)]
Allow to mark a single notification as read
kaniini [Fri, 15 Mar 2019 20:06:08 +0000 (20:06 +0000)]
Merge branch 'fix/mediaproxy-capture-content-disposition-filename' into 'develop'
MediaProxy: parse filename from content-disposition for non-whitelisted types
See merge request pleroma/pleroma!936
kaniini [Fri, 15 Mar 2019 19:57:09 +0000 (19:57 +0000)]
Merge branch 'feature/openldap-support' into 'develop'
OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859
kaniini [Fri, 15 Mar 2019 19:53:25 +0000 (19:53 +0000)]
Merge branch 'enable-dedupe-by-default' into 'develop'
Enable dedupe by default
See merge request pleroma/pleroma!939
kaniini [Fri, 15 Mar 2019 19:51:06 +0000 (19:51 +0000)]
Merge branch 'docs/ex_doc-929-wiki-imports' into 'develop'
Fix headers and add !929 docs to extras
See merge request pleroma/pleroma!940
link0ff [Fri, 15 Mar 2019 14:28:46 +0000 (16:28 +0200)]
Add tests for LDAP authorization
Karen Konou [Fri, 15 Mar 2019 14:03:03 +0000 (15:03 +0100)]
remove unused function
Karen Konou [Fri, 15 Mar 2019 13:36:07 +0000 (14:36 +0100)]
fix credo warning
Karen Konou [Fri, 15 Mar 2019 13:28:14 +0000 (14:28 +0100)]
formatting
Karen Konou [Fri, 15 Mar 2019 13:13:42 +0000 (14:13 +0100)]
Fix streamer test
Karen Konou [Fri, 15 Mar 2019 13:06:58 +0000 (14:06 +0100)]
Refactor to store user ap_id, add tests
Karen Konou [Mon, 11 Mar 2019 18:59:25 +0000 (19:59 +0100)]
formatting
Karen Konou [Mon, 11 Mar 2019 15:57:54 +0000 (16:57 +0100)]
refactor filtering mechanism
Karen Konou [Sat, 9 Mar 2019 15:31:53 +0000 (16:31 +0100)]
Fix elixir 1.8 vs 1.7 format conflict
Karen Konou [Sat, 9 Mar 2019 15:24:32 +0000 (16:24 +0100)]
Add ActivityPub.contain_activity checks to streamer
Karen Konou [Sat, 9 Mar 2019 13:22:55 +0000 (14:22 +0100)]
Fix tests to assume reblogs shown by default
Karen Konou [Sat, 9 Mar 2019 13:08:41 +0000 (14:08 +0100)]
Implement mastodon's reblog hiding feature
Haelwenn (lanodan) Monnier [Fri, 15 Mar 2019 09:58:15 +0000 (10:58 +0100)]
Fix headers and add !929 docs to extras
[ci skip]
Haelwenn [Fri, 15 Mar 2019 09:48:50 +0000 (09:48 +0000)]
Merge branch 'mastoapi/mime_type' into 'develop'
Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938
rinpatch [Fri, 15 Mar 2019 09:11:13 +0000 (12:11 +0300)]
Enable dedupe by default
rinpatch [Fri, 15 Mar 2019 08:58:12 +0000 (11:58 +0300)]
Extend MastoAPI to provide attachment mimetypes
rinpatch [Fri, 15 Mar 2019 05:29:51 +0000 (08:29 +0300)]
Content-Disposition regex improvements
kaniini [Fri, 15 Mar 2019 02:59:17 +0000 (02:59 +0000)]
Merge branch 'notifications-is-seen' into 'develop'
MastoAPI notifications is_seen
See merge request pleroma/pleroma!934
kaniini [Fri, 15 Mar 2019 02:50:27 +0000 (02:50 +0000)]
Merge branch 'robotstxt' into 'develop'
Add robots.txt
Closes #723
See merge request pleroma/pleroma!929
William Pearson [Sun, 20 Jan 2019 01:44:00 +0000 (01:44 +0000)]
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.
rinpatch [Thu, 14 Mar 2019 22:36:29 +0000 (01:36 +0300)]
MediaProxy: parse filename from content-disposition for non-whitelisted types
eugenijm [Thu, 14 Mar 2019 18:39:58 +0000 (21:39 +0300)]
Add `is_seen` to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
kaniini [Thu, 14 Mar 2019 21:47:02 +0000 (21:47 +0000)]
Merge branch 'fix/filename-mangling' into 'develop'
Stop mangling filenames and enable dedupe by default
Closes #715
See merge request pleroma/pleroma!927
William Pitcock [Thu, 14 Mar 2019 19:52:08 +0000 (19:52 +0000)]
activitypub: inject to/cc fields on non-forwarded reports since Flag activities are now Forwardable
William Pitcock [Thu, 14 Mar 2019 19:38:46 +0000 (19:38 +0000)]
reports: unify sending e-mail for both remote and local reports
William Pitcock [Thu, 14 Mar 2019 19:29:47 +0000 (19:29 +0000)]
activitypub: add support for forwarding reports
rinpatch [Thu, 14 Mar 2019 19:33:20 +0000 (22:33 +0300)]
Merge develop to bump elixir version in the CI so I don't get failing formatting
William Pitcock [Thu, 14 Mar 2019 19:29:33 +0000 (19:29 +0000)]
common api: add support for forwarding reports
William Pitcock [Thu, 14 Mar 2019 19:29:04 +0000 (19:29 +0000)]
activitypub: utils: also match Activity objects
rinpatch [Thu, 14 Mar 2019 19:26:54 +0000 (22:26 +0300)]
Fix uploaded media plug test
William Pitcock [Thu, 14 Mar 2019 19:06:02 +0000 (19:06 +0000)]
activitypub: transmogrifier: accept remote Flag activities
projects / akkoma / log