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
|
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 |
|
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 |
|
Alex Gleason
|
0ec7e9b8e9
|
AdminAPI: return id for moderation log entries
|
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 |
|
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 |
|
Mark Felder
|
4c5f75f4e9
|
Support pagination in AdminAPI for user statuses
|
4 years ago |
|
Mark Felder
|
744b34709d
|
Do not reverse order of reports. We want newest ones sorted to the top.
|
4 years ago |
|
lain
|
38924166eb
|
Merge branch 'deps/crypt-local-fork' into 'develop'
Switch to local fork of crypt until upstream fixes ability to build on aarch64
See merge request pleroma/pleroma!3224
|
4 years ago |
|
Mark Felder
|
a1a58f0a53
|
Switch to local fork of crypt until upstream fixes ability to build on aarch64
https://github.com/msantos/crypt/pull/8
|
4 years ago |
|
Haelwenn
|
607cac1947
|
Merge branch 'revert-b122b6ff' into 'develop'
Revert "Merge branch 'features/hashtag-column' into 'develop'"
See merge request pleroma/pleroma!3222
|
4 years ago |
|
Haelwenn
|
3966add048
|
Revert "Merge branch 'features/hashtag-column' into 'develop'"
This reverts merge request !2824
|
4 years ago |
|
Haelwenn
|
b122b6ffa3
|
Merge branch 'features/hashtag-column' into 'develop'
Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!2824
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
d0c2479710
|
pleroma.database fill_old_hashtags: Add month_limit argument
|
4 years ago |
|
Haelwenn (lanodan) Monnier
|
18b536c176
|
Pleroma.Object/1: take %Object{} as argument instead
|
4 years ago |
|
lain
|
e4f1d8f48c
|
Merge branch 'cachex-test' into 'develop'
Test framework overhaul (speed, reliability)
See merge request pleroma/pleroma!3209
|
4 years ago |
|
Mark Felder
|
fecefe68f8
|
Add test/instance to .gitignore
|
4 years ago |
|
lain
|
88530c02d6
|
Merge branch 'update/linkify' into 'develop'
Update Linkify to 0.4.1
See merge request pleroma/pleroma!3217
|
4 years ago |
|
Mark Felder
|
5b838accc0
|
Update Linkify to 0.4.1
Fixes false positive detection of IPv4 addresses
|
4 years ago |
|
lain
|
ce1be8f5e6
|
Merge branch 'mergeback/2.2.1' into 'develop'
Mergeback/2.2.1
See merge request pleroma/pleroma!3215
|
4 years ago |
|
lain
|
ae934659d1
|
Align changelog
|
4 years ago |
|
lain
|
31c89acd00
|
Merge branch 'stable' into mergeback/2.2.1
|
4 years ago |
|
lain
|
f64237927c
|
Merge branch 'release/2.2.1' into 'stable'
Release/2.2.1
See merge request pleroma/pleroma!3214
|
4 years ago |
|
lain
|
843d2074fe
|
Fixtures: Add application actor fixture.
|
4 years ago |
|
lain
|
5ada38499b
|
Merge branch 'release/2.2.1' of git.pleroma.social:pleroma/pleroma into release/2.2.1
|
4 years ago |
|
lain
|
322463e1bd
|
Update changelog
|
4 years ago |
|
lain
|
463eec992a
|
Apply 1 suggestion(s) to 1 file(s)
|
4 years ago |
|
lain
|
68eed0873e
|
Linting
|
4 years ago |
|
lain
|
d4e6ca88a6
|
Update frontend
|
4 years ago |
|
lain
|
b988e9cc8b
|
Mix: Update version.
|
4 years ago |
|
lain
|
a8ca282b4a
|
Update changelog
|
4 years ago |
