akkoma
5 years agoMerge branch 'feature/move-search-to-db' into 'develop'
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

5 years agoMove gluing search results from application to database and get mutuals
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

5 years agoMerge branch 'feature/gopher-dstport' into 'develop'
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

5 years agoAdd a gopher url port config option
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.

5 years agoMerge branch 'ecto-3-migration' into 'develop'
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

5 years agoMerge branch 'imageoptim' into 'develop'
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

5 years agomodify the migrations to use naive_datetime_usec
rinpatch [Wed, 20 Mar 2019 13:16:29 +0000 (16:16 +0300)]
modify the migrations to use naive_datetime_usec

5 years agoFix filter migration
rinpatch [Wed, 20 Mar 2019 13:13:23 +0000 (16:13 +0300)]
Fix filter migration

5 years agoFix migration timestamp type
rinpatch [Wed, 20 Mar 2019 13:04:59 +0000 (16:04 +0300)]
Fix migration timestamp type

5 years agoEcto 3.0.5 migration
rinpatch [Wed, 20 Mar 2019 12:59:27 +0000 (15:59 +0300)]
Ecto 3.0.5 migration

kms

5 years agoMerge branch '2019-03-20-update-frontend' into 'develop'
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

5 years agoUpdate frontend
lain [Wed, 20 Mar 2019 07:58:25 +0000 (08:58 +0100)]
Update frontend

5 years agoMerge branch 'fix/search-users-for-admin' into 'develop'
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

5 years agoFormat
Maxim Filippov [Tue, 19 Mar 2019 22:40:50 +0000 (01:40 +0300)]
Format

5 years agoUse ILIKE to search users
Maxim Filippov [Tue, 19 Mar 2019 22:37:40 +0000 (01:37 +0300)]
Use ILIKE to search users

5 years agoMerge branch 'bugfix/activitypub-public' into 'develop'
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

5 years agotransmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use...
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

5 years agouser: properly cope with actors which do not declare a followers 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

5 years agotransmogrifier: when determining followers collection URI, we may need to fetch the...
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

5 years agotest: add test for list sanitization
William Pitcock [Tue, 19 Mar 2019 17:53:40 +0000 (17:53 +0000)]
test: add test for list sanitization

5 years agotests: add test for as:Public issues
William Pitcock [Tue, 19 Mar 2019 17:49:29 +0000 (17:49 +0000)]
tests: add test for as:Public issues

5 years agoactivitypub: transmogrifier: do not allow missing lists to be interpreted as nil
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

5 years agoactivitypub: transmogrifier: ensure as:Public activities are delivered to followers
William Pitcock [Tue, 19 Mar 2019 17:27:42 +0000 (17:27 +0000)]
activitypub: transmogrifier: ensure as:Public activities are delivered to followers

5 years agofix UploadTest to use new image_tmp.jpg
optikfluffel [Tue, 19 Mar 2019 09:02:24 +0000 (10:02 +0100)]
fix UploadTest to use new image_tmp.jpg

5 years agoused imageOptim to reduce size of image files
optikfluffel [Sat, 16 Mar 2019 13:08:18 +0000 (14:08 +0100)]
used imageOptim to reduce size of image files

5 years agoMerge branch 'feature/order-users-by-nickname-admin-api' into 'develop'
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

5 years agoMerge branch 'doc/mastodon-api-accounts-extension' into 'develop'
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

5 years agoDocument additional pleroma changes to /api/v1/accounts/:id
Mark Felder [Mon, 18 Mar 2019 19:48:56 +0000 (19:48 +0000)]
Document additional pleroma changes to /api/v1/accounts/:id

5 years agoMerge branch 'masto-api-notifications' into 'develop'
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

5 years agoMerge branch 'fix-initial-posts' into 'develop'
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

5 years agoCheck if the user has indeed not been federated with
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

5 years agoMerge branch 'add-is-seen-mastodon-api-doc' into 'develop'
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

5 years agoAdded support for exclude_types, limit, and min_id in Mastodon
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.

5 years agoAdded documentation for Pleroma-specific is_seen in Mastodon API
eugenijm [Mon, 18 Mar 2019 00:54:50 +0000 (03:54 +0300)]
Added documentation for Pleroma-specific is_seen in Mastodon API

5 years agoMerge branch 'feature/allow-link-rel-attribute' into 'develop'
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

5 years agoAllow 'rel' attribute on `<a>` link with specific values (for hashtag recognition).
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).

5 years agoMerge branch 'feature/order-users-by-nickname-admin-api' of git.pleroma.social:maxf...
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

5 years agoFix test
Maxim Filippov [Sun, 17 Mar 2019 10:29:28 +0000 (13:29 +0300)]
Fix test

5 years agoOrder users by nickname
Maxim Filippov [Sun, 17 Mar 2019 10:23:08 +0000 (13:23 +0300)]
Order users by nickname

5 years agoOrder users by nickname
Maxim Filippov [Sun, 17 Mar 2019 10:23:08 +0000 (13:23 +0300)]
Order users by nickname

5 years agoMerge branch 'feature/federated-flags' into 'develop'
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

5 years agoMerge branch 'feature/oauth-me' into 'develop'
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

