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 |
|
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 |
|
Alexander Strizhakov
|
0d331f3d23
|
compilation warnings fix
|
5 years ago |
|
Mark Felder
|
2f5b8fbeb3
|
Merge branch 'develop' into issue/1354
|
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
|
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 |
|
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
|
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 |
|
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 |
|
Ivan Tashkinov
|
0e1c481a94
|
[#1149] Added more oban workers. Refactoring.
|
5 years ago |
|
Maksim
|
58443d0cd6
|
tests for TwitterApi/UtilController
|
5 years ago |
|
Maksim
|
c2e2aadc42
|
#1110 fixed /api/pleroma/healthcheck
|
5 years ago |
|
feld
|
93a0eeab16
|
Add license/copyright to all project files
|
5 years ago |
|
William Pitcock
|
45e4642a58
|
tests: chase remote/local removal
|
5 years ago |
|
William Pitcock
|
1542cccbbc
|
tests: chase notification setting changes
|
5 years ago |
|
Sachin Joshi
|
ee22fff5ac
|
remove deprecated PleromaFE configuration
|
5 years ago |
|
Egor Kislitsyn
|
c157e27a00
|
Merge branch 'develop' into feature/disable-account
|
5 years ago |
|
Alexander Strizhakov
|
88f0be9693
|
Feature/826 healthcheck endpoint
|
5 years ago |
|
Egor Kislitsyn
|
e8c2f9a73a
|
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
|
5 years ago |
|
Normandy
|
d4a749cfb2
|
Handle new-style mastodon follow lists
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
|
6 years ago |
|
Egor Kislitsyn
|
d0304b4f92
|
more tests
|
6 years ago |
|
lambda
|
c8440b5e0c
|
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
|
6 years ago |
|
kaniini
|
97395e013e
|
Merge branch 'notification-pleroma-settings' into 'develop'
Notification controls
Closes #738
See merge request pleroma/pleroma!988
|
6 years ago |
|
rinpatch
|
b57b43027c
|
Change response format of /api/pleroma/emoji to the one that actually makes sense
|
6 years ago |
|
Alex S
|
fa8483cb80
|
Merging develop into feature/770-add-emoji-tags
Conflict test/web/twitter_api/util_controller_test.exs
|
6 years ago |
|
Sachin Joshi
|
6386c1c9c1
|
fetch url for OStatus to know if it is a/c or status
|
6 years ago |
|
Sachin Joshi
|
1d01e8e656
|
[OStatus] adds status to pleroma instance if the url given is a status
|
6 years ago |
|
Alex S
|
3601f03147
|
Adding tag to emoji ets table
changes in apis
|
6 years ago |
|
eugenijm
|
cd90695a34
|
Add PUT /api/pleroma/notification_settings endpoint
|
6 years ago |
|
lain
|
bf27190f7f
|
UtilController: Return state of safe dm mentions.
|
6 years ago |
