akkoma
5 years agoWeb.OAuth.OAuthController: Fix scopes Enum.join for OAuth response
Haelwenn (lanodan) Monnier [Sat, 2 Mar 2019 03:04:16 +0000 (04:04 +0100)]
Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response

5 years agoMerge branch 'auto_linker' into 'develop'
kaniini [Tue, 26 Feb 2019 23:32:26 +0000 (23:32 +0000)]
Merge branch 'auto_linker' into 'develop'

AutoLinker

Closes #609

See merge request pleroma/pleroma!839

5 years agoAutoLinker
Egor [Tue, 26 Feb 2019 23:32:26 +0000 (23:32 +0000)]
AutoLinker

5 years agoMerge branch 'feature/more-actions-to-admin-api' into 'develop'
kaniini [Tue, 26 Feb 2019 23:31:53 +0000 (23:31 +0000)]
Merge branch 'feature/more-actions-to-admin-api' into 'develop'

Add list/toggle activation endpoints to AdminController

See merge request pleroma/pleroma!867

5 years agoAdd more admin actions
Maxim Filippov [Tue, 26 Feb 2019 21:13:38 +0000 (00:13 +0300)]
Add more admin actions

5 years agoMerge branch 'fix-nginx-listen-missing-ipv4' into 'develop'
kaniini [Tue, 26 Feb 2019 16:47:18 +0000 (16:47 +0000)]
Merge branch 'fix-nginx-listen-missing-ipv4' into 'develop'

need to put back ipv4 listen instruct

See merge request pleroma/pleroma!866

5 years agoneed to put back ipv4 listen instruct
Kenneth Zhao [Tue, 26 Feb 2019 16:41:37 +0000 (08:41 -0800)]
need to put back ipv4 listen instruct

5 years agoMerge branch 'nginx-cfg' into 'develop'
Haelwenn [Tue, 26 Feb 2019 06:56:29 +0000 (06:56 +0000)]
Merge branch 'nginx-cfg' into 'develop'

Add ipv6 handling to pleroma.nginx

See merge request pleroma/pleroma!865

5 years agoAdd ipv6 handling to pleroma.nginx
PEA [Tue, 26 Feb 2019 04:37:46 +0000 (23:37 -0500)]
Add ipv6 handling to pleroma.nginx

Replaces `listen 80` with `listen [::]:80`, same with 443

5 years agoMerge branch 'trivial/remove-io-inspect-spam' into 'develop'
kaniini [Sun, 24 Feb 2019 19:03:58 +0000 (19:03 +0000)]
Merge branch 'trivial/remove-io-inspect-spam' into 'develop'

twitter card: remove IO.inspect() spam

See merge request pleroma/pleroma!863

5 years agotwitter card: remove IO.inspect() spam
William Pitcock [Sun, 24 Feb 2019 18:53:49 +0000 (18:53 +0000)]
twitter card: remove IO.inspect() spam

5 years agoMerge branch 'add-apache-cache-config' into 'develop'
kaniini [Sat, 23 Feb 2019 04:01:21 +0000 (04:01 +0000)]
Merge branch 'add-apache-cache-config' into 'develop'

apache config: add instructions for mediaproxy.

See merge request pleroma/pleroma!856

5 years agoMerge branch 'card-handling' into 'develop'
kaniini [Sat, 23 Feb 2019 03:59:23 +0000 (03:59 +0000)]
Merge branch 'card-handling' into 'develop'

Private card handling

Closes #652

See merge request pleroma/pleroma!854

5 years agoMerge branch 'fix/meck' into 'develop'
kaniini [Sat, 23 Feb 2019 03:56:31 +0000 (03:56 +0000)]
Merge branch 'fix/meck' into 'develop'

Update meck to fix tests on MacOS

Closes #662

See merge request pleroma/pleroma!855

5 years agoapache config: add instructions for mediaproxy.
faried nawaz [Fri, 22 Feb 2019 19:18:03 +0000 (00:18 +0500)]
apache config: add instructions for mediaproxy.