5 years agoMerge branch 'feature/reblog-muting' into 'develop'
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

5 years agoMerge branch 'bugfix/ldap-test-fix' into 'develop'
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

5 years agotest: fix defective ldap setup/teardown
William Pitcock [Sat, 16 Mar 2019 04:05:19 +0000 (04:05 +0000)]
test: fix defective ldap setup/teardown

5 years agooauth: add me property to token responses
William Pitcock [Sat, 16 Mar 2019 01:12:50 +0000 (01:12 +0000)]
oauth: add me property to token responses

5 years agoMerge branch 'mark-notifications-as-read' into 'develop'
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

5 years agoAllow to mark a single notification as read
eugenijm [Fri, 15 Mar 2019 17:06:28 +0000 (20:06 +0300)]
Allow to mark a single notification as read

5 years agoMerge branch 'fix/mediaproxy-capture-content-disposition-filename' into 'develop'
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

5 years agoMerge branch 'feature/openldap-support' into 'develop'
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

5 years agoMerge branch 'enable-dedupe-by-default' into 'develop'
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

5 years agoMerge branch 'docs/ex_doc-929-wiki-imports' into 'develop'
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

5 years agoAdd tests for LDAP authorization
link0ff [Fri, 15 Mar 2019 14:28:46 +0000 (16:28 +0200)]
Add tests for LDAP authorization

5 years agoremove unused function
Karen Konou [Fri, 15 Mar 2019 14:03:03 +0000 (15:03 +0100)]
remove unused function

5 years agofix credo warning
Karen Konou [Fri, 15 Mar 2019 13:36:07 +0000 (14:36 +0100)]
fix credo warning

5 years agoformatting
Karen Konou [Fri, 15 Mar 2019 13:28:14 +0000 (14:28 +0100)]
formatting

5 years agoFix streamer test
Karen Konou [Fri, 15 Mar 2019 13:13:42 +0000 (14:13 +0100)]
Fix streamer test

5 years agoRefactor to store user ap_id, add tests
Karen Konou [Fri, 15 Mar 2019 13:06:58 +0000 (14:06 +0100)]
Refactor to store user ap_id, add tests

5 years agoformatting
Karen Konou [Mon, 11 Mar 2019 18:59:25 +0000 (19:59 +0100)]
formatting

5 years agorefactor filtering mechanism
Karen Konou [Mon, 11 Mar 2019 15:57:54 +0000 (16:57 +0100)]
refactor filtering mechanism

5 years agoFix elixir 1.8 vs 1.7 format conflict
Karen Konou [Sat, 9 Mar 2019 15:31:53 +0000 (16:31 +0100)]
Fix elixir 1.8 vs 1.7 format conflict

5 years agoAdd ActivityPub.contain_activity checks to streamer
Karen Konou [Sat, 9 Mar 2019 15:24:32 +0000 (16:24 +0100)]
Add ActivityPub.contain_activity checks to streamer

5 years agoFix tests to assume reblogs shown by default
Karen Konou [Sat, 9 Mar 2019 13:22:55 +0000 (14:22 +0100)]
Fix tests to assume reblogs shown by default

5 years agoImplement mastodon's reblog hiding feature
Karen Konou [Sat, 9 Mar 2019 13:08:41 +0000 (14:08 +0100)]
Implement mastodon's reblog hiding feature

5 years agoFix headers and add !929 docs to extras
Haelwenn (lanodan) Monnier [Fri, 15 Mar 2019 09:58:15 +0000 (10:58 +0100)]
Fix headers and add !929 docs to extras

[ci skip]

5 years agoMerge branch 'mastoapi/mime_type' into 'develop'
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

5 years agoEnable dedupe by default
rinpatch [Fri, 15 Mar 2019 09:11:13 +0000 (12:11 +0300)]
Enable dedupe by default

5 years agoExtend MastoAPI to provide attachment mimetypes
rinpatch [Fri, 15 Mar 2019 08:58:12 +0000 (11:58 +0300)]
Extend MastoAPI to provide attachment mimetypes

5 years agoContent-Disposition regex improvements
rinpatch [Fri, 15 Mar 2019 05:29:51 +0000 (08:29 +0300)]
Content-Disposition regex improvements

5 years agoMerge branch 'notifications-is-seen' into 'develop'
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

5 years agoMerge branch 'robotstxt' into 'develop'
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

5 years agorobots.txt
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.

5 years agoMediaProxy: parse filename from content-disposition for non-whitelisted types
rinpatch [Thu, 14 Mar 2019 22:36:29 +0000 (01:36 +0300)]
MediaProxy: parse filename from content-disposition for non-whitelisted types

5 years agoAdd `is_seen` to MastoAPI notifications, extract rendering logic into separate Notifi...
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

5 years agoMerge branch 'fix/filename-mangling' into 'develop'
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

5 years agoactivitypub: inject to/cc fields on non-forwarded reports since Flag activities are...
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

5 years agoreports: unify sending e-mail for both remote and local reports
William Pitcock [Thu, 14 Mar 2019 19:38:46 +0000 (19:38 +0000)]
reports: unify sending e-mail for both remote and local reports

