Commit Graph

505 Commits

Author SHA1 Message Date
Mark Felder
69848d5c97 Rename notification "privacy_option" setting 2020-06-26 12:45:46 -05:00
Mark Felder
fd5e797379 Simplify notification filtering settings further 2020-06-26 11:24:28 -05:00
Mark Felder
9eea800026 Refactor notification settings 2020-05-28 10:16:09 -05:00
Alex Gleason
b46811a074
Upgrade Comeonin to v5
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
2020-05-12 17:14:59 -05:00
Maksim
3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController 2020-05-07 08:14:54 +00:00
Egor Kislitsyn
7b0c8f0fde
Add tests for account registration with captcha enabled and improve errors 2020-04-29 21:26:07 +04:00
Ivan Tashkinov
908cf22a6c Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
# Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex
2020-04-28 19:56:20 +03:00
Egor Kislitsyn
6c26feed01
Merge branch 'develop' into openapi/account 2020-04-22 20:18:12 +04:00
Ivan Tashkinov
0062116e07 Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks
# Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex
2020-04-22 18:51:59 +03:00
Egor Kislitsyn
6db52c3b36 Fix Oban warning
Warning example:

     [warn] Expected Elixir.Pleroma.Workers.BackgroundWorker.perform/2 to return :ok, {:ok, value}, or {:error, reason}. Instead received:  [error: "not found @user@server.party", error: "not found "]  The job will be considered a success.
2020-04-22 19:27:28 +04:00
Egor Kislitsyn
e7771424a8 Fix blocks import 2020-04-22 19:27:28 +04:00
Egor Kislitsyn
88b82e5c3e Fix follow import 2020-04-22 19:27:28 +04:00
Ivan Tashkinov
f685cbd309 Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring. 2020-04-21 16:29:19 +03:00
Egor Kislitsyn
b08ded6c2f
Add spec for AccountController.create 2020-04-13 17:38:59 +04:00
rinpatch
d067eaa7b3 formatter.ex: Use Phoenix.HTML for mention/hashtag generation
Unlike concatenating strings, this makes sure everything is escaped.
Tests had to be changed because Phoenix.HTML runs attributes through
Enum.sort before generation for whatever reason.
2020-04-08 22:58:31 +03:00
Ivan Tashkinov
1c05f539aa Improved in-test clear_config/n applicability (setup / setup_all / in-test usage). 2020-03-20 18:33:00 +03:00
Ivan Tashkinov
ec3719f539 Improved in-test config management functions. 2020-03-18 20:30:31 +03:00
Ivan Tashkinov
99a6c660a9 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions 2020-03-02 18:41:12 +03:00
Haelwenn (lanodan) Monnier
6da6540036
Bump copyright years of files changed after 2020-01-07
Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
2020-03-02 06:08:45 +01:00
Ivan Tashkinov
0cf1d4fcd0 [#1560] Restricted AP- & OStatus-related routes for non-federating instances. 2020-02-22 19:48:41 +03:00
lain
c69b04c490 Merge branch 'features/remote-follow-userpage-redirect' into 'develop'
remote_follow_controller.ex: Redirect to the user page on success

Closes #1245

See merge request pleroma/pleroma!2123
2020-02-20 12:04:29 +00:00
Ivan Tashkinov
4f8c3462a8 Tweaks to clear_config calls in tests in order to prevent side effects on config during test suite execution. 2020-02-13 21:55:47 +03:00
Egor Kislitsyn
58b2017aa0
Restore TwitterAPI tests 2020-02-12 00:51:05 +04:00
Haelwenn (lanodan) Monnier
7bfb8ed14d
remote_follow_controller.ex: Redirect to the user page on success
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245
2020-01-21 16:46:16 +01:00
Haelwenn (lanodan) Monnier
5c533e10e7
Bump credo to 1.1.5 2020-01-20 12:17:14 +01:00
Alexander Strizhakov
0d331f3d23
compilation warnings fix 2020-01-14 15:49:52 +03:00
Mark Felder
e64059d218 Assign token that can write to follows 2020-01-12 12:14:09 -06:00
Mark Felder
2f5b8fbeb3 Merge branch 'develop' into issue/1354 2020-01-12 12:12:15 -06:00
Maksim Pechnikov
933dc12043 added code of mr#2067 2019-12-25 15:12:43 +03:00
Maksim Pechnikov
bdd71669da update test 2019-12-22 21:21:31 +03:00
Maksim Pechnikov
5b84156013 moved remote follow in separate controller 2019-12-21 21:27:42 +03:00
rinpatch
137a3d220b tests: remove a useless 1 second sleep
there is no need to wait for the task to finish, it will be deleted
when the transaction is aborted anyway.
2019-12-16 00:51:59 +03:00
Ivan Tashkinov
7973cbdb9f OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage. 2019-12-15 22:32:42 +03:00
Maksim Pechnikov
95e6a2acd9 Merge branch 'develop' into issue/1342 2019-12-08 21:25:26 +03:00
Maksim Pechnikov
04a8ffbe84 added privacy option to push notifications 2019-11-28 22:13:11 +03:00
Maksim Pechnikov
a52da55eb9 added User.NotificationSetting struct 2019-11-28 22:08:30 +03:00
Ivan Tashkinov
3db988250b [#1335] User: refactored :blocks field into :blocked_users relation.
Introduced UserBlock.
2019-11-10 16:30:21 +03:00
Egor Kislitsyn
4c1dd55c48 Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships 2019-10-24 14:55:36 +07:00
Ivan Tashkinov
10ff01acd9 [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. 2019-10-16 21:59:21 +03:00
Egor Kislitsyn
059005ff82
Replace user.following with Pleroma.FollowingRelationship 2019-10-11 02:35:32 +07:00
Ivan Tashkinov
64095961fe [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex
2019-10-02 20:42:40 +03:00
Egor Kislitsyn
e7aef27c00
Fix merge 2019-09-30 19:10:54 +07:00
kaniini
29dd8ab9c0 Merge branch 'feature/force-password-reset' into 'develop'
Admin API: Add ability to require password reset

See merge request pleroma/pleroma!1705
2019-09-23 22:42:34 +00:00
Maxim Filippov
6f25668215 Admin API: Add ability to force user's password reset 2019-09-22 16:08:07 +03:00
Ivan Tashkinov
6f67aed3ac [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
#	lib/pleroma/web/admin_api/admin_api_controller.ex
2019-09-19 10:59:09 +03:00
Egor Kislitsyn
95c948110c Add rel="ugc" to hashtags and mentions 2019-09-19 14:56:10 +07:00
rinpatch
b0ec82d24a Merge branch 'chores/bump-copyright-year' into 'develop'
Bump copyright years of files changed in 2019

See merge request pleroma/pleroma!1698
2019-09-18 21:57:49 +00:00
Haelwenn (lanodan) Monnier
447514dfa2
Bump copyright years of files changed in 2019
Done via the following command:
git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
2019-09-18 23:21:11 +02:00
Ivan Tashkinov
01c1078015 [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-17 22:53:26 +03:00
Egor Kislitsyn
43f17c2e67 Restore tests for change_password and delete_account 2019-09-16 12:34:47 +07:00