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
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
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
Sachin Joshi [Mon, 8 Apr 2019 09:31:18 +0000 (15:16 +0545)]
update the follower count when a follower is blocked
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
Egor Kislitsyn [Mon, 8 Apr 2019 11:48:10 +0000 (18:48 +0700)]
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
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
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
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
Alexander Strizhakov [Mon, 8 Apr 2019 11:03:10 +0000 (11:03 +0000)]
adding language tag
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
Egor Kislitsyn [Mon, 8 Apr 2019 09:46:59 +0000 (16:46 +0700)]
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
Ivan Tashkinov [Mon, 8 Apr 2019 09:32:55 +0000 (12:32 +0300)]
AdminApiControllerTest unused variables fix.
Egor Kislitsyn [Mon, 8 Apr 2019 09:29:20 +0000 (16:29 +0700)]
Merge branch 'develop' into use-jobs-in-webpush
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
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
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
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.
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
eugenijm [Wed, 3 Apr 2019 15:55:04 +0000 (18:55 +0300)]
Add scheduler for sending scheduled activities to the queue
eugenijm [Mon, 1 Apr 2019 22:31:01 +0000 (01:31 +0300)]
Added limits and media attachments for scheduled activities.
eugenijm [Sat, 30 Mar 2019 09:58:40 +0000 (12:58 +0300)]
Handle `scheduled_at` on status creation.
eugenijm [Thu, 28 Mar 2019 09:39:10 +0000 (12:39 +0300)]
Add scheduled activities
eugenijm [Fri, 5 Apr 2019 21:22:42 +0000 (00:22 +0300)]
Return 403 on oauth token exchange for a deactivated user
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
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
Mark Felder [Sat, 6 Apr 2019 14:30:36 +0000 (09:30 -0500)]
Pin recon dependency to 2.4.0
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
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
Sergey Suprunenko [Fri, 5 Apr 2019 23:36:42 +0000 (23:36 +0000)]
Redirect to the referer url after mastofe authorization
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
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
rinpatch [Fri, 5 Apr 2019 19:59:03 +0000 (19:59 +0000)]
Revert "Merge branch 'test-coverage' into 'develop'"
This reverts merge request !1027
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
optikfluffel [Fri, 5 Apr 2019 18:12:44 +0000 (20:12 +0200)]
Use --cover option when running CI tests
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
Mark Felder [Fri, 5 Apr 2019 17:11:19 +0000 (12:11 -0500)]
We actually want the user id not nickname in the test...
Mark Felder [Fri, 5 Apr 2019 16:59:56 +0000 (11:59 -0500)]
Also remove Repo functions in the tests
Mark Felder [Fri, 5 Apr 2019 16:41:41 +0000 (11:41 -0500)]
Redundant Repo.get_by usage was recently removed from the codebase
Mark Felder [Fri, 5 Apr 2019 16:29:34 +0000 (11:29 -0500)]
Document the admin API endpoints for controlling follow/unfollow
Roger Braun [Sun, 16 Dec 2018 15:41:56 +0000 (16:41 +0100)]
Add user following / unfollowing to the admin api.
Egor Kislitsyn [Fri, 5 Apr 2019 12:46:28 +0000 (19:46 +0700)]
fix credo
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
Egor Kislitsyn [Fri, 5 Apr 2019 12:38:44 +0000 (19:38 +0700)]
Use PleromaJobQueue in Pleroma.Web.Push
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
Ivan Tashkinov [Fri, 5 Apr 2019 12:12:02 +0000 (15:12 +0300)]
[#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
Ivan Tashkinov [Fri, 5 Apr 2019 06:19:17 +0000 (09:19 +0300)]
[#923] OAuthController#callback adjustments (with tests).
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
Mark Felder [Thu, 4 Apr 2019 20:39:42 +0000 (15:39 -0500)]
Merge branch 'develop' into feature/prometheus
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
feld [Thu, 4 Apr 2019 19:52:22 +0000 (19:52 +0000)]
Add ability to ship logs to a Slack channel
Ivan Tashkinov [Thu, 4 Apr 2019 19:41:03 +0000 (22:41 +0300)]
[#923] OAuth consumer controller tests. Misc. improvements.
Mark Felder [Thu, 4 Apr 2019 17:36:57 +0000 (12:36 -0500)]
Code readability tweak
Mark Felder [Thu, 4 Apr 2019 17:29:10 +0000 (12:29 -0500)]
Clean merge crumbs
href [Wed, 30 Jan 2019 15:44:38 +0000 (16:44 +0100)]
Serve metrics at `/api/pleroma/app_metrics`
Mark Felder [Thu, 4 Apr 2019 17:19:31 +0000 (12:19 -0500)]
Document Prometheus
Egor Kislitsyn [Mon, 25 Mar 2019 08:29:04 +0000 (15:29 +0700)]
[#1] fix telemetry
href [Wed, 30 Jan 2019 15:32:30 +0000 (16:32 +0100)]
Set up telemetry and prometheus
href [Wed, 6 Feb 2019 09:33:05 +0000 (10:33 +0100)]
Add recon
Egor Kislitsyn [Thu, 4 Apr 2019 09:10:43 +0000 (16:10 +0700)]
Improve Transmogrifier.upgrade_user_from_ap_id/2
lambda [Thu, 4 Apr 2019 08:01:12 +0000 (08:01 +0000)]
Merge branch 'fix/add-oauth-token-indexes' into 'develop'
adding indexes to oauth_tokens table
See merge request pleroma/pleroma!1016
lambda [Thu, 4 Apr 2019 07:34:20 +0000 (07:34 +0000)]
Merge branch 'features/pleroma-tan-mastofe' into 'develop'
mastodon_api_controller.ex: Add pleroma-tan to initial_state
See merge request pleroma/pleroma!1018
Haelwenn (lanodan) Monnier [Thu, 4 Apr 2019 07:07:25 +0000 (09:07 +0200)]
mastodon_api_controller.ex: Add pleroma-tan to initial_state
lambda [Wed, 3 Apr 2019 17:31:34 +0000 (17:31 +0000)]
Merge branch 'feature/robotstxt' into 'develop'
Generate permissive or restrictive robots.txt in the config generator
See merge request pleroma/pleroma!1012
Sachin Joshi [Tue, 2 Apr 2019 19:09:16 +0000 (00:54 +0545)]
Generate permissive or restrictive robots.txt in the config generator
lambda [Wed, 3 Apr 2019 14:42:59 +0000 (14:42 +0000)]
Merge branch 'update-autolinker' into 'develop'
Update `auto_linker` dependency
See merge request pleroma/pleroma!1015
Alex S [Wed, 3 Apr 2019 13:51:09 +0000 (20:51 +0700)]
adding indexes to oauth_tokens table
Egor Kislitsyn [Wed, 3 Apr 2019 12:41:15 +0000 (19:41 +0700)]
Update `auto_linker` dependency
lambda [Wed, 3 Apr 2019 06:51:44 +0000 (06:51 +0000)]
Merge branch 'fix/preview-not-working-with-form-data' into 'develop'
Fix preview not being usable in form data
See merge request pleroma/pleroma!1013
rinpatch [Tue, 2 Apr 2019 20:07:16 +0000 (23:07 +0300)]
Fix preview not being usable in form data
Haelwenn [Tue, 2 Apr 2019 18:43:48 +0000 (18:43 +0000)]
Merge branch 'fix-slow-relationships' into 'develop'
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
See merge request pleroma/pleroma!1011
lambda [Tue, 2 Apr 2019 14:18:23 +0000 (14:18 +0000)]
Merge branch 'bugfix/wrong-date-format' into 'develop'
Support activities with dates in the Unix timestamp format
Closes #763
See merge request pleroma/pleroma!1004
lambda [Tue, 2 Apr 2019 14:17:43 +0000 (14:17 +0000)]
Merge branch 'feature/fake-statuses' into 'develop'
Add fake status submit
See merge request pleroma/pleroma!995
lain [Tue, 2 Apr 2019 14:10:38 +0000 (16:10 +0200)]
Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
lain [Tue, 2 Apr 2019 14:04:18 +0000 (16:04 +0200)]
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
Alex S [Tue, 2 Apr 2019 13:39:52 +0000 (20:39 +0700)]
Merging develop into feature/770-add-emoji-tags
Conflict test/web/twitter_api/util_controller_test.exs
Alex S [Tue, 2 Apr 2019 13:35:41 +0000 (20:35 +0700)]
second level of headertext change in doc
Alex S [Tue, 2 Apr 2019 13:32:37 +0000 (20:32 +0700)]
syntax highlighting
lambda [Tue, 2 Apr 2019 12:47:40 +0000 (12:47 +0000)]
Merge branch 'bugfix/share-mastodon' into 'develop'
[OStatus] adds status to pleroma instance if the url given is a status
See merge request pleroma/pleroma!1002
lambda [Tue, 2 Apr 2019 12:45:29 +0000 (12:45 +0000)]
Merge branch 'remove-user-activities' into 'develop'
[#757] Add mix task to delete user's activities
See merge request pleroma/pleroma!1008
lambda [Tue, 2 Apr 2019 12:43:28 +0000 (12:43 +0000)]
Merge branch 'get_by_id' into 'develop'
Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010
Alex S [Tue, 2 Apr 2019 12:16:29 +0000 (19:16 +0700)]
Merge develop into feature/770-add-emoji-tags
lambda [Tue, 2 Apr 2019 11:54:04 +0000 (11:54 +0000)]
Merge branch 'features/pleroma-tan' into 'develop'
priv/static/images: Add pleroma-tan
See merge request pleroma/pleroma!913
rinpatch [Tue, 2 Apr 2019 11:31:18 +0000 (14:31 +0300)]
Rename fake param to preview and make the tests check that the object was not inserted to the db
Ivan Tashkinov [Tue, 2 Apr 2019 11:05:34 +0000 (14:05 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# lib/pleroma/web/oauth/oauth_controller.ex
# lib/pleroma/web/router.ex
Egor Kislitsyn [Tue, 2 Apr 2019 10:58:32 +0000 (17:58 +0700)]
replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)` in tests
lambda [Tue, 2 Apr 2019 10:57:38 +0000 (10:57 +0000)]
Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
MastoAPI 2.6.0 `force_login` option
Closes #734
See merge request pleroma/pleroma!999
lambda [Tue, 2 Apr 2019 10:52:29 +0000 (10:52 +0000)]
Merge branch 'get_by_id' into 'develop'
Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible
See merge request pleroma/pleroma!1009
lambda [Tue, 2 Apr 2019 10:51:33 +0000 (10:51 +0000)]
Merge branch 'fix/nicknames-beginning-with-numbers' into 'develop'
Fix account lookup for nicknames beginning with numbers
See merge request pleroma/pleroma!1003
cascode [Tue, 2 Apr 2019 10:51:33 +0000 (10:51 +0000)]
Fix account lookup for nicknames beginning with numbers
Ivan Tashkinov [Tue, 2 Apr 2019 10:50:12 +0000 (13:50 +0300)]
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# mix.exs
Egor Kislitsyn [Tue, 2 Apr 2019 10:47:52 +0000 (17:47 +0700)]
replace `Repo.get_by(User, ap_id: ap_id)` with `User.get_by_ap_id(ap_id)`
Egor Kislitsyn [Tue, 2 Apr 2019 10:47:02 +0000 (17:47 +0700)]
replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)`
Ivan Tashkinov [Tue, 2 Apr 2019 10:43:33 +0000 (13:43 +0300)]
Added "GET /oauth/authorize" tests.
Egor Kislitsyn [Tue, 2 Apr 2019 10:08:03 +0000 (17:08 +0700)]
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in tests
Egor Kislitsyn [Tue, 2 Apr 2019 10:01:26 +0000 (17:01 +0700)]
change `Repo.get(User, id)` => `User.get_by_id(id)`
Egor Kislitsyn [Tue, 2 Apr 2019 09:50:31 +0000 (16:50 +0700)]
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)`
Sergey Suprunenko [Tue, 2 Apr 2019 09:25:51 +0000 (11:25 +0200)]
Ignore dates in wrong formats
Egor Kislitsyn [Tue, 2 Apr 2019 09:30:11 +0000 (16:30 +0700)]
add `user delete_activities` mix task
Alex S [Tue, 2 Apr 2019 09:26:40 +0000 (16:26 +0700)]
test fix
projects / akkoma / log