5 years agoactivitypub: add support for forwarding reports
William Pitcock [Thu, 14 Mar 2019 19:29:47 +0000 (19:29 +0000)]
activitypub: add support for forwarding reports

5 years agoMerge develop to bump elixir version in the CI so I don't get failing formatting
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

5 years agocommon api: add support for forwarding reports
William Pitcock [Thu, 14 Mar 2019 19:29:33 +0000 (19:29 +0000)]
common api: add support for forwarding reports

5 years agoactivitypub: utils: also match Activity objects
William Pitcock [Thu, 14 Mar 2019 19:29:04 +0000 (19:29 +0000)]
activitypub: utils: also match Activity objects

5 years agoFix uploaded media plug test
rinpatch [Thu, 14 Mar 2019 19:26:54 +0000 (22:26 +0300)]
Fix uploaded media plug test

5 years agoactivitypub: transmogrifier: accept remote Flag activities
William Pitcock [Thu, 14 Mar 2019 19:06:02 +0000 (19:06 +0000)]
activitypub: transmogrifier: accept remote Flag activities

5 years agoactivitypub: utils: rework make_flag_data to accept either activity payloads or IRIs
William Pitcock [Thu, 14 Mar 2019 19:04:52 +0000 (19:04 +0000)]
activitypub: utils: rework make_flag_data to accept either activity payloads or IRIs

5 years agotest: add a test for accepting inbound Flag activities
William Pitcock [Thu, 14 Mar 2019 19:04:33 +0000 (19:04 +0000)]
test: add a test for accepting inbound Flag activities

5 years agoAdd some tests
rinpatch [Thu, 14 Mar 2019 19:02:48 +0000 (22:02 +0300)]
Add some tests

5 years agoMerge branch 'hotfix/delete-activities' into 'develop'
rinpatch [Thu, 14 Mar 2019 17:49:00 +0000 (17:49 +0000)]
Merge branch 'hotfix/delete-activities' into 'develop'

Fix delete activities not federating

See merge request pleroma/pleroma!933

5 years agoFix delete activities not federating
rinpatch [Thu, 14 Mar 2019 17:43:14 +0000 (20:43 +0300)]
Fix delete activities not federating

5 years agoMerge remote-tracking branch 'upstream/develop' into feature/openldap-support
link0ff [Thu, 14 Mar 2019 15:43:30 +0000 (17:43 +0200)]
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support

5 years agoMerge branch 'admin-api-account-view-namespace' into 'develop'
kaniini [Thu, 14 Mar 2019 02:01:10 +0000 (02:01 +0000)]
Merge branch 'admin-api-account-view-namespace' into 'develop'

MastodonAPI.Admin.AccountView → AdminAPI.AccountView

See merge request pleroma/pleroma!930

5 years agoMerge branch 'feature/add-local-to-users-admin-api' into 'develop'
kaniini [Thu, 14 Mar 2019 02:00:47 +0000 (02:00 +0000)]
Merge branch 'feature/add-local-to-users-admin-api' into 'develop'

Add "local" & "tags" to users admin API

See merge request pleroma/pleroma!932

5 years agoEnsure empty array is returned for tags
Maxim Filippov [Thu, 14 Mar 2019 00:17:09 +0000 (03:17 +0300)]
Ensure empty array is returned for tags

5 years agoAdd tags
Maxim Filippov [Wed, 13 Mar 2019 22:52:24 +0000 (01:52 +0300)]
Add tags

5 years agoMerge branch 'mastofe-content-types' into 'develop'
kaniini [Wed, 13 Mar 2019 22:04:23 +0000 (22:04 +0000)]
Merge branch 'mastofe-content-types' into 'develop'

Set content types settings on mastofe endpoint.

See merge request pleroma/pleroma!894

5 years agoMerge branch 'unify-accept-reject-unfollow' into 'develop'
kaniini [Wed, 13 Mar 2019 22:01:56 +0000 (22:01 +0000)]
Merge branch 'unify-accept-reject-unfollow' into 'develop'

Unify unfollow, accept and reject follow requests using CommonAPI

See merge request pleroma/pleroma!931

5 years agoUnify unfollow, accept and reject follow requests using CommonAPI
eugenijm [Wed, 13 Mar 2019 06:04:49 +0000 (09:04 +0300)]
Unify unfollow, accept and reject follow requests using CommonAPI

5 years agoAdd test when local is false
Maxim Filippov [Wed, 13 Mar 2019 14:56:15 +0000 (17:56 +0300)]
Add test when local is false

5 years agoFix test
Maxim Filippov [Wed, 13 Mar 2019 13:14:31 +0000 (16:14 +0300)]
Fix test

5 years agoAdd "local" to users admin API
Maxim Filippov [Wed, 13 Mar 2019 13:04:44 +0000 (16:04 +0300)]
Add "local" to users admin API

5 years agoMastodonAPI.Admin.AccountView → AdminAPI.AccountView
Haelwenn (lanodan) Monnier [Wed, 13 Mar 2019 03:13:28 +0000 (04:13 +0100)]
MastodonAPI.Admin.AccountView → AdminAPI.AccountView