Haelwenn
|
bf4b5f3856
|
Merge branch 'fix/follow-and-blocks-import' into 'develop'
Fix follower/blocks import when nicknames starts with @
Closes #1698
See merge request pleroma/pleroma!2416
|
4 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 |
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 |
stwf
|
25a64a4aa0
|
Capture test error messages where appropriate
|
5 years ago |
Egor Kislitsyn
|
25d8216804
|
Add email change endpoint
|
5 years ago |
Ivan Tashkinov
|
b63faf9819
|
[#1234] Mastodon 2.4.3 hierarchical scopes initial support (WIP).
|
5 years ago |
Ivan Tashkinov
|
ca1ba1e272
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
|
5 years ago |
rinpatch
|
896ffabe37
|
Merge branch 'so-long-twitterapi' into 'develop'
Removing TwitterAPI
See merge request pleroma/pleroma!1605
|
5 years ago |
Ivan Tashkinov
|
79cf629e1a
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
|
5 years ago |
rinpatch
|
c2b6c1b089
|
Extend `/api/pleroma/notifications/read` to mark multiple notifications
as read and make it respond with Mastoapi entities
|
5 years ago |
rinpatch
|
9cabc02864
|
Remove a useless import
|
5 years ago |
rinpatch
|
dbfcba85ec
|
Add a changelog entry for twitterapi removal and fix credo issues
|
5 years ago |
rinpatch
|
64410497d2
|
Remove TwitterAPI representers
|
5 years ago |
rinpatch
|
985122cc03
|
Remove Activity, User and Notification views from TwitterAPI
|
5 years ago |
rinpatch
|
90c2dae9a4
|
Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
|
5 years ago |
rinpatch
|
eb1739c596
|
Remove most of TwitterAPIController
|
5 years ago |
Ivan Tashkinov
|
256ff09aa8
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
|
5 years ago |
Maksim
|
a320358703
|
added test helpers to clear config after tests
|
5 years ago |