akkoma
5 years agoMerge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
Sadposter [Wed, 10 Apr 2019 10:27:41 +0000 (11:27 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

5 years agoMerge branch 'feature/767-multiple-use-invite-token' into 'develop'
lambda [Wed, 10 Apr 2019 10:10:08 +0000 (10:10 +0000)]
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'

Feature/767 multiple use invite token

See merge request pleroma/pleroma!1032

5 years agoMerge branch 'feature/user-status-subscriptions' into 'develop'
lambda [Wed, 10 Apr 2019 10:04:20 +0000 (10:04 +0000)]
Merge branch 'feature/user-status-subscriptions' into 'develop'

Add ability to subscribe to users

See merge request pleroma/pleroma!1024

5 years agoMerge branch 'develop' into feature/user-status-subscriptions
Sadposter [Wed, 10 Apr 2019 09:44:54 +0000 (10:44 +0100)]
Merge branch 'develop' into feature/user-status-subscriptions

5 years agoMerge branch 'fix/emoji-api-nonsense' into 'develop'
lambda [Wed, 10 Apr 2019 06:22:51 +0000 (06:22 +0000)]
Merge branch 'fix/emoji-api-nonsense' into 'develop'

Change response format of /api/pleroma/emoji so it makes sense

See merge request pleroma/pleroma!1038

5 years agoMerge branch 'hotfix/fix_undefined_summary' into 'develop'
kaniini [Wed, 10 Apr 2019 02:10:47 +0000 (02:10 +0000)]
Merge branch 'hotfix/fix_undefined_summary' into 'develop'

transmogrifier.ex: Add fix_summary/1

See merge request pleroma/pleroma!1039

5 years agoMerge branch 'notification-pleroma-settings' into 'develop'
kaniini [Wed, 10 Apr 2019 02:10:31 +0000 (02:10 +0000)]
Merge branch 'notification-pleroma-settings' into 'develop'

Notification controls

Closes #738

See merge request pleroma/pleroma!988

5 years agotransmogrifier.ex: Add fix_summary/1
Haelwenn (lanodan) Monnier [Wed, 10 Apr 2019 00:32:04 +0000 (02:32 +0200)]
transmogrifier.ex: Add fix_summary/1

MRF.KeywordPolicy assumes that summary is present in a activity,
and this would probably simplify code elsewhere too anyway.

5 years agoChange response format of /api/pleroma/emoji to the one that actually makes sense
rinpatch [Tue, 9 Apr 2019 20:20:31 +0000 (23:20 +0300)]
Change response format of /api/pleroma/emoji to the one that actually makes sense

5 years agoMerge branch 'mastoapi/plaintext-statuses' into 'develop'
rinpatch [Tue, 9 Apr 2019 17:25:31 +0000 (17:25 +0000)]
Merge branch 'mastoapi/plaintext-statuses' into 'develop'

Provide plaintext representations of content/cw in MastoAPI

Closes #787

See merge request pleroma/pleroma!1035

5 years agoMerge branch 'bugfix/follower_count' into 'develop'
lambda [Tue, 9 Apr 2019 07:30:38 +0000 (07:30 +0000)]
Merge branch 'bugfix/follower_count' into 'develop'

update the follower count when a follower is blocked

See merge request pleroma/pleroma!1033

5 years agoupdate the follower count when a follower is blocked
Sachin Joshi [Mon, 8 Apr 2019 09:31:18 +0000 (15:16 +0545)]
update the follower count when a follower is blocked

5 years agoUsed cached user resources in subscriptions
Sadposter [Mon, 8 Apr 2019 14:56:14 +0000 (15:56 +0100)]
Used cached user resources in subscriptions

5 years agoremoving not needed invite update
Alex S [Mon, 8 Apr 2019 13:08:16 +0000 (20:08 +0700)]
removing not needed invite update

5 years agofix for elixir 1.7.4
Alex S [Mon, 8 Apr 2019 12:16:59 +0000 (19:16 +0700)]
fix for elixir 1.7.4

5 years agoUse Pleroma.Config instead of Application.get_env
Sadposter [Mon, 8 Apr 2019 12:04:30 +0000 (13:04 +0100)]
Use Pleroma.Config instead of Application.get_env

5 years agoMerge branch 'use-jobs-in-webpush' into 'develop'
lambda [Mon, 8 Apr 2019 11:53:18 +0000 (11:53 +0000)]
Merge branch 'use-jobs-in-webpush' into 'develop'

Use PleromaJobQueue in Pleroma.Web.Push

See merge request pleroma/pleroma!1023

5 years agoMerge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
Egor Kislitsyn [Mon, 8 Apr 2019 11:48:10 +0000 (18:48 +0700)]
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush

5 years agoSever subscription in case of block
Sadposter [Mon, 8 Apr 2019 11:46:12 +0000 (12:46 +0100)]
Sever subscription in case of block

5 years agoMerge branch 'improve_upgrade_user_from_ap_id' into 'develop'
lambda [Mon, 8 Apr 2019 11:42:20 +0000 (11:42 +0000)]
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'

Improve Transmogrifier.upgrade_user_from_ap_id/2

See merge request pleroma/pleroma!1019

5 years agoMerge branch 'twitter_oauth' into 'develop'
lambda [Mon, 8 Apr 2019 11:41:50 +0000 (11:41 +0000)]
Merge branch 'twitter_oauth' into 'develop'

OAuth consumer (sign in / sign up with external provider)

See merge request pleroma/pleroma!923

5 years agoMerge branch 'feature/697-language-tag-metadata' into 'develop'
lambda [Mon, 8 Apr 2019 11:03:10 +0000 (11:03 +0000)]
Merge branch 'feature/697-language-tag-metadata' into 'develop'

adding language tag

See merge request pleroma/pleroma!1034

5 years agoadding language tag
Alexander Strizhakov [Mon, 8 Apr 2019 11:03:10 +0000 (11:03 +0000)]
adding language tag

5 years agotest for valid_invite?
Alex S [Mon, 8 Apr 2019 10:06:04 +0000 (17:06 +0700)]
test for valid_invite?

5 years agoMerge branch 'feature/770-add-emoji-tags' into 'develop'
lambda [Mon, 8 Apr 2019 09:50:00 +0000 (09:50 +0000)]
Merge branch 'feature/770-add-emoji-tags' into 'develop'

Feature/770 add emoji tags

See merge request pleroma/pleroma!998

5 years agoMerge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
Egor Kislitsyn [Mon, 8 Apr 2019 09:46:59 +0000 (16:46 +0700)]
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush

5 years agoAdminApiControllerTest unused variables fix.
Ivan Tashkinov [Mon, 8 Apr 2019 09:32:55 +0000 (12:32 +0300)]
AdminApiControllerTest unused variables fix.

5 years agoMerge branch 'develop' into use-jobs-in-webpush
Egor Kislitsyn [Mon, 8 Apr 2019 09:29:20 +0000 (16:29 +0700)]
Merge branch 'develop' into use-jobs-in-webpush

5 years ago[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
Ivan Tashkinov [Mon, 8 Apr 2019 09:20:26 +0000 (12:20 +0300)]
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

# Conflicts:
# docs/config.md
# test/support/factory.ex

5 years agoMerge branch 'develop' into 'improve_upgrade_user_from_ap_id'
lambda [Mon, 8 Apr 2019 09:18:01 +0000 (09:18 +0000)]
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'

# Conflicts:
#   config/config.exs
#   docs/config.md

5 years agoMerge branch 'scheduled-activities' into 'develop'
lambda [Mon, 8 Apr 2019 09:08:18 +0000 (09:08 +0000)]
Merge branch 'scheduled-activities' into 'develop'

Scheduled activities

See merge request pleroma/pleroma!989

5 years agorenaming expire_at -> expires_at
Alex S [Mon, 8 Apr 2019 09:01:28 +0000 (16:01 +0700)]
renaming expire_at -> expires_at

keyword style change

5 years agoAdd check on activity visibility in sub notification
Sadposter [Sun, 7 Apr 2019 14:11:29 +0000 (15:11 +0100)]
Add check on activity visibility in sub notification

5 years agocredo fix
Alex S [Sun, 7 Apr 2019 13:59:53 +0000 (20:59 +0700)]
credo fix

5 years agoadded docs to docs/api/admin_api.md
Alex S [Sun, 7 Apr 2019 12:48:52 +0000 (19:48 +0700)]
added docs to docs/api/admin_api.md

code style and little renamings

5 years ago[#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings...
Ivan Tashkinov [Sun, 7 Apr 2019 08:08:37 +0000 (11:08 +0300)]
[#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.

5 years agoMerge branch 'fix/deactivated-user-error' into 'develop'
feld [Sat, 6 Apr 2019 22:19:30 +0000 (22:19 +0000)]
Merge branch 'fix/deactivated-user-error' into 'develop'

Return 403 for deactivated user on token request

Closes #785

See merge request pleroma/pleroma!1031

5 years agoAdd scheduler for sending scheduled activities to the queue
eugenijm [Wed, 3 Apr 2019 15:55:04 +0000 (18:55 +0300)]
Add scheduler for sending scheduled activities to the queue

5 years agoAdded limits and media attachments for scheduled activities.
eugenijm [Mon, 1 Apr 2019 22:31:01 +0000 (01:31 +0300)]
Added limits and media attachments for scheduled activities.

5 years agoHandle `scheduled_at` on status creation.
eugenijm [Sat, 30 Mar 2019 09:58:40 +0000 (12:58 +0300)]
Handle `scheduled_at` on status creation.

5 years agoAdd scheduled activities
eugenijm [Thu, 28 Mar 2019 09:39:10 +0000 (12:39 +0300)]
Add scheduled activities

5 years agoReturn 403 on oauth token exchange for a deactivated user
eugenijm [Fri, 5 Apr 2019 21:22:42 +0000 (00:22 +0300)]
Return 403 on oauth token exchange for a deactivated user

5 years agoMerge branch 'fix/failed-legacy-test' into 'develop'
feld [Sat, 6 Apr 2019 16:03:35 +0000 (16:03 +0000)]
Merge branch 'fix/failed-legacy-test' into 'develop'

Mock :crypt.crypt/2 to pass LegacyAuthenticationPlugTest on Mac OS

See merge request pleroma/pleroma!1030

5 years agolittle channges
Alex S [Sat, 6 Apr 2019 15:38:35 +0000 (22:38 +0700)]
little channges

5 years agoJSON need quotes!
Sadposter [Sat, 6 Apr 2019 15:24:21 +0000 (16:24 +0100)]
JSON need quotes!

5 years agoDocument subscription endpoints, fix typos
Sadposter [Sat, 6 Apr 2019 15:20:06 +0000 (16:20 +0100)]
Document subscription endpoints, fix typos

Also adds a quick error case on the subscription endpoints
to avoid 500s

5 years agoMerge branch 'feature/prometheus' into 'develop'
feld [Sat, 6 Apr 2019 14:51:46 +0000 (14:51 +0000)]
Merge branch 'feature/prometheus' into 'develop'

Upstream: Metrics and debugging

See merge request pleroma/pleroma!1020

5 years agoPin recon dependency to 2.4.0
Mark Felder [Sat, 6 Apr 2019 14:30:36 +0000 (09:30 -0500)]
Pin recon dependency to 2.4.0

5 years agofix for field name
Alex S [Sat, 6 Apr 2019 13:49:43 +0000 (20:49 +0700)]
fix for field name

5 years agocode style
Alex S [Sat, 6 Apr 2019 13:47:05 +0000 (20:47 +0700)]
code style

5 years agoMerge develop to 770-add-emoji-tags
Alex S [Sat, 6 Apr 2019 13:34:00 +0000 (20:34 +0700)]
Merge develop to 770-add-emoji-tags

Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs

5 years agoadmin api endpoints for invites
Alex S [Sat, 6 Apr 2019 13:25:19 +0000 (20:25 +0700)]
admin api endpoints for invites

5 years agotoken -> invite renaming
Alex S [Sat, 6 Apr 2019 13:24:22 +0000 (20:24 +0700)]
token -> invite renaming

5 years agotwitter api registration
Alex S [Sat, 6 Apr 2019 10:18:59 +0000 (17:18 +0700)]
twitter api registration

fix for twitter api tests

5 years agogenerating tokens with mix
Alex S [Sat, 6 Apr 2019 09:58:22 +0000 (16:58 +0700)]
generating tokens with mix

5 years agoMerge branch 'feature/mastofe-redurect-to-referer-after-login' into 'develop'
Haelwenn [Fri, 5 Apr 2019 23:36:42 +0000 (23:36 +0000)]
Merge branch 'feature/mastofe-redurect-to-referer-after-login' into 'develop'

Redirect to the referer url after mastofe authorization

Closes #717

See merge request pleroma/pleroma!1025

5 years agoRedirect to the referer url after mastofe authorization
Sergey Suprunenko [Fri, 5 Apr 2019 23:36:42 +0000 (23:36 +0000)]
Redirect to the referer url after mastofe authorization

5 years agoMock :crypt.crypt/2 because otherwise the test fails on Mac OS
Sergey Suprunenko [Fri, 5 Apr 2019 20:40:30 +0000 (22:40 +0200)]
Mock :crypt.crypt/2 because otherwise the test fails on Mac OS

5 years agoMerge branch 'revert-8607ae68' into 'develop'
rinpatch [Fri, 5 Apr 2019 20:04:16 +0000 (20:04 +0000)]
Merge branch 'revert-8607ae68' into 'develop'

Revert "Merge branch 'test-coverage' into 'develop'"

See merge request pleroma/pleroma!1028

5 years agoRevert "Merge branch 'test-coverage' into 'develop'"
rinpatch [Fri, 5 Apr 2019 19:59:03 +0000 (19:59 +0000)]
Revert "Merge branch 'test-coverage' into 'develop'"

This reverts merge request !1027

5 years agoMerge branch 'test-coverage' into 'develop'
rinpatch [Fri, 5 Apr 2019 19:49:20 +0000 (19:49 +0000)]
Merge branch 'test-coverage' into 'develop'

Use --cover option when running CI tests

See merge request pleroma/pleroma!1027

5 years agoUse --cover option when running CI tests
optikfluffel [Fri, 5 Apr 2019 18:12:44 +0000 (20:12 +0200)]
Use --cover option when running CI tests

5 years agoMerge branch 'feature/admin-api-follow' into 'develop'
feld [Fri, 5 Apr 2019 17:15:55 +0000 (17:15 +0000)]
Merge branch 'feature/admin-api-follow' into 'develop'

Feature/admin api follow

See merge request pleroma/pleroma!1026

5 years agoWe actually want the user id not nickname in the test...
Mark Felder [Fri, 5 Apr 2019 17:11:19 +0000 (12:11 -0500)]
We actually want the user id not nickname in the test...

5 years agoAlso remove Repo functions in the tests
Mark Felder [Fri, 5 Apr 2019 16:59:56 +0000 (11:59 -0500)]
Also remove Repo functions in the tests

5 years agoRedundant Repo.get_by usage was recently removed from the codebase
Mark Felder [Fri, 5 Apr 2019 16:41:41 +0000 (11:41 -0500)]
Redundant Repo.get_by usage was recently removed from the codebase

5 years agoAdd index on subscribers
Sadposter [Fri, 5 Apr 2019 16:30:54 +0000 (17:30 +0100)]
Add index on subscribers

5 years agoDocument the admin API endpoints for controlling follow/unfollow
Mark Felder [Fri, 5 Apr 2019 16:29:34 +0000 (11:29 -0500)]
Document the admin API endpoints for controlling follow/unfollow

5 years agoAdd user following / unfollowing to the admin api.
Roger Braun [Sun, 16 Dec 2018 15:41:56 +0000 (16:41 +0100)]
Add user following / unfollowing to the admin api.

5 years agoMix format everything
Sadposter [Fri, 5 Apr 2019 16:07:58 +0000 (17:07 +0100)]
Mix format everything

5 years agoDon't use twitterAPI for subscription tests
Sadposter [Fri, 5 Apr 2019 16:00:41 +0000 (17:00 +0100)]
Don't use twitterAPI for subscription tests

5 years agoChange relationship direction of subscriptions
Sadposter [Fri, 5 Apr 2019 15:51:45 +0000 (16:51 +0100)]
Change relationship direction of subscriptions

5 years agoMove subscriptions endpoint to be under /pleroma
Sadposter [Fri, 5 Apr 2019 14:58:44 +0000 (15:58 +0100)]
Move subscriptions endpoint to be under /pleroma

5 years agoAdd subscription key to one test I forgot about
Sadposter [Fri, 5 Apr 2019 14:37:00 +0000 (15:37 +0100)]
Add subscription key to one test I forgot about

5 years agoFormat subscriptions related stuff
Sadposter [Fri, 5 Apr 2019 14:22:48 +0000 (15:22 +0100)]
Format subscriptions related stuff

5 years agoAdd subscribed status to user view
Sadposter [Fri, 5 Apr 2019 14:21:33 +0000 (15:21 +0100)]
Add subscribed status to user view

Added in pleroma extensions, but can be moved whenever

5 years agoAdd tests for subscriptions
Sadposter [Fri, 5 Apr 2019 14:14:19 +0000 (15:14 +0100)]
Add tests for subscriptions

5 years agoMake subscriptions the same direction as blocks
Sadposter [Fri, 5 Apr 2019 13:59:34 +0000 (14:59 +0100)]
Make subscriptions the same direction as blocks

That being, user - subscribes to -> users, rather than
user - has subscribers -> users

5 years agoFix subscription endpoint return formats
Sadposter [Fri, 5 Apr 2019 13:27:26 +0000 (14:27 +0100)]
Fix subscription endpoint return formats

5 years agoAdd notification checks
Sadposter [Fri, 5 Apr 2019 13:20:13 +0000 (14:20 +0100)]
Add notification checks

5 years agoAdd API endpoints and user column for subscription
Sadposter [Fri, 5 Apr 2019 12:49:33 +0000 (13:49 +0100)]
Add API endpoints and user column for subscription

5 years agofix credo
Egor Kislitsyn [Fri, 5 Apr 2019 12:46:28 +0000 (19:46 +0700)]
fix credo

5 years agoMerge branch 'hotfix/html-sanitization' into 'develop'
lambda [Fri, 5 Apr 2019 12:43:57 +0000 (12:43 +0000)]
Merge branch 'hotfix/html-sanitization' into 'develop'

Refactor html caching functions to use a key instead of a module, use more correct terminology and fix summaries in mastoapi

See merge request pleroma/pleroma!1022

5 years agoUse PleromaJobQueue in Pleroma.Web.Push
Egor Kislitsyn [Fri, 5 Apr 2019 12:38:44 +0000 (19:38 +0700)]
Use PleromaJobQueue in Pleroma.Web.Push

5 years agoRefactor html caching functions to have a key instead of a module, use more correct...
rinpatch [Fri, 5 Apr 2019 12:19:44 +0000 (15:19 +0300)]
Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi

5 years ago[#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
Ivan Tashkinov [Fri, 5 Apr 2019 12:12:02 +0000 (15:12 +0300)]
[#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.

5 years ago[#923] OAuthController#callback adjustments (with tests).
Ivan Tashkinov [Fri, 5 Apr 2019 06:19:17 +0000 (09:19 +0300)]
[#923] OAuthController#callback adjustments (with tests).

5 years ago[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
Ivan Tashkinov [Thu, 4 Apr 2019 20:43:08 +0000 (23:43 +0300)]
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

# Conflicts:
# mix.exs

5 years agoMerge branch 'develop' into feature/prometheus
Mark Felder [Thu, 4 Apr 2019 20:39:42 +0000 (15:39 -0500)]
Merge branch 'develop' into feature/prometheus

5 years agoMerge branch 'feature/quack' into 'develop'
feld [Thu, 4 Apr 2019 19:52:22 +0000 (19:52 +0000)]
Merge branch 'feature/quack' into 'develop'

Add ability to ship logs to a Slack channel

See merge request pleroma/pleroma!1014

5 years agoAdd ability to ship logs to a Slack channel
feld [Thu, 4 Apr 2019 19:52:22 +0000 (19:52 +0000)]
Add ability to ship logs to a Slack channel

5 years ago[#923] OAuth consumer controller tests. Misc. improvements.
Ivan Tashkinov [Thu, 4 Apr 2019 19:41:03 +0000 (22:41 +0300)]
[#923] OAuth consumer controller tests. Misc. improvements.

5 years agoCode readability tweak
Mark Felder [Thu, 4 Apr 2019 17:36:57 +0000 (12:36 -0500)]
Code readability tweak

5 years agoClean merge crumbs
Mark Felder [Thu, 4 Apr 2019 17:29:10 +0000 (12:29 -0500)]
Clean merge crumbs

5 years agoServe metrics at `/api/pleroma/app_metrics`
href [Wed, 30 Jan 2019 15:44:38 +0000 (16:44 +0100)]
Serve metrics at `/api/pleroma/app_metrics`

5 years agoDocument Prometheus
Mark Felder [Thu, 4 Apr 2019 17:19:31 +0000 (12:19 -0500)]
Document Prometheus

5 years agoMerge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
Sadposter [Thu, 4 Apr 2019 16:46:07 +0000 (17:46 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

5 years ago[#1] fix telemetry
Egor Kislitsyn [Mon, 25 Mar 2019 08:29:04 +0000 (15:29 +0700)]
[#1] fix telemetry

5 years agoSet up telemetry and prometheus
href [Wed, 30 Jan 2019 15:32:30 +0000 (16:32 +0100)]
Set up telemetry and prometheus

5 years agoAdd recon
href [Wed, 6 Feb 2019 09:33:05 +0000 (10:33 +0100)]
Add recon