limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity
13929 commits 27 branches 107 tags 315 MiB
Commit graph

13929 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mark Felder
860b5c7804 Change user.deactivated field to user.is_active 2021-01-15 11:24:46 -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
d0e0396528 Hack to fix tests not passing. Unclear why the filters are being set to nil. 
Both of these changes are needed or it doesn't work.
 2021-01-14 17:49:37 -06:00
Mark Felder
8d6e9b25a4 Just validate command is in PATH; forking a shell is wasteful 2021-01-14 17:19:02 -06:00
Mark Felder
0b725f5d21 Lint 2021-01-14 16:00:32 -06:00
Mark Felder
12c8ce481c Bump Copyright year 2021-01-14 13:58:52 -06:00
Mark Felder
fb47e83adc Add ConfigDB migration 2021-01-14 13:53:55 -06:00
Ivan Tashkinov
f5f267fa76 [#3213] Refactoring of HashtagsTableMigrator. 2021-01-14 22:41:27 +03:00
Lain Soykaf
fd9a0ac329 BackupTest: Fix s3 test. 2021-01-14 20:18:45 +01:00
rinpatch
93ce7b0efb Merge branch 'pleroma-password' into 'develop' 
Add password module

See merge request pleroma/pleroma!3253
 2021-01-14 18:29:25 +00:00
Lain Soykaf
c4b74c9c3f Linting. 2021-01-14 16:01:14 +01: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
Ivan Tashkinov
e350898828 Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework 2021-01-13 22:11:16 +03:00
Ivan Tashkinov
3e4d84729a [#3213] Prototype of data migrations functionality / HashtagsTableMigrator. 2021-01-13 22:07:38 +03:00
Mark Felder
ba234d3c73 Unnecessary duplication here 2021-01-13 12:01:01 -06:00
Mark Felder
94e5180846 Consistent style 2021-01-13 12:00:48 -06:00
Mark Felder
5627f3642f Not needed in test.exs 2021-01-13 11:54:45 -06:00
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