Mark Felder
9887cdf9be
Formatting
4 years ago
rinpatch
be7a76abc0
Merge branch 'feat/format-optional-migrations' into 'develop'
...
.formatter.exs: Format optional migrations
See merge request pleroma/pleroma!3249
4 years ago
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 )
4 years ago
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
4 years ago
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
4 years ago
feld
fa63f1b55b
Apply 4 suggestion(s) to 2 file(s)
4 years ago
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.
4 years ago
Mark Felder
86dcfb4eb9
More places we should be using Upload.base_url
4 years ago
Mark Felder
530fb5b29e
Avoid duplicate Config calls
4 years ago
Mark Felder
3c936061d5
Apply Upload.base_url for S3
4 years ago
Mark Felder
ad79983614
Fix URL generated for backup files, try to create a source of truth we can reuse throughout the codebase
4 years ago
lain
5822338f3a
Merge branch 'guppe-example' into 'develop'
...
ActivtityPub Test: Add example for guppe actor
See merge request pleroma/pleroma!3243
4 years ago
lain
7173d35ef8
Merge branch 'confirm-users' into 'develop'
...
Automatically confirm logged-in users
See merge request pleroma/pleroma!3234
4 years ago
Alex Gleason
e73c7fa7e5
Merge remote-tracking branch 'upstream/develop' into confirm-users
4 years ago
Alex Gleason
1b98cd8610
Remove ConfirmUserPlug
4 years ago
lain
80167e62dd
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
...
Create dir for EmojiStealPolicy automatically
See merge request pleroma/pleroma!3218
4 years ago
lain
7e43abce68
Merge branch 'backup-ids' into 'develop'
...
Backups: render ID in API
See merge request pleroma/pleroma!3245
4 years ago
Alex Gleason
3342f6a7ef
Backups: render ID in API
4 years ago
lain
ac1298fce8
Merge branch 'cleanup/unused-proxy-opts' into 'develop'
...
Cleanup Pleroma.Upload proxy opts
See merge request pleroma/pleroma!3236
4 years ago
lain
bd788c0939
ActivtityPub Test: Add example for guppe actor
4 years ago
lain
cf0eb0c1c5
Merge branch 'object-normalize-refactor' into 'develop'
...
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
4 years ago
lain
4d56aca904
Merge branch 'adminapi-user-email' into 'develop'
...
AdminAPI: return user email
See merge request pleroma/pleroma!3240
4 years ago
lain
f1ca2ac64b
Merge branch 'upstream/remote-emoji-support' into 'develop'
...
Upstream external emoji support
See merge request pleroma/pleroma!3238
4 years ago
Alex Gleason
7b8dbaff31
Call ConfirmUserPlug from Router, not Endpoint
4 years ago
Alex Gleason
9f6fa5877f
Add AdminAPI.AccountViewTest
4 years ago
Alex Gleason
20af025c65
AdminAPI: return user email
4 years ago
Roger Braun
48cd336a72
allow external emoji
4 years ago
feld
5e128a6be3
Merge branch 'fix/mediaproxy-config-descriptions' into 'develop'
...
Fix proxy and mediaproxy description.exs
See merge request pleroma/pleroma!3219
4 years ago
Mark Felder
d69c78ceb9
Remove configurability of upload proxy opts, simplify
4 years ago
lain
18296c7473
Merge branch 'fix/emoji-encoding' into 'develop'
...
URI.encode custom emojis
Closes #2381
See merge request pleroma/pleroma!3235
4 years ago
Mark Felder
f9090e00e6
Add test to validate URLs to custom emojis are properly encoded
4 years ago
Mark Felder
8864ac65c6
Add dinosaur gif from https://gifs.cc
...
"Our animations are free to be used to enhance your website."
4 years ago
Mark Felder
64116f63d9
URI.encode custom emojis
4 years ago
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
4 years ago
lain
fee0c6a2cb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-confirm-users
4 years ago
lain
7a03b112f2
Merge branch '1526-account-aliases' into 'develop'
...
Resolve "account move from mastodon to pleroma"
Closes #1526
See merge request pleroma/pleroma!3233
4 years ago
lain
e802b48d55
User: Use ObjectID type to validate also-known-as field
4 years ago
lain
f0e6cff583
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases
4 years ago
lain
ca7cf62d2a
Merge branch 'pleroma-moderation-log-stuff' into 'develop'
...
AdminAPI: return id for moderation log entries
See merge request pleroma/pleroma!3232
4 years ago
lain
bea69853a2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-moderation-log-stuff
4 years ago
lain
95a0ae8a35
AccountControllerTest: Fix test logic
4 years ago
lain
d44850d7a5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor
4 years ago
Haelwenn
b3c36d3f7a
Merge branch '2391-async-bugs' into 'develop'
...
SideEffects.DeleteTest: asyncify.
Closes #2391
See merge request pleroma/pleroma!3231
4 years ago
lain
8e5904daa5
SideEffects.DeleteTest: asyncify.
...
Replace Mock with Mox, mock out Logger.
4 years ago
Mark Felder
0e93775ed0
Add test to validate profile pagination works with keyset
4 years ago
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.
4 years ago
lain
e1e7e4d379
Object: Rework how Object.normalize works
...
Now it defaults to not fetching, and the option is named.
4 years ago
Alex Gleason
0ec7e9b8e9
AdminAPI: return id for moderation log entries
4 years ago
Alex Gleason
7b44605cb8
Migration to confirm previously-logged-in users
4 years ago
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
4 years ago