90c2dae9a4
Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
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
a320358703
added test helpers to clear config after tests
5 years ago
a180c1360e
[ #1149 ] Oban mailer job. Adjusted tests.
5 years ago
0e1c481a94
[ #1149 ] Added more oban workers. Refactoring.
5 years ago
58443d0cd6
tests for TwitterApi/UtilController
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
e7c39b7ac8
Feature/1072 muting notifications
5 years ago
93a0eeab16
Add license/copyright to all project files
5 years ago
829e997223
[ #878 ] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests
...
# Conflicts:
# lib/pleroma/object.ex
# test/web/activity_pub/transmogrifier_test.exs
# test/web/ostatus/ostatus_test.exs
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
daff85a985
[ #878 ] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.
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
8b9a0dd4a7
User: Don't error out when following a user that's already followed.
...
This leads to a few situations where it is impossible to follow a user.
5 years ago
4f2e359687
Merge branch 'develop' into issue/941
5 years ago
64ada7f960
fix tests
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
45e4642a58
tests: chase remote/local removal
5 years ago
59a703fcbe
twitter api: user view: expose user notification settings under pleroma object
5 years ago
1542cccbbc
tests: chase notification setting changes
5 years ago
17bfd000d7
Ability to reset avatar, profile banner and backgroud
5 years ago
ee22fff5ac
remove deprecated PleromaFE configuration
5 years ago
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
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
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
2f76a40d02
formatter.ex: Add get_emoji_map/1
5 years ago
85b5c60694
Pleroma.Formatter: width/height to class=emoji
5 years ago
cd6da3606b
Merge branch 'develop' into bugfix/web-notification-special-char
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
963d5774af
fix the status notification with special char
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
aef3a3ca46
Fix tests that used finmoji
6 years ago
e7c3c36766
Update functions in object fetcher for tesla and set up a proper mock for tests
6 years ago
627e5a0a49
Merge branch 'develop' into feature/database-compaction
6 years ago
73df3046e0
Merge branch 'feature/788-separate-email-addresses' into 'develop'
...
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
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
c5d0fffeaf
naming fix
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
d0304b4f92
more tests
6 years ago
fe511a6c65
Merge branch 'develop' into feature/788-separate-email-addresses
6 years ago
fe13a1d78c
adding notify_email setting for trigger emails
6 years ago
e5d553aa45
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
...
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
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
9c1b36856b
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
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
fee50636d0
removing not needed invite update
6 years ago
012bb5dcc9
renaming expire_at -> expires_at
...
keyword style change
6 years ago
47b07cec49
token -> invite renaming
6 years ago
be54e40890
twitter api registration
...
fix for twitter api tests
6 years ago
fa8483cb80
Merging develop into feature/770-add-emoji-tags
...
Conflict test/web/twitter_api/util_controller_test.exs
6 years ago
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
9e0567ec52
Merge develop into feature/770-add-emoji-tags
6 years ago
20c619f85f
replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)` in tests
6 years ago
9a59c26619
replace `Repo.get_by(User, ap_id: ap_id)` with `User.get_by_ap_id(ap_id)`
6 years ago
11c2d6bdc4
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in tests
6 years ago
1b3d921921
change `Repo.get(User, id)` => `User.get_by_id(id)`
6 years ago
6386c1c9c1
fetch url for OStatus to know if it is a/c or status
6 years ago
1d01e8e656
[OStatus] adds status to pleroma instance if the url given is a status
6 years ago
3601f03147
Adding tag to emoji ets table
...
changes in apis
6 years ago
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
6 years ago
aacdcac1be
Credo is upset about me not remembering the alphabet
6 years ago
087662d4fb
Fix formatting
6 years ago
406d19331f
Remove ActivityRepresenter
6 years ago
1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
6 years ago
a223e65f35
tests: fixup
6 years ago
fea3696799
common api: move context functions from twitterapi
6 years ago
bf27190f7f
UtilController: Return state of safe dm mentions.
6 years ago
4ed2618f6c
Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition).
6 years ago
43fb03be5a
Allow to mark a single notification as read
6 years ago
23960309a0
[Credo] Change quoted string with 3+ quotes to sigils
6 years ago
c42d34b2ec
[Credo] fix Credo.Check.Readability.MaxLineLength
6 years ago
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
6 years ago
6c8743d0c0
[Credo] Fix the warnings
6 years ago
86e4b48a5e
Fix DM visibility for blocking users
6 years ago
d5418e9ff7
Remove follow_request_count as it's not needed for FE anymore.
...
MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load.
6 years ago
9b63fda9c7
Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'
...
[#675 ] Do not show DMs in mentions timeline
See merge request pleroma/pleroma!877
6 years ago
9c6abec4d8
use commonapi.post instead of activitybulder
6 years ago
1341ee650e
[ #675 ] Do not show DMs in mentions timeline
6 years ago
cf426a719d
Merge branch 'with-mutes' into 'develop'
...
Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872
6 years ago
6b11011039
Added deactivated to the user view
6 years ago
bbbdbec4fd
Remove parts of the old activity view.
...
Not used anymore.
6 years ago
9ade1242c2
Add user muted status info to twitterapi.
6 years ago
337367d764
[ #468 ] More OAuth scopes-specific tests.
6 years ago
04ee877a20
[ #468 ] Added OAuth scopes-specific tests.
6 years ago
7456338ed3
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
...
Add OAuth tokens endpoint
See merge request pleroma/pleroma!805
6 years ago
cd019a5927
Merge branch 'follow-request-count' into 'develop'
...
Follow request count
See merge request pleroma/pleroma!817
6 years ago
fd17a0cc9b
Fix test
6 years ago
rinpatch