lain
|
95a0ae8a35
|
AccountControllerTest: Fix test logic
|
2021-01-05 11:48:40 +01:00 |
|
|
lain
|
d44850d7a5
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor
|
2021-01-05 10:48:32 +01:00 |
|
|
Haelwenn
|
b3c36d3f7a
|
Merge branch '2391-async-bugs' into 'develop'
SideEffects.DeleteTest: asyncify.
Closes #2391
See merge request pleroma/pleroma!3231
|
2021-01-05 00:01:44 +00:00 |
|
|
lain
|
8e5904daa5
|
SideEffects.DeleteTest: asyncify.
Replace Mock with Mox, mock out Logger.
|
2021-01-04 18:40:59 +01:00 |
|
|
Mark Felder
|
0e93775ed0
|
Add test to validate profile pagination works with keyset
|
2021-01-04 11:04:58 -06:00 |
|
|
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.
|
2021-01-04 10:13:17 -06:00 |
|
|
lain
|
e1e7e4d379
|
Object: Rework how Object.normalize works
Now it defaults to not fetching, and the option is named.
|
2021-01-04 13:38:31 +01:00 |
|
|
Alex Gleason
|
0ec7e9b8e9
|
AdminAPI: return id for moderation log entries
|
2021-01-01 11:59:48 -06:00 |
|
|
Alex Gleason
|
7b44605cb8
|
Migration to confirm previously-logged-in users
|
2020-12-31 14:04:51 -06:00 |
|
|
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
|
2020-12-31 19:24:49 +00:00 |
|
|
Mark Felder
|
83d97ab98e
|
Document reports ordering change
|
2020-12-31 13:15:44 -06:00 |
|
|
Alex Gleason
|
4200a06340
|
Aliases: refactor validate_also_known_as/1
|
2020-12-31 12:53:28 -06:00 |
|
|
Alex Gleason
|
0d6b9ce8ca
|
Apply 2 suggestion(s) to 1 file(s)
|
2020-12-31 18:51:57 +00:00 |
|
|
Mark Felder
|
e4791258d4
|
Ensure newest report is returned first in the list
|
2020-12-31 12:40:42 -06:00 |
|
|
Alex Gleason
|
64f0e96ff6
|
Automatically confirm logged-in users
|
2020-12-31 12:13:08 -06:00 |
|
|
feld
|
70e8ef2c46
|
Merge branch 'fix/adminapi-user-status-pagination' into 'develop'
Support pagination in AdminAPI for user statuses
See merge request pleroma/pleroma!3226
|
2020-12-31 16:04:42 +00:00 |
|
|
feld
|
2aa60e7592
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-12-31 09:58:43 -06:00 |
|
|
Alex Gleason
|
11d40e92b7
|
Render AKAs in Actor endpoints
|
2020-12-30 18:53:27 -06:00 |
|
|
Alex Gleason
|
cbce880076
|
Merge remote-tracking branch 'upstream/develop' into aliases
|
2020-12-30 17:10:02 -06:00 |
|
|
Mark Felder
|
2597b028f7
|
Make pagination type conditional
|
2020-12-30 16:37:04 -06:00 |
|
|
Mark Felder
|
085d4e6cfc
|
Continue to use ActivityPub.fetch_user_activities/3, make it pass :offset
|
2020-12-30 16:10:10 -06:00 |
|
|
Mark Felder
|
4c5f75f4e9
|
Support pagination in AdminAPI for user statuses
|
2020-12-30 15:18:54 -06:00 |
|
|
Mark Felder
|
744b34709d
|
Do not reverse order of reports. We want newest ones sorted to the top.
|
2020-12-30 14:22:48 -06:00 |
|
|
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
|
2020-12-30 14:04:10 +00:00 |
|
|
Mark Felder
|
a1a58f0a53
|
Switch to local fork of crypt until upstream fixes ability to build on aarch64
https://github.com/msantos/crypt/pull/8
|
2020-12-28 17:52:18 -06:00 |
|
|
Haelwenn
|
607cac1947
|
Merge branch 'revert-b122b6ff' into 'develop'
Revert "Merge branch 'features/hashtag-column' into 'develop'"
See merge request pleroma/pleroma!3222
|
2020-12-28 12:12:19 +00:00 |
|
|
Haelwenn
|
3966add048
|
Revert "Merge branch 'features/hashtag-column' into 'develop'"
This reverts merge request !2824
|
2020-12-28 12:02:16 +00:00 |
|
|
Haelwenn
|
b122b6ffa3
|
Merge branch 'features/hashtag-column' into 'develop'
Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!2824
|
2020-12-28 10:14:58 +00:00 |
|
|
Haelwenn (lanodan) Monnier
|
d0c2479710
|
pleroma.database fill_old_hashtags: Add month_limit argument
|
2020-12-28 11:05:25 +01:00 |
|
|
Haelwenn (lanodan) Monnier
|
18b536c176
|
Pleroma.Object/1: take %Object{} as argument instead
|
2020-12-28 11:05:24 +01:00 |
|
|
Alexander Strizhakov
|
2e859794ee
|
non condition dir creation
|
2020-12-27 21:58:15 +03:00 |
|
|
Alexander Strizhakov
|
546da68a11
|
changelog entry
|
2020-12-27 21:53:30 +03:00 |
|
|
Alexander Strizhakov
|
dad76703aa
|
not needed
|
2020-12-27 21:53:30 +03:00 |
|
|
Alexander Strizhakov
|
7bfb041658
|
insreasing test coverage for StealEmojiPolicy
|
2020-12-27 21:53:30 +03:00 |
|
|
Alexander Strizhakov
|
aafd7b44ce
|
check dir existence in policy
|
2020-12-27 21:53:30 +03:00 |
|
|
Mark Felder
|
e02889edb2
|
Add MRFs to the list of things that may need a soft reboot
|
2020-12-27 21:53:29 +03:00 |
|
|
Mark Felder
|
72aeb2e73b
|
Mark private
|
2020-12-27 21:53:29 +03:00 |
|
|
Mark Felder
|
77e39e6aae
|
Create dir for EmojiStealPolicy automatically
|
2020-12-27 21:53:29 +03:00 |
|
|
lain
|
e4f1d8f48c
|
Merge branch 'cachex-test' into 'develop'
Test framework overhaul (speed, reliability)
See merge request pleroma/pleroma!3209
|
2020-12-26 10:26:35 +00:00 |
|
|
Mark Felder
|
50e226bc52
|
Revert, this is useful in an edge case
|
2020-12-23 17:41:15 -06:00 |
|
|
Mark Felder
|
ce78b64db8
|
Formatting
|
2020-12-23 17:41:10 -06:00 |
|
|
Mark Felder
|
5a084d6f8d
|
Update descriptions for MediaProxy, remove settings that should not be exposed in AdminFE
|
2020-12-23 17:38:33 -06:00 |
|
|
Mark Felder
|
7aec234b44
|
Remove Proxy settings that were not meant to exist under Pleroma.Upload
|
2020-12-23 17:01:11 -06:00 |
|
|
Mark Felder
|
fecefe68f8
|
Add test/instance to .gitignore
|
2020-12-23 14:09:22 -06:00 |
|
|
lain
|
88530c02d6
|
Merge branch 'update/linkify' into 'develop'
Update Linkify to 0.4.1
See merge request pleroma/pleroma!3217
|
2020-12-23 15:58:20 +00:00 |
|
|
Mark Felder
|
5b838accc0
|
Update Linkify to 0.4.1
Fixes false positive detection of IPv4 addresses
|
2020-12-23 09:07:01 -06:00 |
|
|
lain
|
ce1be8f5e6
|
Merge branch 'mergeback/2.2.1' into 'develop'
Mergeback/2.2.1
See merge request pleroma/pleroma!3215
|
2020-12-23 14:08:08 +00:00 |
|
|
lain
|
ae934659d1
|
Align changelog
|
2020-12-23 14:56:57 +01:00 |
|
|
lain
|
31c89acd00
|
Merge branch 'stable' into mergeback/2.2.1
|
2020-12-23 14:41:04 +01:00 |
|
|
lain
|
f64237927c
|
Merge branch 'release/2.2.1' into 'stable'
Release/2.2.1
See merge request pleroma/pleroma!3214
|
2020-12-23 13:35:41 +00:00 |
|