5 years agoUpate meck to fix tests on MacOS
Mark Felder [Fri, 22 Feb 2019 17:26:47 +0000 (17:26 +0000)]
Upate meck to fix tests on MacOS

5 years agoMove visibility into own module.
lain [Fri, 22 Feb 2019 12:29:52 +0000 (13:29 +0100)]
Move visibility into own module.

5 years agoMerge branch 'oauth2_scopes_migration_hotfix' into 'develop'
href [Fri, 22 Feb 2019 11:16:10 +0000 (11:16 +0000)]
Merge branch 'oauth2_scopes_migration_hotfix' into 'develop'

Fixed `scopes` of apps / authorizations / tokens from apps initially created with space-delimited `scope`

Closes #660

See merge request pleroma/pleroma!853

5 years agoFix private post card handling.
lain [Fri, 22 Feb 2019 11:02:51 +0000 (12:02 +0100)]
Fix private post card handling.

5 years agoFixed `scopes` of apps / authorizations / tokens from apps initially created with...
Ivan Tashkinov [Fri, 22 Feb 2019 11:00:18 +0000 (14:00 +0300)]
Fixed `scopes` of apps / authorizations / tokens from apps initially created with space-delimited `scope`.

5 years agoMerge branch 'fix/twittercards' into 'develop'
kaniini [Fri, 22 Feb 2019 04:38:14 +0000 (04:38 +0000)]
Merge branch 'fix/twittercards' into 'develop'

Fix Twitter Cards

See merge request pleroma/pleroma!815

5 years agoMerge branch 'bugfix/outbox-bomb-on-empty-activities' into 'develop'
kaniini [Fri, 22 Feb 2019 04:37:48 +0000 (04:37 +0000)]
Merge branch 'bugfix/outbox-bomb-on-empty-activities' into 'develop'

Fix: Fixing an outbox related bug when local user activity is empty

See merge request pleroma/pleroma!849

5 years agoFix: Fixing an outbox related bug when local user activity is empty
KZ [Fri, 22 Feb 2019 04:37:48 +0000 (04:37 +0000)]
Fix: Fixing an outbox related bug when local user activity is empty

5 years agoMerge branch 'bugfix/httpsig-sign-date' into 'develop'
lambda [Thu, 21 Feb 2019 08:20:06 +0000 (08:20 +0000)]
Merge branch 'bugfix/httpsig-sign-date' into 'develop'

activitypub: sign date header

Closes #649 and #364

See merge request pleroma/pleroma!847

5 years agoMerge branch 'bugfix/as2-accept-json' into 'develop'
lambda [Thu, 21 Feb 2019 08:14:24 +0000 (08:14 +0000)]
Merge branch 'bugfix/as2-accept-json' into 'develop'

accept application/json mimetype for fetching AS2 objects

See merge request pleroma/pleroma!846

5 years agoMerge branch '2019-02-21-update-frontend' into 'develop'
lambda [Thu, 21 Feb 2019 08:11:06 +0000 (08:11 +0000)]
Merge branch '2019-02-21-update-frontend' into 'develop'

update frontend

See merge request pleroma/pleroma!850

5 years agoupdate frontend
lain [Thu, 21 Feb 2019 08:04:35 +0000 (09:04 +0100)]
update frontend

5 years agoactivitypub: sign http date header
William Pitcock [Thu, 21 Feb 2019 00:23:17 +0000 (00:23 +0000)]
activitypub: sign http date header

5 years agomix: add timex dependency
William Pitcock [Thu, 21 Feb 2019 00:19:49 +0000 (00:19 +0000)]
mix: add timex dependency

5 years agotests: fix formatting
William Pitcock [Wed, 20 Feb 2019 20:49:10 +0000 (20:49 +0000)]
tests: fix formatting

5 years agofix fetching AP objects with application/json
William Pitcock [Wed, 20 Feb 2019 20:45:40 +0000 (20:45 +0000)]
fix fetching AP objects with application/json

5 years agotests: add test for fetching AP objects with application/json.
William Pitcock [Wed, 20 Feb 2019 20:45:09 +0000 (20:45 +0000)]
tests: add test for fetching AP objects with application/json.

