Ivan Tashkinov
|
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 |
|
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 |
|
Maksim Pechnikov
|
1a858134ed
|
Merge branch 'develop' into issue/1218
|
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 |
|
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
|
e6f43a831b
|
[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
|
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 |
|
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 |
|
Maksim Pechnikov
|
6ef0103ca0
|
added Emoji struct
|
5 years ago |
|
Maksim Pechnikov
|
d7808b5db4
|
added code\path fields without html tags in ets
|
5 years ago |
|
Ivan Tashkinov
|
0e1c481a94
|
[#1149] Added more oban workers. Refactoring.
|
5 years ago |
|
Maksim
|
58443d0cd6
|
tests for TwitterApi/UtilController
|
5 years ago |
|
Ariadne Conill
|
3850812503
|
twitter api: utils: rework do_remote_follow() to use CommonAPI
Closes #1138
|
5 years ago |
|
kPherox
|
e818381042
|
Use User.get_or_fetch/1 instead of OStatus.find_or_make_user/1
|
5 years ago |
|
Maksim
|
c2e2aadc42
|
#1110 fixed /api/pleroma/healthcheck
|
5 years ago |
|
Moonman
|
f98f7ad1b9
|
detect and use sha512-crypt for stored password hash.
|
5 years ago |
|
Maksim
|
a0c4ebb4d7
|
[#184] small refactoring reset password
|
5 years ago |
|
Sachin Joshi
|
ee22fff5ac
|
remove deprecated PleromaFE configuration
|
5 years ago |
|
lambda
|
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 |
|
William Pitcock
|
ac3a3abf6b
|
clean up follow/block imports a little
|
5 years ago |
|
William Pitcock
|
69a9e0563c
|
user: migrate follow/blocks import to job queue
|
5 years ago |
|
Egor Kislitsyn
|
1557b99beb
|
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
|
5 years ago |
|
Alexander Strizhakov
|
ce6ca0fefe
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
|
5 years ago |
|
Egor Kislitsyn
|
c157e27a00
|
Merge branch 'develop' into feature/disable-account
|
5 years ago |
|
Alex S
|
d35246c449
|
added healthcheck setting to instance config
|
5 years ago |
|
Egor
|
b9cdf6d3b9
|
Use `User.get_cached*` everywhere
|
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 |
|
Ekaterina Vaartis
|
52ed287e87
|
Fix incorrect multiple emoji tag handling introduced in initial impl
|
6 years ago |
|
rinpatch
|
627e5a0a49
|
Merge branch 'develop' into feature/database-compaction
|
6 years ago |
|
Normandy
|
d4a749cfb2
|
Handle new-style mastodon follow lists
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
|
6 years ago |
|
Egor Kislitsyn
|
db4badc6aa
|
move user disable into deactivation
|
6 years ago |
|
Egor Kislitsyn
|
0f2f7d2cec
|
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
|
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 |
|
lambda
|
180b87257c
|
Merge branch 'bugfix/share-mastodon' into 'develop'
[OStatus] adds status to pleroma instance if the url given is a status
See merge request pleroma/pleroma!1002
|
6 years ago |
|
Alex S
|
9e0567ec52
|
Merge develop into feature/770-add-emoji-tags
|
6 years ago |
|
Egor Kislitsyn
|
1b3d921921
|
change `Repo.get(User, id)` => `User.get_by_id(id)`
|
6 years ago |
|
Sachin Joshi
|
f20e8d28de
|
add support for all status type (ostatus) and replase case with if
|
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 |
|
eugenijm
|
43fb03be5a
|
Allow to mark a single notification as read
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
a3a9cec483
|
[Credo] fix Credo.Check.Readability.AliasOrder
|
6 years ago |
|
Egor Kislitsyn
|
eb84de0143
|
allow users to disable their own account
|
6 years ago |
