akkoma
5 years ago[#923] Nickname & email selection for external registrations, option to connect to...
Ivan Tashkinov [Wed, 20 Mar 2019 07:35:31 +0000 (10:35 +0300)]
[#923] Nickname & email selection for external registrations, option to connect to existing account.

5 years ago[#923] Registration validations & unique index on [:user_id, :provider].
Ivan Tashkinov [Mon, 18 Mar 2019 17:31:24 +0000 (20:31 +0300)]
[#923] Registration validations & unique index on [:user_id, :provider].

5 years ago[#923] External User registration refactoring, password randomization.
Ivan Tashkinov [Mon, 18 Mar 2019 15:09:53 +0000 (18:09 +0300)]
[#923] External User registration refactoring, password randomization.

5 years ago[#923] Support for multiple (external) registrations per user via Registration.
Ivan Tashkinov [Mon, 18 Mar 2019 14:23:38 +0000 (17:23 +0300)]
[#923] Support for multiple (external) registrations per user via Registration.

5 years ago[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
Ivan Tashkinov [Mon, 18 Mar 2019 07:26:41 +0000 (10:26 +0300)]
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex

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/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 agoMerge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
Ivan Tashkinov [Fri, 15 Mar 2019 14:11:00 +0000 (17:11 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

5 years ago[#923] OAuth: prototype of sign in / sign up with Twitter.
Ivan Tashkinov [Fri, 15 Mar 2019 14:08:03 +0000 (17:08 +0300)]
[#923] OAuth: prototype of sign in / sign up with Twitter.

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

5 years agoMerge branch 'features/add-credo-to-ci' into 'develop'
lambda [Wed, 13 Mar 2019 09:09:44 +0000 (09:09 +0000)]
Merge branch 'features/add-credo-to-ci' into 'develop'

Add credo to CI

See merge request pleroma/pleroma!902

5 years agoPleroma.Web.TwitterAPI.Controller: Remove duplicated alias/es
Haelwenn (lanodan) Monnier [Thu, 7 Mar 2019 23:34:36 +0000 (00:34 +0100)]
Pleroma.Web.TwitterAPI.Controller: Remove duplicated alias/es

5 years ago.gitlab-ci.yml: Use --strict instead of list
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 05:11:21 +0000 (06:11 +0100)]
.gitlab-ci.yml: Use --strict instead of list

This makes the output to be more compact while not loosing readability
--format=flycheck // --format=json could also be used but they are
not very human readable

5 years ago[Credo][CI] Add readability as it’s fixed
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 05:07:21 +0000 (06:07 +0100)]
[Credo][CI] Add readability as it’s fixed

5 years ago[Credo] Change quoted string with 3+ quotes to sigils
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 04:44:53 +0000 (05:44 +0100)]
[Credo] Change quoted string with 3+ quotes to sigils

5 years ago[Credo] fix Credo.Check.Readability.MaxLineLength
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 04:37:33 +0000 (05:37 +0100)]
[Credo] fix Credo.Check.Readability.MaxLineLength

5 years ago[Credo] write large numbers with underscore separation
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 04:03:13 +0000 (05:03 +0100)]
[Credo] write large numbers with underscore separation

5 years ago[Credo] make all variables use snake_case
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 03:36:19 +0000 (04:36 +0100)]
[Credo] make all variables use snake_case

5 years ago[Credo] Remove parentesis on argument-less functions
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 03:18:43 +0000 (04:18 +0100)]
[Credo] Remove parentesis on argument-less functions

5 years ago[Credo] fix Credo.Check.Readability.AliasOrder
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 02:52:23 +0000 (03:52 +0100)]
[Credo] fix Credo.Check.Readability.AliasOrder

5 years ago[Credo] Fix the consistency
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 01:45:07 +0000 (02:45 +0100)]
[Credo] Fix the consistency

5 years ago.credo.exs: Clear removed tests
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 01:38:42 +0000 (02:38 +0100)]
.credo.exs: Clear removed tests

5 years ago[Credo][CI] Do not make TODO/FIXME fail
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 01:32:12 +0000 (02:32 +0100)]
[Credo][CI] Do not make TODO/FIXME fail

5 years ago[Credo] Fix the warnings
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 01:30:19 +0000 (02:30 +0100)]
[Credo] Fix the warnings

5 years ago.gitlab-ci.yml: Adds credo to the chain
Haelwenn (lanodan) Monnier [Tue, 5 Mar 2019 01:24:12 +0000 (02:24 +0100)]
.gitlab-ci.yml: Adds credo to the chain

Not really sure about the order in which this is but it feels right
because credo is more about checking if a ~working code could need
some improvements.<M-1>

5 years agoMerge branch 'feature/add-roles-to-users-admin-api' into 'develop'
kaniini [Tue, 12 Mar 2019 19:50:51 +0000 (19:50 +0000)]
Merge branch 'feature/add-roles-to-users-admin-api' into 'develop'

Add "roles" to users admin API

See merge request pleroma/pleroma!928

5 years agoAdd "roles" to users admin API
Maxim Filippov [Tue, 12 Mar 2019 19:15:28 +0000 (22:15 +0300)]
Add "roles" to users admin API

5 years agoMerge branch 'masto-api-followers-following' into 'develop'
kaniini [Tue, 12 Mar 2019 16:27:47 +0000 (16:27 +0000)]
Merge branch 'masto-api-followers-following' into 'develop'

MastoAPI followers/following endpoints

See merge request pleroma/pleroma!924

5 years agoSupport LDAP method start_tls
link0ff [Tue, 12 Mar 2019 16:20:02 +0000 (18:20 +0200)]
Support LDAP method start_tls

5 years agoMastoAPI followers/following endpoints
eugenijm [Mon, 11 Mar 2019 18:03:30 +0000 (21:03 +0300)]
MastoAPI followers/following endpoints

5 years agoFix upload tests
rinpatch [Tue, 12 Mar 2019 12:33:15 +0000 (15:33 +0300)]
Fix upload tests

5 years agoescape quotation marks in Content-Disposition header
rinpatch [Tue, 12 Mar 2019 06:21:13 +0000 (09:21 +0300)]
escape quotation marks in Content-Disposition header

5 years agoWIP: Stop mangling filenames
rinpatch [Tue, 12 Mar 2019 06:10:19 +0000 (09:10 +0300)]
WIP: Stop mangling filenames

5 years agoMerge branch 'add-screenname-extension-to-masto-api' into 'develop'
kaniini [Mon, 11 Mar 2019 21:43:46 +0000 (21:43 +0000)]
Merge branch 'add-screenname-extension-to-masto-api' into 'develop'

MastoAPI Accounts: Add fetching by nickname.

See merge request pleroma/pleroma!922

5 years agoMerge branch 'add-activity-id-to-push-messages' into 'develop'
kaniini [Mon, 11 Mar 2019 21:43:06 +0000 (21:43 +0000)]
Merge branch 'add-activity-id-to-push-messages' into 'develop'

WebPush: Add activity id to the push messages.

See merge request pleroma/pleroma!925

5 years agoMerge branch 'ci-switch-to-elixir-1-8-1' into 'develop'
rinpatch [Mon, 11 Mar 2019 19:40:45 +0000 (19:40 +0000)]
Merge branch 'ci-switch-to-elixir-1-8-1' into 'develop'

Switch the CI to Elixir 1.8.1

See merge request pleroma/pleroma!926

5 years agoSwitch the CI to Elixir 1.8.1
rinpatch [Mon, 11 Mar 2019 19:36:02 +0000 (22:36 +0300)]
Switch the CI to Elixir 1.8.1

5 years agoLinting.
lain [Mon, 11 Mar 2019 18:32:21 +0000 (19:32 +0100)]
Linting.

5 years agoWebPush: Add activity id to the push messages.
lain [Mon, 11 Mar 2019 18:23:21 +0000 (19:23 +0100)]
WebPush: Add activity id to the push messages.

Makes it easier to relate the push to a given status.

5 years agoSign in via Twitter (WIP).
Ivan Tashkinov [Mon, 11 Mar 2019 17:37:26 +0000 (20:37 +0300)]
Sign in via Twitter (WIP).

5 years agoMastoAPI Accounts: Add fetching by nickname.
lain [Mon, 11 Mar 2019 14:18:32 +0000 (15:18 +0100)]
MastoAPI Accounts: Add fetching by nickname.

This is to make it easier for the frontends to handle domain.com/users/nickname
urls.