5 years agoMerge branch 'feature/improve-error-logging' into 'develop'
lambda [Wed, 20 Feb 2019 18:21:58 +0000 (18:21 +0000)]
Merge branch 'feature/improve-error-logging' into 'develop'

logging: improve visibility into ISE errors

See merge request pleroma/pleroma!845

5 years agologging: only return ISE reasons in API responses when in dev or test mode
William Pitcock [Wed, 20 Feb 2019 17:36:19 +0000 (17:36 +0000)]
logging: only return ISE reasons in API responses when in dev or test mode

5 years agotests: fix tests
William Pitcock [Wed, 20 Feb 2019 17:23:05 +0000 (17:23 +0000)]
tests: fix tests

5 years agologging: improve visibility into ISE errors
William Pitcock [Tue, 19 Feb 2019 21:31:27 +0000 (21:31 +0000)]
logging: improve visibility into ISE errors

5 years agoMerge branch 'feature/reports' into 'develop'
kaniini [Wed, 20 Feb 2019 16:51:25 +0000 (16:51 +0000)]
Merge branch 'feature/reports' into 'develop'

Reports

Closes #83

See merge request pleroma/pleroma!701

5 years agoReports
Egor [Wed, 20 Feb 2019 16:51:25 +0000 (16:51 +0000)]
Reports

5 years agoMerge branch 'nicer-share-urls' into 'develop'
kaniini [Wed, 20 Feb 2019 16:42:52 +0000 (16:42 +0000)]
Merge branch 'nicer-share-urls' into 'develop'

Add some nicer urls in status view.

See merge request pleroma/pleroma!844

5 years agoAdd some nicer urls in status view.
lain [Wed, 20 Feb 2019 16:36:16 +0000 (17:36 +0100)]
Add some nicer urls in status view.

5 years agoMerge branch '468_oauth2_scopes' into 'develop'
lambda [Wed, 20 Feb 2019 16:15:45 +0000 (16:15 +0000)]
Merge branch '468_oauth2_scopes' into 'develop'

