027714b519
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
5 years ago
6f7a8c43a2
Merge branch 'fix/no-email-no-fail' into 'develop'
...
Do not fail when user has no email
See merge request pleroma/pleroma!2249
5 years ago
05da5f5cca
Update Copyrights
5 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
cb60a9c42f
Do not fail when user has no email
5 years ago
0cf1d4fcd0
[ #1560 ] Restricted AP- & OStatus-related routes for non-federating instances.
5 years ago
7bfb8ed14d
remote_follow_controller.ex: Redirect to the user page on success
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245
5 years ago
2f5b8fbeb3
Merge branch 'develop' into issue/1354
5 years ago
933dc12043
added code of mr#2067
5 years ago
bdd71669da
update test
5 years ago
4c505bc615
Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex
5 years ago
c9a44ec4a6
Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
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
e8843974cb
[ #1304 ] Moved remaining fields from User.Info to User.
...
Misc. fixes / improvements.
5 years ago
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
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
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
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
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
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
69a9e0563c
user: migrate follow/blocks import to job queue
5 years ago
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
5 years ago
2a54e8c1f5
Use "repeated" instead of "retweeted" for repeated statuses in Twitter API
...
This makes it consistent with the language used in Pleroma FE (at least
in English).
Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533
5 years ago
d64c3b604e
twitterapi: use order constraint to force descending order
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
46bbf9e1cf
TwitterAPI: profile update with emoji_map
5 years ago
85434669bb
Web.TwitterAPI.UserView: Also view local user emojis
5 years ago
2f76a40d02
formatter.ex: Add get_emoji_map/1
5 years ago
bdfa3a6fa8
Merging with develop
...
Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
5 years ago
61ca2f7a4e
Fix `rights` in TwitterAPI's user entity being present only for
...
Admins/Moderators
In !1093 I reused `maybe_with_role` for `rights` object, however I
missed that `maybe_with_role` is called only for admins/moderators.
5 years ago
c157e27a00
Merge branch 'develop' into feature/disable-account
5 years ago
4baea6e6d9
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
...
This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
5 years ago
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
5 years ago
d35246c449
added healthcheck setting to instance config
6 years ago
b9cdf6d3b9
Use `User.get_cached*` everywhere
6 years ago
88f0be9693
Feature/826 healthcheck endpoint
6 years ago
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
52ed287e87
Fix incorrect multiple emoji tag handling introduced in initial impl
6 years ago
ac04311b3f
Fix search in TwitterAPI
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
5d73dca064
Remove inReplyToStatusId
6 years ago
184ae60b21
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
...
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
6 years ago
Ivan Tashkinov