kaniini
|
9da8b287f8
|
Merge branch 'feature/database-compaction' into 'develop'
database compaction
See merge request pleroma/pleroma!473
|
6 years ago |
|
Alexander Strizhakov
|
ada384207b
|
typo fix
docs for RelMe provider
|
6 years ago |
|
lambda
|
218d96a26b
|
Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'
OAuth consumer params handling refactoring
See merge request pleroma/pleroma!1047
|
6 years ago |
|
rinpatch
|
4ef237f26a
|
Fix my incorrect search test fix
|
6 years ago |
|
rinpatch
|
83589ca6a5
|
Merge branch 'develop' into feature/database-compaction
|
6 years ago |
|
rinpatch
|
6069d0fd36
|
Fix object search depending on embeded object
|
6 years ago |
|
rinpatch
|
2abc09570f
|
Use the preloaded object in tag queries
|
6 years ago |
|
William Pitcock
|
36f78c6dcd
|
activitypub: fix filtering of boosts from blocked users
|
6 years ago |
|
William Pitcock
|
2140e164d7
|
activitypub: properly filter out transitive activities concerning blocked users
|
6 years ago |
|
rinpatch
|
35ac672b8d
|
Remove containment tests from transmogrifier and fix thread visibility solver
|
6 years ago |
|
rinpatch
|
d1eb578a57
|
Refactor tests that used ActivityPub.fetch_object_from_id
|
6 years ago |
|
rinpatch
|
8e4d950f31
|
Remove updating reply count for embeded objects
|
6 years ago |
|
rinpatch
|
ff8d76c670
|
Refactor all tests that acessed the embeded object
|
6 years ago |
|
rinpatch
|
54b82f236b
|
Fix note count test
|
6 years ago |
|
rinpatch
|
ad681877df
|
Make credo happy
|
6 years ago |
|
rinpatch
|
e7c3c36766
|
Update functions in object fetcher for tesla and set up a proper mock for tests
|
6 years ago |
|
rinpatch
|
b09ae02c04
|
Added some more normalization calls all in mastodon api controller
|
6 years ago |
|
rinpatch
|
dda4e0e2a8
|
Fix warnings in object tests
|
6 years ago |
|
rinpatch
|
627e5a0a49
|
Merge branch 'develop' into feature/database-compaction
|
6 years ago |
|
kaniini
|
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 |
|
Haelwenn
|
cde7711b12
|
Merge branch 'bugfix/relax-spam-protection' into 'develop'
activitypub: allow indirect messages from users being followed at a personal inbox
See merge request pleroma/pleroma!1069
|
6 years ago |
|
Normandy
|
d4a749cfb2
|
Handle new-style mastodon follow lists
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
|
6 years ago |
|
William Pitcock
|
750b369d04
|
activitypub: allow indirect messages from users being followed at a personal inbox
|
6 years ago |
|
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 |
|
Alex S
|
c5d0fffeaf
|
naming fix
|
6 years ago |
|
Alex S
|
c349573791
|
Merge develop to 788-separate-email-addresses
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
|
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 |
|
Ivan Tashkinov
|
c3f12cf3c3
|
[#923] OAuth consumer params handling refactoring.
Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic.
|
6 years ago |
|
Alex S
|
fe511a6c65
|
Merge branch 'develop' into feature/788-separate-email-addresses
|
6 years ago |
|
Alex S
|
fe13a1d78c
|
adding notify_email setting for trigger emails
|
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 |
