lain
5c4548d5e7
Revert "Merge branch 'issue/1023' into 'develop'"
...
This reverts merge request !2763
4 years ago
Ilja
bd7bf6cd19
Apply 1 suggestion(s) to 1 file(s)
4 years ago
Ilja
a4a2d38640
Apply 1 suggestion(s) to 1 file(s)
4 years ago
rinpatch
00a4980c61
Merge branch 'fix/flaky-migration-episode-666' into 'develop'
...
20200802170532_fix_legacy_tags: Select only fields the migration needs
See merge request pleroma/pleroma!2863
4 years ago
rinpatch
21dfcafeb1
Merge branch '2038-old-update-info' into 'develop'
...
AccountController: Build the correct update activity.
Closes #2038
See merge request pleroma/pleroma!2867
4 years ago
rinpatch
15fa3b6bd8
20200802170532_fix_legacy_tags: chunk the user query
4 years ago
rinpatch
a818587467
20200802170532_fix_legacy_tags: Select only fields the migration needs
...
Selecting the full struct will break as soon as a new field is added.
4 years ago
lain
66122a11b5
AccountController: Build the correct update activity.
...
Will fix federation issues.
4 years ago
lain
0149dd0146
Merge branch 'feat/floki-fast-html-2' into 'develop'
...
Update to fast_html 2 and use it for Floki parsing
See merge request pleroma/pleroma!2861
4 years ago
lain
7625e50950
Merge branch 'security-policy' into 'develop'
...
Add security policy for Pleroma backend
Closes #1848
See merge request pleroma/pleroma!2862
4 years ago
lain
d0fc48ea67
Merge branch 'develop' into 'feat/floki-fast-html-2'
...
# Conflicts:
# config/config.exs
4 years ago
Mark Felder
e08ea01d09
Limit expirations for each cron execution to 50.
...
This should prevent servers from being crushed. 50/min is a pretty good rate.
4 years ago
Mark Felder
761cc5b4a2
Don't filter on local
4 years ago
Mark Felder
cf4c97242b
Ensure we only expire Create activities with the Mix task
4 years ago
Mark Felder
2e7c5fe2de
Add migration to remove invalid activity expirations
4 years ago
lain
ad29a4f2cf
Merge branch 'ensure-expiration-mix-task' into 'develop'
...
Add mix task to add expiration to all local statuses
Closes #2020
See merge request pleroma/pleroma!2865
4 years ago
Egor Kislitsyn
e5557bf8ba
Add mix task to add expiration to all local statuses
4 years ago
Ilja
e0dee833f2
Improve static_dir documentation
...
* It was still written for From Source installs. Now it's both OTP and From Source
* I linked to the cheatsheet where it was about configuration
* I moved the mix tasks of the robot.txt section to the CLI tasks and linked to it
* i checked the code at https://git.pleroma.social/pleroma/pleroma/-/blob/develop/lib/mix/tasks/pleroma/robotstxt.ex and it doesn't seem to more than just this one command with this option
* I also added the location of robot.txt and an example to dissallow everything, but allow the fediverse.network crawlers
* The Thumbnail section still linked to distsn.org which doesn't exist any more. I changed it to a general statemant that it can be used by external applications. (I don't know any that actually use it.)
* Both the logo and TOS need an extra `static` folder. I've seen confusion about that in #pleroma so I added an Important note.
4 years ago
lain
47698fc322
Merge branch 'fix/ldap-auth-issues' into 'develop'
...
Fix LDAP auth issues
Closes #1646
See merge request pleroma/pleroma!2852
4 years ago
Mark Felder
54e2af8293
Merge branch 'develop' into fix/ldap-auth-issues
4 years ago
Mark Felder
474147a67a
Make a new function instead of overloading register_changeset/3
4 years ago
rinpatch
881fdb3a97
Add security policy for Pleroma backend
...
Closes #1848
4 years ago
Angelina Filippova
f21b6ebd5d
Merge branch 'feature/update-welcome-setting-in-description' of git.pleroma.social:pleroma/pleroma into feature/update-welcome-setting-in-description
4 years ago
Angelina Filippova
8e1f7a3eff
Add new `image` type to settings whose values are image urls
4 years ago
Alex Gleason
673e8e3ac1
Force 204 responses to be empty, fixes #2029
4 years ago
rinpatch
39ca4a23c6
Merge branch 'authenticator-docs' into 'develop'
...
Docs: Remove wrong / confusing auth docs.
Closes #2028
See merge request pleroma/pleroma!2860
4 years ago
lain
60fe0a08f0
Docs: Remove wrong / confusing auth docs.
4 years ago
rinpatch
cb376c4c4c
CI: install cmake since fast_html now requires it
4 years ago
lain
199ad47c22
Docs: Add OTP commands to frontend docs.
4 years ago
lain
9cebdf30a4
Merge branch 'spoopy-user' into 'develop'
...
restricted_nicknames: Add names from MastoAPI endpoints
See merge request pleroma/pleroma!2857
4 years ago
Mark Felder
6ddea8ebe8
Add a note about the proper value for uid
4 years ago
rinpatch
568ded5aa4
Merge branch 'object-age-changelog' into 'develop'
...
Changelog: Add information about the object age policy
See merge request pleroma/pleroma!2859
4 years ago
lain
ebb30128af
Changelog: Add information about the object age policy
4 years ago
lain
50d5bdfd31
Mix Task Frontend test: Expand.
4 years ago
rinpatch
c662b09eee
mix.exs: update fast_sanitize to 0.2.0
4 years ago
rinpatch
7e23a48d38
rel me test: fix HTML so broken browsers (and therefore
...
lexbor) refuse to parse it like mochiweb does
4 years ago
rinpatch
325c7c924b
Make Floki use fast_html
4 years ago
lain
de00a4c0f1
Mix Task Frontend Test: Capture IO.
4 years ago
lain
d97b76104e
Mix Task Frontend: Add tests.
4 years ago
lain
b2b9eaa903
Merge branch 'frontend-bundles-downloads' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
4 years ago
lain
e5ab5fbe76
Mix task frontend: Read the docs.
4 years ago
lain
3f88366e2a
Apply 1 suggestion(s) to 1 file(s)
4 years ago
lain
34cbe9f44a
Merge branch 'features/poll-validation' into 'develop'
...
Poll and votes pipeline ingestion
Closes #1362 and #1852
See merge request pleroma/pleroma!2635
4 years ago
Maksim Pechnikov
8e90cc58e7
Merge branch 'develop' into feature/update-welcome-setting-in-description
4 years ago
Maksim Pechnikov
6e6276b4f8
added test
4 years ago
Ivan Tashkinov
56ddf20208
Removed unused alias.
4 years ago
Ivan Tashkinov
1298a2ea2c
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# mix.lock
4 years ago
Alex Gleason
e639eee82e
restricted_nicknames: Add names from MastoAPI endpoints
4 years ago
lain
b9ebb55d2a
Merge branch '2025-oauth-login-default-to-all-scopes' into 'develop'
...
[#2025 ] Defaulted OAuth login scopes choice to all scopes when user selects no scopes
Closes #2025
See merge request pleroma/pleroma!2855
4 years ago
lain
03da653a12
Description: Refactor.
4 years ago