Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
12,861 Commits 1 Branch 0 Tags 222 MiB
e759579f97
Commit Graph

7827 Commits

Author SHA1 Message Date
Mark Felder
e759579f97 Active users must be confirmed 2021-01-19 16:39:55 -06:00
feld
958a7f6ed0 Merge branch 'fix/reblog-api' into 'develop' 
Fix Reblog API

Closes #2423

See merge request pleroma/pleroma!3261
 2021-01-18 21:19:14 +00:00
Mark Felder
44a86951a3 Merge branch 'develop' into refactor/approval_pending_user_field 2021-01-18 12:05:05 -06:00
Egor Kislitsyn
1b79dce7bc
Fix Reblog API 
Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.
 2021-01-18 20:15:57 +04:00
Mark Felder
2c0fe2ea9e Remove toggle_confirmation; require explicit state change 
Also cosmetic changes to make the code clearer
 2021-01-15 13:11:51 -06:00
Mark Felder
d36182c088 Change user.confirmation_pending field to user.is_confirmed 2021-01-15 12:44:41 -06:00
Mark Felder
63923df0a5 Further simplify changeset logic 2021-01-15 10:42:02 -06:00
Mark Felder
f7e59c28ed Change user.approval_pending field to user.is_approved 2021-01-15 10:42:02 -06:00
Haelwenn
cf367fdbd5 Merge branch 'optimize-command_available' into 'develop' 
Optimize Pleroma.Utils.command_available?/1

See merge request pleroma/pleroma!3254
 2021-01-15 04:44:58 +00:00
Mark Felder
8d6e9b25a4 Just validate command is in PATH; forking a shell is wasteful 2021-01-14 17:19:02 -06:00
Lain Soykaf
39f3683a06 Pbkdf2: Use it everywhere. 2021-01-14 15:06:16 +01:00
Lain Soykaf
87a31c5c9b Password -> Password.Pbkdf2 2021-01-14 14:49:39 +01:00
lain
9106048c61 Password: Replace Pbkdf2 with Password. 2021-01-13 15:11:11 +01:00
lain
c7cd9bd591 Password: Add password module 
Replaces Pbkdf2.
 2021-01-13 15:09:01 +01:00
Haelwenn (lanodan) Monnier
c4439c630f
Bump Copyright to 2021 
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'
 2021-01-13 07:49:50 +01:00
feld
5453038ce9 Merge branch 'fix/backup-url-on-s3' into 'develop' 
Standardize base url for uploads

See merge request pleroma/pleroma!3246
 2021-01-12 20:54:30 +00:00
lain
7a1cb752dd Pagination: Don't be dos'd by random parameters. 2021-01-12 12:59:50 +01:00
Mark Felder
ef59d99833 Simplify. We will always have a result from Upload.base_url/0, so just add it to the list 2021-01-11 14:19:14 -06:00
Mark Felder
1040881047 Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to whitelisted domains 2021-01-11 14:01:31 -06:00
lain
e1a547d7d3 ChatMessages: Fix pagination headers. 
They used to contain the path parameter `id` as query param,
which would break the link.
 2021-01-11 15:30:40 +01:00
Mark Felder
9887cdf9be Formatting 2021-01-10 09:03:42 -06:00
feld
fa63f1b55b Apply 4 suggestion(s) to 2 file(s) 2021-01-10 01:34:54 +00:00
Mark Felder
e8bf060e6e Move construction of S3 base URL with optional namespace and bucket to Upload.base_url/0 
Now we should have a correct base URL for S3 hosted objects throughout the codebase.
 2021-01-08 17:32:42 -06:00
Mark Felder
86dcfb4eb9 More places we should be using Upload.base_url 2021-01-08 17:32:42 -06:00
Mark Felder
530fb5b29e Avoid duplicate Config calls 2021-01-08 17:32:42 -06:00
Mark Felder
3c936061d5 Apply Upload.base_url for S3 2021-01-08 17:32:42 -06:00
Mark Felder
ad79983614 Fix URL generated for backup files, try to create a source of truth we can reuse throughout the codebase 2021-01-08 17:32:42 -06:00
lain
80167e62dd Merge branch 'fix/missing_emoji_steal_dir' into 'develop' 
Create dir for EmojiStealPolicy automatically

See merge request pleroma/pleroma!3218
 2021-01-08 13:10:49 +00:00
Alex Gleason
3342f6a7ef
Backups: render ID in API 2021-01-07 13:06:22 -06:00
lain
ac1298fce8 Merge branch 'cleanup/unused-proxy-opts' into 'develop' 
Cleanup Pleroma.Upload proxy opts

See merge request pleroma/pleroma!3236
 2021-01-07 16:25:39 +00:00
lain
cf0eb0c1c5 Merge branch 'object-normalize-refactor' into 'develop' 
Object: Rework how Object.normalize works

See merge request pleroma/pleroma!3229
 2021-01-07 11:09:18 +00:00
lain
4d56aca904 Merge branch 'adminapi-user-email' into 'develop' 
AdminAPI: return user email

See merge request pleroma/pleroma!3240
 2021-01-07 10:08:02 +00:00
Alex Gleason
20af025c65
AdminAPI: return user email 2021-01-06 11:30:32 -06:00
Roger Braun
48cd336a72 allow external emoji 2021-01-06 10:13:01 -06:00
Mark Felder
d69c78ceb9 Remove configurability of upload proxy opts, simplify 2021-01-05 15:06:00 -06:00
Mark Felder
64116f63d9 URI.encode custom emojis 2021-01-05 12:29:51 -06:00
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
 2021-01-05 12:40:45 +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
bea69853a2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff 2021-01-05 12:19:39 +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
lain
8e5904daa5 SideEffects.DeleteTest: asyncify. 
Replace Mock with Mox, mock out Logger.
 2021-01-04 18:40:59 +01: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
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
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
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