3d722dc200
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
48a82c4609
Merge branch 'refactor/user' into 'develop'
...
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
5 years ago
1a858134ed
Merge branch 'develop' into issue/1218
5 years ago
035f22f784
Fix Credo warnings
5 years ago
1bea67cb5e
Cleanup Pleroma.User
5 years ago
209395c7e6
Add User.change_info/2 and User.update_info/2
5 years ago
179fa32dd5
Merge branch 'develop' into tests/mastodon_api_controller.ex
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
ab2f21e470
tests for mastodon_api_controller.ex
5 years ago
eb74c3d5c7
Merge branch 'develop' into issue/1218
5 years ago
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
70eed0594c
credo fixes
5 years ago
bd3ed3a622
Add back /api/qvitter/statuses/notifications/read.json
5 years ago
64410497d2
Remove TwitterAPI representers
5 years ago
985122cc03
Remove Activity, User and Notification views from TwitterAPI
5 years ago
90c2dae9a4
Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
5 years ago
6ef0103ca0
added Emoji struct
5 years ago
d8098d142a
added Emoji.Formatter
5 years ago
d7808b5db4
added code\path fields without html tags in ets
5 years ago
eb1739c596
Remove most of TwitterAPIController
5 years ago
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
f7bbf99caa
Use info.fields instead of source_data for remote users
5 years ago
a22f540fc4
Add custom fields to TwitterAPI.UserView
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
b93498eb52
constants: add as_public constant and use it everywhere
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
4bf2bb9cff
Fix password reset for non-test env
...
Fixes `Plug.Conn.NotSentError` that causes a 5xx error in response
instead of 404 and 400.
Fixes pattern matching error caused by different response format
in test and non-test env: `Pleroma.Emails.Mailer.deliver_async` returns
:ok when PleromaJobQueue is enabled and `{:ok, _}` when it's disabled.
In tests, it's disabled.
5 years ago
10f82c88b8
mastoapi password reset
...
added rate limit to password reset
configure rate limit in runtime
5 years ago
f98f7ad1b9
detect and use sha512-crypt for stored password hash.
5 years ago
e7c39b7ac8
Feature/1072 muting notifications
5 years ago
1417627d07
Merge branch 'remove-avatar-header' into 'develop'
...
Ability to reset avatar, profile banner and backgroud
See merge request pleroma/pleroma!1187
5 years ago
a0c4ebb4d7
[ #184 ] small refactoring reset password
5 years ago
a0c65bbd6c
Merge branch 'develop' into 'remove-avatar-header'
...
# Conflicts:
# CHANGELOG.md
5 years ago
4f2e359687
Merge branch 'develop' into issue/941
5 years ago
f13d6c7f78
update api to set skip_thread_containment
5 years ago
5402d04e3c
Merge branch 'feature/notification-control-part-2' into 'develop'
...
notification controls, part 2
See merge request pleroma/pleroma!1204
5 years ago
99f70c7e20
Use Pleroma.Config everywhere
5 years ago
59a703fcbe
twitter api: user view: expose user notification settings under pleroma object
5 years ago
0c53d91f3b
fix merge conflict
5 years ago
17bfd000d7
Ability to reset avatar, profile banner and backgroud
5 years ago
eb02edcad9
Add virtual :thread_muted? field
...
that may be set when fetching activities
5 years ago
de114ffbb0
activitypub: remove contain_timeline()
5 years ago
cbb3451023
CommonAPI: Refactor visibility, forbid public to private replies.
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
Maksim Pechnikov