lambda
|
56956de6fa
|
Merge branch 'fix/status-reblogged' into 'develop'
Assign reblogged in the Mastodon reblog status view
Closes #812
See merge request pleroma/pleroma!1057
|
6 years ago |
|
lambda
|
f358295cbe
|
Merge branch 'unfollow-oneself' into 'develop'
Consistent response for self follow/unfollow
Closes #819
See merge request pleroma/pleroma!1061
|
6 years ago |
|
eugenijm
|
27d78dc526
|
Use User.get_cached_by*
|
6 years ago |
|
rinpatch
|
fd2e31af86
|
oops
|
6 years ago |
|
rinpatch
|
5d73dca064
|
Remove inReplyToStatusId
|
6 years ago |
|
eugenijm
|
507e7821e3
|
Handle follow/unfollow directed to themselves
|
6 years ago |
|
eugenijm
|
679a8ef629
|
Assign reblogged in the Mastodon reblog status view
|
6 years ago |
|
lambda
|
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 |
|
lambda
|
0a09692c7d
|
Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'
Features: mastoapi-2.6.0 `min_id` pagination
Closes #351
See merge request pleroma/pleroma!976
|
6 years ago |
|
Alexander Strizhakov
|
711ade961e
|
adding destroy multiple for mastofe
|
6 years ago |
|
Alexander Strizhakov
|
e03d24af96
|
in_reply_to_id - null
|
6 years ago |
|
lambda
|
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 |
|
Sadposter
|
be8350baa2
|
Merge branch 'develop' into feature/user-status-subscriptions
|
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 |
|
Haelwenn (lanodan) Monnier
|
9c1b36856b
|
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
|
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 |
|
rinpatch
|
144648de92
|
Merge branch 'mastoapi/plaintext-statuses' into 'develop'
Provide plaintext representations of content/cw in MastoAPI
Closes #787
See merge request pleroma/pleroma!1035
|
6 years ago |
|
lambda
|
0a02ed7a2f
|
Merge branch 'bugfix/follower_count' into 'develop'
update the follower count when a follower is blocked
See merge request pleroma/pleroma!1033
|
6 years ago |
|
Sachin Joshi
|
07afb9b537
|
update the follower count when a follower is blocked
|
6 years ago |
|
Alex S
|
fee50636d0
|
removing not needed invite update
|
6 years ago |
|
Egor Kislitsyn
|
9abf832b03
|
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
|
6 years ago |
|
Sadposter
|
13ff312c48
|
Sever subscription in case of block
|
6 years ago |
|
lambda
|
e19590c93f
|
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
|
6 years ago |
|
lambda
|
fd45cab9ec
|
Merge branch 'twitter_oauth' into 'develop'
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
|
6 years ago |
|
Alexander Strizhakov
|
36c0a10fdf
|
adding language tag
|
6 years ago |
|
Alex S
|
f0ca0696c8
|
test for valid_invite?
|
6 years ago |
|
lambda
|
23067908de
|
Merge branch 'feature/770-add-emoji-tags' into 'develop'
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
|
6 years ago |
|
Egor Kislitsyn
|
c3d5c3513a
|
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
|
6 years ago |
|
Ivan Tashkinov
|
44829d9181
|
AdminApiControllerTest unused variables fix.
|
6 years ago |
|
Egor Kislitsyn
|
a1a854646e
|
Merge branch 'develop' into use-jobs-in-webpush
|
6 years ago |
|
Ivan Tashkinov
|
bffddf5e31
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# docs/config.md
# test/support/factory.ex
|
6 years ago |
|
lambda
|
b4da2bc1d0
|
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
# Conflicts:
# config/config.exs
# docs/config.md
|
6 years ago |
|
lambda
|
b177e1e7f3
|
Merge branch 'scheduled-activities' into 'develop'
Scheduled activities
See merge request pleroma/pleroma!989
|
6 years ago |
|
Alex S
|
012bb5dcc9
|
renaming expire_at -> expires_at
keyword style change
|
6 years ago |
|
Sadposter
|
76fdfd1c7f
|
Add check on activity visibility in sub notification
|
6 years ago |
|
Alex S
|
b810aac117
|
added docs to docs/api/admin_api.md
code style and little renamings
|
6 years ago |
|
feld
|
fb2040d061
|
Merge branch 'fix/deactivated-user-error' into 'develop'
Return 403 for deactivated user on token request
Closes #785
See merge request pleroma/pleroma!1031
|
6 years ago |
|
eugenijm
|
2056efa714
|
Add scheduler for sending scheduled activities to the queue
|
6 years ago |
|
eugenijm
|
fc92a0fd8d
|
Added limits and media attachments for scheduled activities.
|
6 years ago |
|
eugenijm
|
b3870df51f
|
Handle `scheduled_at` on status creation.
|
6 years ago |
|
eugenijm
|
7bf622ce73
|
Add scheduled activities
|
6 years ago |
|
eugenijm
|
7aa53d52bd
|
Return 403 on oauth token exchange for a deactivated user
|
6 years ago |
|
feld
|
876965a7e7
|
Merge branch 'fix/failed-legacy-test' into 'develop'
Mock :crypt.crypt/2 to pass LegacyAuthenticationPlugTest on Mac OS
See merge request pleroma/pleroma!1030
|
6 years ago |
|
Alex S
|
ce8d457132
|
little channges
|
6 years ago |
|
Alex S
|
76d8928cf1
|
fix for field name
|
6 years ago |
|
Alex S
|
7410aee886
|
Merge develop to 770-add-emoji-tags
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
|
6 years ago |
|
Alex S
|
dcc54f8cfa
|
admin api endpoints for invites
|
6 years ago |
|
Alex S
|
47b07cec49
|
token -> invite renaming
|
6 years ago |
|
Alex S
|
be54e40890
|
twitter api registration
fix for twitter api tests
|
6 years ago |
