8d6e9b25a4
Just validate command is in PATH; forking a shell is wasteful
2021-01-14 17:19:02 -06:00
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
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
7a1cb752dd
Pagination: Don't be dos'd by random parameters.
2021-01-12 12:59:50 +01:00
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
1040881047
Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to whitelisted domains
2021-01-11 14:01:31 -06:00
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
9887cdf9be
Formatting
2021-01-10 09:03:42 -06:00
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
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
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
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
fa63f1b55b
Apply 4 suggestion(s) to 2 file(s)
2021-01-10 01:34:54 +00:00
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
86dcfb4eb9
More places we should be using Upload.base_url
2021-01-08 17:32:42 -06:00
530fb5b29e
Avoid duplicate Config calls
2021-01-08 17:32:42 -06:00
3c936061d5
Apply Upload.base_url for S3
2021-01-08 17:32:42 -06:00
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
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
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
e73c7fa7e5
Merge remote-tracking branch 'upstream/develop' into confirm-users
2021-01-08 07:48:19 -06:00
1b98cd8610
Remove ConfirmUserPlug
2021-01-08 07:47:55 -06:00
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
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
3342f6a7ef
Backups: render ID in API
2021-01-07 13:06:22 -06:00
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
bd788c0939
ActivtityPub Test: Add example for guppe actor
2021-01-07 16:20:30 +01:00
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
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
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
7b8dbaff31
Call ConfirmUserPlug from Router, not Endpoint
2021-01-06 15:16:44 -06:00
9f6fa5877f
Add AdminAPI.AccountViewTest
2021-01-06 11:43:07 -06:00
20af025c65
AdminAPI: return user email
2021-01-06 11:30:32 -06:00
48cd336a72
allow external emoji
2021-01-06 10:13:01 -06:00
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
d69c78ceb9
Remove configurability of upload proxy opts, simplify
2021-01-05 15:06:00 -06:00
18296c7473
Merge branch 'fix/emoji-encoding' into 'develop'
...
URI.encode custom emojis
Closes #2381
See merge request pleroma/pleroma!3235
2021-01-05 20:09:29 +00:00
f9090e00e6
Add test to validate URLs to custom emojis are properly encoded
2021-01-05 13:58:49 -06:00
8864ac65c6
Add dinosaur gif from https://gifs.cc
...
"Our animations are free to be used to enhance your website."
2021-01-05 13:25:14 -06:00
64116f63d9
URI.encode custom emojis
2021-01-05 12:29:51 -06:00
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
fee0c6a2cb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-confirm-users
2021-01-05 13:33:57 +01:00
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
e802b48d55
User: Use ObjectID type to validate also-known-as field
2021-01-05 13:10:14 +01:00
f0e6cff583
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases
2021-01-05 12:42:30 +01:00
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
bea69853a2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff
2021-01-05 12:19:39 +01:00
95a0ae8a35
AccountControllerTest: Fix test logic
2021-01-05 11:48:40 +01:00
d44850d7a5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor
2021-01-05 10:48:32 +01:00
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
Mark Felder