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
e7771424a8
Fix blocks import
4 years ago
88b82e5c3e
Fix follow import
4 years ago
f685cbd309
Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
4 years ago
99a6c660a9
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
5 years ago
0cf1d4fcd0
[ #1560 ] Restricted AP- & OStatus-related routes for non-federating instances.
5 years ago
2f5b8fbeb3
Merge branch 'develop' into issue/1354
5 years ago
5b84156013
moved remote follow in separate controller
5 years ago
ead2d18826
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
d2f1c4f658
Add ActivityPub Object Event type support
...
Adds Event support in the same way Video objects are handled, with the
name of the object as message header.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
5 years ago
7973cbdb9f
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
5 years ago
b93856874d
[ #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
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
1a858134ed
Merge branch 'develop' into issue/1218
5 years ago
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
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
e6f43a831b
[ #1234 ] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
5 years ago
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
5 years ago
25d8216804
Add email change endpoint
5 years ago
b63faf9819
[ #1234 ] Mastodon 2.4.3 hierarchical scopes initial support (WIP).
5 years ago
6ef0103ca0
added Emoji struct
5 years ago
d7808b5db4
added code\path fields without html tags in ets
5 years ago
0e1c481a94
[ #1149 ] Added more oban workers. Refactoring.
5 years ago
58443d0cd6
tests for TwitterApi/UtilController
5 years ago
3850812503
twitter api: utils: rework do_remote_follow() to use CommonAPI
...
Closes #1138
5 years ago
e818381042
Use User.get_or_fetch/1 instead of OStatus.find_or_make_user/1
5 years ago
c2e2aadc42
#1110 fixed /api/pleroma/healthcheck
5 years ago
f98f7ad1b9
detect and use sha512-crypt for stored password hash.
5 years ago
a0c4ebb4d7
[ #184 ] small refactoring reset password
5 years ago
ee22fff5ac
remove deprecated PleromaFE configuration
5 years ago
692919c7d2
Merge branch 'refactor/use-job-queue-everywhere' into 'develop'
...
use job queue everywhere
Closes #862
See merge request pleroma/pleroma!1142
5 years ago
ac3a3abf6b
clean up follow/block imports a little
5 years ago
69a9e0563c
user: migrate follow/blocks import to job queue
5 years ago
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
5 years ago
c157e27a00
Merge branch 'develop' into feature/disable-account
5 years ago
d35246c449
added healthcheck setting to instance config
5 years ago
b9cdf6d3b9
Use `User.get_cached*` everywhere
5 years ago
88f0be9693
Feature/826 healthcheck endpoint
5 years ago
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
52ed287e87
Fix incorrect multiple emoji tag handling introduced in initial impl
6 years ago
627e5a0a49
Merge branch 'develop' into feature/database-compaction
6 years ago
d4a749cfb2
Handle new-style mastodon follow lists
...
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
6 years ago
db4badc6aa
move user disable into deactivation
6 years ago
0f2f7d2cec
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
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
97395e013e
Merge branch 'notification-pleroma-settings' into 'develop'
...
Notification controls
Closes #738
See merge request pleroma/pleroma!988
6 years ago
b57b43027c
Change response format of /api/pleroma/emoji to the one that actually makes sense
6 years ago
fa8483cb80
Merging develop into feature/770-add-emoji-tags
...
Conflict test/web/twitter_api/util_controller_test.exs
6 years ago
Ivan Tashkinov