[#468] OAuth2 scopes

Closes #468

See merge request pleroma/pleroma!799

5 years ago[#468] Added support for `push` OAuth scope (Mastodon 2.4+).
Ivan Tashkinov [Wed, 20 Feb 2019 14:27:41 +0000 (17:27 +0300)]
[#468] Added support for `push` OAuth scope (Mastodon 2.4+).

5 years ago[#468] Merged `upstream/develop`.
Ivan Tashkinov [Wed, 20 Feb 2019 13:48:59 +0000 (16:48 +0300)]
[#468] Merged `upstream/develop`.

5 years agoMerge branch 'muting' into 'develop'
lambda [Wed, 20 Feb 2019 13:19:37 +0000 (13:19 +0000)]
Merge branch 'muting' into 'develop'

Implement muting, add it to the whole mastodon API

See merge request pleroma/pleroma!319

5 years agoAdd test for User.mutes and so on.
lain [Wed, 20 Feb 2019 13:14:52 +0000 (14:14 +0100)]
Add test for User.mutes and so on.

5 years agoAdd test for muting functionality.
lain [Wed, 20 Feb 2019 12:47:44 +0000 (13:47 +0100)]
Add test for muting functionality.

5 years agoRemove superfluous migration.
lain [Wed, 20 Feb 2019 12:47:24 +0000 (13:47 +0100)]
Remove superfluous migration.

5 years ago[#468] Adjusted scope restriction for MastodonAPIController#index.
Ivan Tashkinov [Wed, 20 Feb 2019 11:05:02 +0000 (14:05 +0300)]
[#468] Adjusted scope restriction for MastodonAPIController#index.

5 years ago[#468] More OAuth scopes-specific tests.
Ivan Tashkinov [Wed, 20 Feb 2019 09:27:28 +0000 (12:27 +0300)]
[#468] More OAuth scopes-specific tests.

5 years agoMerge branch 'set-activation-status-admin-api' into 'develop'
kaniini [Tue, 19 Feb 2019 22:45:51 +0000 (22:45 +0000)]
Merge branch 'set-activation-status-admin-api' into 'develop'

Added admin API for changing user activation status

See merge request pleroma/pleroma!843

5 years agoUpdate the mute implementation to the current codebase
Ekaterina Vaartis [Tue, 19 Feb 2019 20:09:16 +0000 (23:09 +0300)]
Update the mute implementation to the current codebase

Make it part of the info thing (and do a migration to ensure it's there)

5 years ago[#468] Added OAuth scopes-specific tests.
Ivan Tashkinov [Tue, 19 Feb 2019 19:28:21 +0000 (22:28 +0300)]
[#468] Added OAuth scopes-specific tests.

5 years agoRemove unused "muted" parameter, use piping for mute/block fns
Ekaterina Vaartis [Mon, 3 Sep 2018 21:20:22 +0000 (00:20 +0300)]
Remove unused "muted" parameter, use piping for mute/block fns

5 years agoDo not unfollow muted users
Ekaterina Vaartis [Mon, 3 Sep 2018 21:17:25 +0000 (00:17 +0300)]
Do not unfollow muted users

5 years agoAdd test for mastodon muting endpoints
Ekaterina Vaartis [Sat, 1 Sep 2018 21:34:15 +0000 (00:34 +0300)]
Add test for mastodon muting endpoints

5 years agoImplement mastodon mutes endpoint
Ekaterina Vaartis [Sat, 1 Sep 2018 21:33:13 +0000 (00:33 +0300)]
Implement mastodon mutes endpoint

Aparently i forgot to add it, it gets a list of muted users

5 years agoImplement muting, add it to the mastodon API
Ekaterina Vaartis [Wed, 5 Sep 2018 20:49:15 +0000 (23:49 +0300)]
Implement muting, add it to the mastodon API

5 years agoPlayer: allow styles on CSP, loop videos
href [Tue, 19 Feb 2019 17:56:57 +0000 (18:56 +0100)]
Player: allow styles on CSP, loop videos

5 years agoCSP: Allow iframes on embed player
href [Tue, 19 Feb 2019 17:17:37 +0000 (18:17 +0100)]
CSP: Allow iframes on embed player

5 years agoMerge branch 'develop' into fix/twittercards
Mark Felder [Tue, 19 Feb 2019 16:58:28 +0000 (16:58 +0000)]
Merge branch 'develop' into fix/twittercards

5 years agoEmbed player suitable for Twitter Cards
href [Tue, 19 Feb 2019 16:39:42 +0000 (17:39 +0100)]
Embed player suitable for Twitter Cards

5 years agoAdded admin API for changing user activation status
eugenijm [Tue, 19 Feb 2019 15:40:57 +0000 (18:40 +0300)]
Added admin API for changing user activation status

5 years ago[#468] Merged `upstream/develop`.
Ivan Tashkinov [Tue, 19 Feb 2019 16:10:55 +0000 (19:10 +0300)]
[#468] Merged `upstream/develop`.

5 years agoMerge branch 'set-cache-on-user-tag-update' into 'develop'
lambda [Tue, 19 Feb 2019 14:20:58 +0000 (14:20 +0000)]
Merge branch 'set-cache-on-user-tag-update' into 'develop'

Update user cache when user tags are updated

See merge request pleroma/pleroma!840

5 years agoMerge branch 'fix/check-follower-collection-in-is_private' into 'develop'
lambda [Tue, 19 Feb 2019 14:08:19 +0000 (14:08 +0000)]
Merge branch 'fix/check-follower-collection-in-is_private' into 'develop'

properly check for follower address in is_private?

See merge request pleroma/pleroma!841

5 years agoMerge branch 'fix/ap_id-unique_constraint' into 'develop'
lambda [Tue, 19 Feb 2019 14:07:16 +0000 (14:07 +0000)]
Merge branch 'fix/ap_id-unique_constraint' into 'develop'

mark ap_id unique_constraint

See merge request pleroma/pleroma!842

5 years agomark ap_id unique_constraint
rinpatch [Tue, 19 Feb 2019 10:52:15 +0000 (13:52 +0300)]
mark ap_id unique_constraint

5 years agoproperly check for follower address in is_private?
rinpatch [Tue, 19 Feb 2019 10:23:13 +0000 (13:23 +0300)]
properly check for follower address in is_private?

5 years agoUpdate user cache when user tags are updated
eugenijm [Tue, 19 Feb 2019 07:43:37 +0000 (10:43 +0300)]
Update user cache when user tags are updated

5 years agoMerge branch 'feature/jobs' into 'develop'
kaniini [Mon, 18 Feb 2019 19:43:06 +0000 (19:43 +0000)]
Merge branch 'feature/jobs' into 'develop'

Job Queue

See merge request pleroma/pleroma!732

5 years agoMerge branch 'patch-image-description' into 'develop'
kaniini [Mon, 18 Feb 2019 04:11:46 +0000 (04:11 +0000)]
Merge branch 'patch-image-description' into 'develop'

Patch to support image descriptions for pleroma-fe

See merge request pleroma/pleroma!626

5 years agoMerge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
kaniini [Mon, 18 Feb 2019 04:02:41 +0000 (04:02 +0000)]
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'

Add OAuth tokens endpoint

See merge request pleroma/pleroma!805

5 years agoMerge branch 'features/flavour-switching' into 'develop'
kaniini [Mon, 18 Feb 2019 04:01:51 +0000 (04:01 +0000)]
Merge branch 'features/flavour-switching' into 'develop'

[MastoAPI] Add switching of frontend flavours

See merge request pleroma/pleroma!807

5 years agoMerge branch 'follow-request-count' into 'develop'
kaniini [Mon, 18 Feb 2019 04:01:26 +0000 (04:01 +0000)]
Merge branch 'follow-request-count' into 'develop'

Follow request count

See merge request pleroma/pleroma!817

5 years agoMerge branch 'csv-export' into 'develop'
kaniini [Mon, 18 Feb 2019 03:59:46 +0000 (03:59 +0000)]
Merge branch 'csv-export' into 'develop'

Add option to return all friends in twitter api.

Closes #602

See merge request pleroma/pleroma!833

5 years agoFix test
Maxim Filippov [Sun, 17 Feb 2019 21:10:48 +0000 (00:10 +0300)]
Fix test

5 years agoRender only "id", "valid_until" and "app_name" in TokenView
Maxim Filippov [Sun, 17 Feb 2019 20:57:35 +0000 (23:57 +0300)]
Render only "id", "valid_until" and "app_name" in TokenView

5 years agoMerge branch 'docs/add-clients-to-ex_doc' into 'develop'
lambda [Sun, 17 Feb 2019 17:53:57 +0000 (17:53 +0000)]
Merge branch 'docs/add-clients-to-ex_doc' into 'develop'

mix.exs: Add docs/Clients.md to docs.extras

See merge request pleroma/pleroma!835

5 years agoMerge branch 'develop' into 'docs/add-clients-to-ex_doc'
lambda [Sun, 17 Feb 2019 17:39:45 +0000 (17:39 +0000)]
Merge branch 'develop' into 'docs/add-clients-to-ex_doc'

# Conflicts:
#   mix.exs

5 years agoMerge branch 'docker-speedup' into 'develop'
lambda [Sun, 17 Feb 2019 17:38:25 +0000 (17:38 +0000)]
Merge branch 'docker-speedup' into 'develop'

Docker speedup

See merge request pleroma/pleroma!837

5 years agoMerge branch 'mastoapi-stop-capping-attachments' into 'develop'
lambda [Sun, 17 Feb 2019 17:37:48 +0000 (17:37 +0000)]
Merge branch 'mastoapi-stop-capping-attachments' into 'develop'

Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla Mastodon

See merge request pleroma/pleroma!834

5 years agoUpdate Differences-in-MastodonAPI-Responses.md
lambda [Sun, 17 Feb 2019 17:01:22 +0000 (17:01 +0000)]
Update Differences-in-MastodonAPI-Responses.md

5 years agoMerge branch 'fix/hellthread-policy-recipient-check' into 'develop'
lambda [Sun, 17 Feb 2019 16:57:57 +0000 (16:57 +0000)]
Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'

Fix recipient count in hellthread policy

See merge request pleroma/pleroma!836

5 years agoMore speedup, test fixes.
lain [Sun, 17 Feb 2019 16:47:24 +0000 (17:47 +0100)]
More speedup, test fixes.

5 years agomore tests for HellthreadPolicy
rinpatch [Sun, 17 Feb 2019 11:33:44 +0000 (14:33 +0300)]
more tests for HellthreadPolicy

5 years ago[#468] Formatting fix.
Ivan Tashkinov [Sun, 17 Feb 2019 11:07:35 +0000 (14:07 +0300)]
[#468] Formatting fix.

5 years ago[#468] Merged `upstream/develop`, resolved conflicts.
Ivan Tashkinov [Sun, 17 Feb 2019 11:07:04 +0000 (14:07 +0300)]
[#468] Merged `upstream/develop`, resolved conflicts.

5 years ago[#468] Refactored OAuth scopes' defaults & missing selection handling.
Ivan Tashkinov [Sun, 17 Feb 2019 10:49:14 +0000 (13:49 +0300)]
[#468] Refactored OAuth scopes' defaults & missing selection handling.

5 years agoSpeed up docker postgres.
lain [Sun, 17 Feb 2019 10:36:14 +0000 (11:36 +0100)]
Speed up docker postgres.

5 years agoFix recipient count in hellthread policy
rinpatch [Sun, 17 Feb 2019 10:46:40 +0000 (13:46 +0300)]
Fix recipient count in hellthread policy

5 years agoFix formating
rinpatch [Sun, 17 Feb 2019 09:07:49 +0000 (12:07 +0300)]
Fix formating

5 years agoAdd differences in MastoAPI responses to mix.exs extras
rinpatch [Sun, 17 Feb 2019 07:34:00 +0000 (10:34 +0300)]
Add differences in MastoAPI responses to mix.exs extras

5 years agoWeb.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching
Haelwenn (lanodan) Monnier [Sun, 10 Feb 2019 22:11:12 +0000 (23:11 +0100)]
Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching

5 years ago[MastoAPI] Add switching of frontend flavours
Haelwenn (lanodan) Monnier [Sun, 3 Feb 2019 11:31:12 +0000 (12:31 +0100)]
[MastoAPI] Add switching of frontend flavours

5 years agomix.exs: Add docs/Clients.md to docs.extras
Haelwenn (lanodan) Monnier [Sat, 16 Feb 2019 18:39:03 +0000 (19:39 +0100)]
mix.exs: Add docs/Clients.md to docs.extras

[ci skip]

5 years agoAdd a section on how to identify a pleroma instance, clarify that post upload limit...
rinpatch [Sat, 16 Feb 2019 18:14:07 +0000 (21:14 +0300)]
Add a section on how to identify a pleroma instance, clarify that post upload limit is not capped too

5 years agoMerge branch 'welcome-message' into 'develop'
rinpatch [Sat, 16 Feb 2019 17:39:04 +0000 (17:39 +0000)]
Merge branch 'welcome-message' into 'develop'

Add optional welcome message.

See merge request pleroma/pleroma!832

5 years agoRemove a limit on attachments in Mastodon API and document the changes in responses...
rinpatch [Sat, 16 Feb 2019 17:38:25 +0000 (20:38 +0300)]
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon

5 years agoWelcomeMessage: specify that the user has to be local.
lain [Sat, 16 Feb 2019 16:25:06 +0000 (17:25 +0100)]
WelcomeMessage: specify that the user has to be local.

5 years agoWelcomeMessage: Get rid of Ecto reference.
lain [Sat, 16 Feb 2019 16:24:48 +0000 (17:24 +0100)]
WelcomeMessage: Get rid of Ecto reference.