Commit Graph

12757 Commits

Author SHA1 Message Date
Alex Gleason 1b98cd8610
Remove ConfirmUserPlug 2021-01-08 07:47:55 -06:00
Alex Gleason 7b8dbaff31
Call ConfirmUserPlug from Router, not Endpoint 2021-01-06 15:16:44 -06:00
lain fee0c6a2cb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-confirm-users 2021-01-05 13:33:57 +01:00
lain 7a03b112f2 Merge branch '1526-account-aliases' into 'develop'
Resolve "account move from mastodon to pleroma"

Closes #1526

See merge request pleroma/pleroma!3233
2021-01-05 12:31:33 +00:00
lain e802b48d55 User: Use ObjectID type to validate also-known-as field 2021-01-05 13:10:14 +01:00
lain f0e6cff583 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases 2021-01-05 12:42:30 +01:00
lain ca7cf62d2a Merge branch 'pleroma-moderation-log-stuff' into 'develop'
AdminAPI: return id for moderation log entries

See merge request pleroma/pleroma!3232
2021-01-05 11:36:57 +00:00
lain bea69853a2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff 2021-01-05 12:19:39 +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
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
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 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
lain 843d2074fe Fixtures: Add application actor fixture. 2020-12-23 11:56:08 +01:00
lain 5ada38499b Merge branch 'release/2.2.1' of git.pleroma.social:pleroma/pleroma into release/2.2.1 2020-12-23 11:40:34 +01:00
lain 322463e1bd Update changelog 2020-12-23 11:39:19 +01:00
lain 463eec992a Apply 1 suggestion(s) to 1 file(s) 2020-12-23 10:35:41 +00:00
lain 68eed0873e Linting 2020-12-23 11:16:13 +01:00
lain d4e6ca88a6 Update frontend 2020-12-23 09:35:19 +01:00
lain b988e9cc8b Mix: Update version. 2020-12-22 22:11:02 +01:00
lain a8ca282b4a Update changelog 2020-12-22 21:54:31 +01:00
lain d788b41c2e Report fixes. 2020-12-22 21:32:11 +01:00