Alex Gleason
b46811a074
Upgrade Comeonin to v5
...
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
4 years ago
Maksim
3d0c567fbc
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
4 years ago
Egor Kislitsyn
7b0c8f0fde
Add tests for account registration with captcha enabled and improve errors
4 years ago
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
4 years ago
Egor Kislitsyn
6c26feed01
Merge branch 'develop' into openapi/account
4 years ago
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
4 years ago
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.
4 years ago
Egor Kislitsyn
e7771424a8
Fix blocks import
4 years ago
Egor Kislitsyn
88b82e5c3e
Fix follow import
4 years ago
Ivan Tashkinov
f685cbd309
Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
4 years ago
Egor Kislitsyn
b08ded6c2f
Add spec for AccountController.create
5 years ago
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.
5 years ago
Ivan Tashkinov
1c05f539aa
Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).
5 years ago
Ivan Tashkinov
ec3719f539
Improved in-test config management functions.
5 years ago
Ivan Tashkinov
99a6c660a9
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
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\/>'
5 years ago
Ivan Tashkinov
0cf1d4fcd0
[ #1560 ] Restricted AP- & OStatus-related routes for non-federating instances.
5 years ago
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
5 years ago
Ivan Tashkinov
4f8c3462a8
Tweaks to `clear_config` calls in tests in order to prevent side effects on config during test suite execution.
5 years ago
Egor Kislitsyn
58b2017aa0
Restore TwitterAPI tests
5 years ago
Haelwenn (lanodan) Monnier
7bfb8ed14d
remote_follow_controller.ex: Redirect to the user page on success
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245
5 years ago
Haelwenn (lanodan) Monnier
5c533e10e7
Bump credo to 1.1.5
5 years ago
Alexander Strizhakov
0d331f3d23
compilation warnings fix
5 years ago
Mark Felder
e64059d218
Assign token that can write to follows
5 years ago
Mark Felder
2f5b8fbeb3
Merge branch 'develop' into issue/1354
5 years ago
Maksim Pechnikov
933dc12043
added code of mr#2067
5 years ago
Maksim Pechnikov
bdd71669da
update test
5 years ago
Maksim Pechnikov
5b84156013
moved remote follow in separate controller
5 years ago
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.
5 years ago
Ivan Tashkinov
7973cbdb9f
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
5 years ago
Maksim Pechnikov
95e6a2acd9
Merge branch 'develop' into issue/1342
5 years ago
Maksim Pechnikov
04a8ffbe84
added privacy option to push notifications
5 years ago
Maksim Pechnikov
a52da55eb9
added User.NotificationSetting struct
5 years ago
Ivan Tashkinov
3db988250b
[ #1335 ] User: refactored :blocks field into :blocked_users relation.
...
Introduced UserBlock.
5 years ago
Egor Kislitsyn
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
5 years ago
Ivan Tashkinov
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
Egor Kislitsyn
059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
5 years ago
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
5 years ago
Egor Kislitsyn
e7aef27c00
Fix merge
5 years ago
kaniini
29dd8ab9c0
Merge branch 'feature/force-password-reset' into 'develop'
...
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
5 years ago
Maxim Filippov
6f25668215
Admin API: Add ability to force user's password reset
5 years ago
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
5 years ago
Egor Kislitsyn
95c948110c
Add `rel="ugc"` to hashtags and mentions
5 years ago
rinpatch
b0ec82d24a
Merge branch 'chores/bump-copyright-year' into 'develop'
...
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
5 years ago
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/'
5 years ago
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
5 years ago
Egor Kislitsyn
43f17c2e67
Restore tests for `change_password` and `delete_account`
5 years ago
Ivan Tashkinov
efbc2edba1
[ #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
# lib/pleroma/web/router.ex
5 years ago
Ivan Tashkinov
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
5 years ago
lain
a9b78f55e3
Merge branch 'capture-test-errors' into 'develop'
...
Capture test error messages where appropriate
See merge request pleroma/pleroma!1665
5 years ago