moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,289 Commits 2 Branches 0 Tags 208 MiB
Commit Graph

13289 Commits

Author SHA1 Message Date
Mark Felder f0ab60189e truncated_namespace should default to nil 2021-01-13 11:54:00 -06:00
Lain Soykaf aff83eb7c1 Linting 2021-01-13 16:00:12 +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 f917285b72 Merge branch 'chores/bump-copyright' into 'develop' 
Bump Copyright to 2021

See merge request pleroma/pleroma!3252
 2021-01-13 06:55:12 +00:00
Haelwenn (lanodan) Monnier 56ddd7d717
COPYING: Bump copyright to 2021 2021-01-13 07:53:44 +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
Mark Felder 67e888498c Switch another test to Upload.base_url/0 2021-01-12 16:42:43 -06:00
Mark Felder 2b93351bd7 Document deprecation 2021-01-12 16:40:29 -06:00
Mark Felder e87cca97e6 Fix tests relying on old behavior. Use the Upload.base_url, Luke. 2021-01-12 16:35:10 -06:00
Mark Felder c35e6fb516 Provide a non-nil fallback for Upload.base_url/0 for tests using TestUploaderSuccess as the uploader 2021-01-12 16:34:24 -06:00
Mark Felder 12528edc34 Fix another ad-hoc construction of the upload base_url 2021-01-12 16:32:52 -06:00
Mark Felder 8b28dce82a Deprecate Pleroma.Uploaders.S3, :public_endpoint 2021-01-12 16:31:35 -06: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
rinpatch 100e34b4a1 Merge branch 'chat-message-pagination' into 'develop' 
ChatMessages: Fix pagination headers.

See merge request pleroma/pleroma!3250
 2021-01-12 19:30:44 +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
Ivan Tashkinov 8c972de045 [#3213] transfer_hashtags mix task refactoring. 2021-01-10 11:44:39 +03:00
rinpatch be7a76abc0 Merge branch 'feat/format-optional-migrations' into 'develop' 
.formatter.exs: Format optional migrations

See merge request pleroma/pleroma!3249
 2021-01-10 08:40:13 +00:00
rinpatch 6b28121897 .formatter.exs: Format optional migrations 
(There are no changes to optional migrations since they were manually
formatted in https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3207)
 2021-01-10 11:28:41 +03:00
rinpatch ad5338a79c Merge branch 'add_some_information_about_setting_up_a_development_environment' into 'develop' 
Add some information about setting up a development environment

Closes #1904

See merge request pleroma/pleroma!3207
 2021-01-10 08:25:36 +00:00
Ilja 6284e8f4b2 Add development section 
* I cretaed a folder 'development'
* I split up the file dev.md into three parts and moved it to this folder
  * index.md
  * authentication_authorization.md
  * mrf.md
* I also moved ap_extensions.md
* I created a new file setting_up_pleroma_dev.md
 2021-01-10 08:25:36 +00: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 5822338f3a Merge branch 'guppe-example' into 'develop' 
ActivtityPub Test: Add example for guppe actor

See merge request pleroma/pleroma!3243
 2021-01-08 15:55:48 +00:00
lain 7173d35ef8 Merge branch 'confirm-users' into 'develop' 
Automatically confirm logged-in users

See merge request pleroma/pleroma!3234
 2021-01-08 15:36:42 +00:00
Alex Gleason e73c7fa7e5
Merge remote-tracking branch 'upstream/develop' into confirm-users 2021-01-08 07:48:19 -06:00
Alex Gleason 1b98cd8610
Remove ConfirmUserPlug 2021-01-08 07:47:55 -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
lain 7e43abce68 Merge branch 'backup-ids' into 'develop' 
Backups: render ID in API

See merge request pleroma/pleroma!3245
 2021-01-07 19:16:58 +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 bd788c0939 ActivtityPub Test: Add example for guppe actor 2021-01-07 16:20:30 +01: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
lain f1ca2ac64b Merge branch 'upstream/remote-emoji-support' into 'develop' 
Upstream external emoji support

See merge request pleroma/pleroma!3238
 2021-01-07 10:06:39 +00:00
Ivan Tashkinov 0d521022fe [#3213] Removed PK from hashtags_objects table. Improved hashtags_transfer mix task (logging of failed ids). 2021-01-07 12:20:29 +03:00
Alex Gleason 7b8dbaff31
Call ConfirmUserPlug from Router, not Endpoint 2021-01-06 15:16:44 -06:00
Alex Gleason 9f6fa5877f
Add AdminAPI.AccountViewTest 2021-01-06 11:43:07 -06: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
feld 5e128a6be3 Merge branch 'fix/mediaproxy-config-descriptions' into 'develop' 
Fix proxy and mediaproxy description.exs

See merge request pleroma/pleroma!3219
 2021-01-05 21:16:33 +00:00
Mark Felder d69c78ceb9 Remove configurability of upload proxy opts, simplify 2021-01-05 15:06:00 -06:00