lain
|
5822338f3a
|
Merge branch 'guppe-example' into 'develop'
ActivtityPub Test: Add example for guppe actor
See merge request pleroma/pleroma!3243
|
4 years ago |
|
lain
|
7173d35ef8
|
Merge branch 'confirm-users' into 'develop'
Automatically confirm logged-in users
See merge request pleroma/pleroma!3234
|
4 years ago |
|
Alex Gleason
|
e73c7fa7e5
|
Merge remote-tracking branch 'upstream/develop' into confirm-users
|
4 years ago |
|
Alex Gleason
|
1b98cd8610
|
Remove ConfirmUserPlug
|
4 years ago |
|
lain
|
80167e62dd
|
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
Create dir for EmojiStealPolicy automatically
See merge request pleroma/pleroma!3218
|
4 years ago |
|
lain
|
7e43abce68
|
Merge branch 'backup-ids' into 'develop'
Backups: render ID in API
See merge request pleroma/pleroma!3245
|
4 years ago |
|
Alex Gleason
|
3342f6a7ef
|
Backups: render ID in API
|
4 years ago |
|
lain
|
ac1298fce8
|
Merge branch 'cleanup/unused-proxy-opts' into 'develop'
Cleanup Pleroma.Upload proxy opts
See merge request pleroma/pleroma!3236
|
4 years ago |
|
lain
|
bd788c0939
|
ActivtityPub Test: Add example for guppe actor
|
4 years ago |
|
lain
|
cf0eb0c1c5
|
Merge branch 'object-normalize-refactor' into 'develop'
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
|
4 years ago |
|
lain
|
4d56aca904
|
Merge branch 'adminapi-user-email' into 'develop'
AdminAPI: return user email
See merge request pleroma/pleroma!3240
|
4 years ago |
|
lain
|
f1ca2ac64b
|
Merge branch 'upstream/remote-emoji-support' into 'develop'
Upstream external emoji support
See merge request pleroma/pleroma!3238
|
4 years ago |
|
Alex Gleason
|
7b8dbaff31
|
Call ConfirmUserPlug from Router, not Endpoint
|
4 years ago |
|
Alex Gleason
|
9f6fa5877f
|
Add AdminAPI.AccountViewTest
|
4 years ago |
|
Alex Gleason
|
20af025c65
|
AdminAPI: return user email
|
4 years ago |
|
Roger Braun
|
48cd336a72
|
allow external emoji
|
4 years ago |
|
feld
|
5e128a6be3
|
Merge branch 'fix/mediaproxy-config-descriptions' into 'develop'
Fix proxy and mediaproxy description.exs
See merge request pleroma/pleroma!3219
|
4 years ago |
|
Mark Felder
|
d69c78ceb9
|
Remove configurability of upload proxy opts, simplify
|
4 years ago |
|
lain
|
18296c7473
|
Merge branch 'fix/emoji-encoding' into 'develop'
URI.encode custom emojis
Closes #2381
See merge request pleroma/pleroma!3235
|
4 years ago |
|
Mark Felder
|
f9090e00e6
|
Add test to validate URLs to custom emojis are properly encoded
|
4 years ago |
|
Mark Felder
|
8864ac65c6
|
Add dinosaur gif from https://gifs.cc
"Our animations are free to be used to enhance your website."
|
4 years ago |
|
Mark Felder
|
64116f63d9
|
URI.encode custom emojis
|
4 years ago |
|
lain
|
20a269ed69
|
Merge branch 'fix/pagination-regression' into 'develop'
Do not try to guess which pagination we need by the existence of an :offset param.
Closes #2399
See merge request pleroma/pleroma!3230
|
4 years ago |
|
lain
|
fee0c6a2cb
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-confirm-users
|
4 years ago |
|
lain
|
7a03b112f2
|
Merge branch '1526-account-aliases' into 'develop'
Resolve "account move from mastodon to pleroma"
Closes #1526
See merge request pleroma/pleroma!3233
|
4 years ago |
|
lain
|
e802b48d55
|
User: Use ObjectID type to validate also-known-as field
|
4 years ago |
|
lain
|
f0e6cff583
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases
|
4 years ago |
|
lain
|
ca7cf62d2a
|
Merge branch 'pleroma-moderation-log-stuff' into 'develop'
AdminAPI: return id for moderation log entries
See merge request pleroma/pleroma!3232
|
4 years ago |
|
lain
|
bea69853a2
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff
|
4 years ago |
|
lain
|
95a0ae8a35
|
AccountControllerTest: Fix test logic
|
4 years ago |
|
lain
|
d44850d7a5
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor
|
4 years ago |
|
Haelwenn
|
b3c36d3f7a
|
Merge branch '2391-async-bugs' into 'develop'
SideEffects.DeleteTest: asyncify.
Closes #2391
See merge request pleroma/pleroma!3231
|
4 years ago |
|
lain
|
8e5904daa5
|
SideEffects.DeleteTest: asyncify.
Replace Mock with Mox, mock out Logger.
|
4 years ago |
|
Mark Felder
|
0e93775ed0
|
Add test to validate profile pagination works with keyset
|
4 years ago |
|
Mark Felder
|
83f27282ba
|
Do not try to guess which pagination we need by the existence of an :offset param.
Require explicit request to get offset pagination.
|
4 years ago |
|
lain
|
e1e7e4d379
|
Object: Rework how Object.normalize works
Now it defaults to not fetching, and the option is named.
|
4 years ago |
|
Alex Gleason
|
0ec7e9b8e9
|
AdminAPI: return id for moderation log entries
|
4 years ago |
|
Alex Gleason
|
7b44605cb8
|
Migration to confirm previously-logged-in users
|
4 years ago |
|
feld
|
afe9c152ab
|
Merge branch 'fix/reports-ordering' into 'develop'
Do not reverse order of reports. We want newest ones sorted to the top.
Closes #2364
See merge request pleroma/pleroma!3225
|
4 years ago |
|
Mark Felder
|
83d97ab98e
|
Document reports ordering change
|
4 years ago |
|
Alex Gleason
|
4200a06340
|
Aliases: refactor validate_also_known_as/1
|
4 years ago |
|
Alex Gleason
|
0d6b9ce8ca
|
Apply 2 suggestion(s) to 1 file(s)
|
4 years ago |
|
Mark Felder
|
e4791258d4
|
Ensure newest report is returned first in the list
|
4 years ago |
|
Alex Gleason
|
64f0e96ff6
|
Automatically confirm logged-in users
|
4 years ago |
|
feld
|
70e8ef2c46
|
Merge branch 'fix/adminapi-user-status-pagination' into 'develop'
Support pagination in AdminAPI for user statuses
See merge request pleroma/pleroma!3226
|
4 years ago |
|
feld
|
2aa60e7592
|
Apply 1 suggestion(s) to 1 file(s)
|
4 years ago |
|
Alex Gleason
|
11d40e92b7
|
Render AKAs in Actor endpoints
|
4 years ago |
|
Alex Gleason
|
cbce880076
|
Merge remote-tracking branch 'upstream/develop' into aliases
|
4 years ago |
|
Mark Felder
|
2597b028f7
|
Make pagination type conditional
|
4 years ago |
|
Mark Felder
|
085d4e6cfc
|
Continue to use ActivityPub.fetch_user_activities/3, make it pass :offset
|
4 years ago |
