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.
2020-08-10 11:55:58 +03:00
66122a11b5
AccountController: Build the correct update activity.
...
Will fix federation issues.
2020-08-10 10:33:05 +02:00
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
2020-08-09 11:18:00 +00:00
7625e50950
Merge branch 'security-policy' into 'develop'
...
Add security policy for Pleroma backend
Closes #1848
See merge request pleroma/pleroma!2862
2020-08-09 11:06:54 +00:00
d0fc48ea67
Merge branch 'develop' into 'feat/floki-fast-html-2'
...
# Conflicts:
# config/config.exs
2020-08-09 10:53:58 +00:00
e08ea01d09
Limit expirations for each cron execution to 50.
...
This should prevent servers from being crushed. 50/min is a pretty good rate.
2020-08-08 12:49:02 -05:00
761cc5b4a2
Don't filter on local
2020-08-08 12:44:18 -05:00
cf4c97242b
Ensure we only expire Create activities with the Mix task
2020-08-08 12:40:52 -05:00
2e7c5fe2de
Add migration to remove invalid activity expirations
2020-08-08 12:33:37 -05:00
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
2020-08-08 15:16:55 +00:00
e5557bf8ba
Add mix task to add expiration to all local statuses
2020-08-08 16:29:40 +04:00
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.
2020-08-08 12:21:44 +02:00
4af1b80381
Clean up account aliases
2020-08-07 17:37:15 -05:00
1a5a7ba6e8
Merge remote-tracking branch 'upstream/develop' into aliases
2020-08-07 16:35:15 -05:00
47698fc322
Merge branch 'fix/ldap-auth-issues' into 'develop'
...
Fix LDAP auth issues
Closes #1646
See merge request pleroma/pleroma!2852
2020-08-07 20:59:44 +00:00
54e2af8293
Merge branch 'develop' into fix/ldap-auth-issues
2020-08-07 14:55:22 -05:00
474147a67a
Make a new function instead of overloading register_changeset/3
2020-08-07 14:54:14 -05:00
881fdb3a97
Add security policy for Pleroma backend
...
Closes #1848
2020-08-07 21:27:15 +03:00
f21b6ebd5d
Merge branch 'feature/update-welcome-setting-in-description' of git.pleroma.social:pleroma/pleroma into feature/update-welcome-setting-in-description
2020-08-07 21:05:44 +03:00
8e1f7a3eff
Add new `image` type to settings whose values are image urls
2020-08-07 21:04:13 +03:00
673e8e3ac1
Force 204 responses to be empty, fixes #2029
2020-08-07 13:02:39 -05:00
39ca4a23c6
Merge branch 'authenticator-docs' into 'develop'
...
Docs: Remove wrong / confusing auth docs.
Closes #2028
See merge request pleroma/pleroma!2860
2020-08-07 17:51:48 +00:00
60fe0a08f0
Docs: Remove wrong / confusing auth docs.
2020-08-07 17:59:55 +02:00
cb376c4c4c
CI: install cmake since fast_html now requires it
2020-08-07 18:06:54 +03:00
199ad47c22
Docs: Add OTP commands to frontend docs.
2020-08-07 17:04:44 +02:00
9cebdf30a4
Merge branch 'spoopy-user' into 'develop'
...
restricted_nicknames: Add names from MastoAPI endpoints
See merge request pleroma/pleroma!2857
2020-08-07 14:51:26 +00:00
6ddea8ebe8
Add a note about the proper value for uid
2020-08-07 09:42:10 -05:00
568ded5aa4
Merge branch 'object-age-changelog' into 'develop'
...
Changelog: Add information about the object age policy
See merge request pleroma/pleroma!2859
2020-08-07 14:21:28 +00:00
ebb30128af
Changelog: Add information about the object age policy
2020-08-07 16:20:13 +02:00
50d5bdfd31
Mix Task Frontend test: Expand.
2020-08-07 16:03:06 +02:00
c662b09eee
mix.exs: update fast_sanitize to 0.2.0
2020-08-07 16:45:33 +03:00
7e23a48d38
rel me test: fix HTML so broken browsers (and therefore
...
lexbor) refuse to parse it like mochiweb does
2020-08-07 16:45:33 +03:00
325c7c924b
Make Floki use fast_html
2020-08-07 16:45:33 +03:00
de00a4c0f1
Mix Task Frontend Test: Capture IO.
2020-08-07 15:27:41 +02:00
d97b76104e
Mix Task Frontend: Add tests.
2020-08-07 15:10:34 +02:00
b2b9eaa903
Merge branch 'frontend-bundles-downloads' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-07 15:02:16 +02:00
e5ab5fbe76
Mix task frontend: Read the docs.
2020-08-07 15:01:08 +02:00
3f88366e2a
Apply 1 suggestion(s) to 1 file(s)
2020-08-07 11:07:02 +00:00
34cbe9f44a
Merge branch 'features/poll-validation' into 'develop'
...
Poll and votes pipeline ingestion
Closes #1362 and #1852
See merge request pleroma/pleroma!2635
2020-08-07 10:44:06 +00:00
8e90cc58e7
Merge branch 'develop' into feature/update-welcome-setting-in-description
2020-08-07 09:48:34 +03:00
6e6276b4f8
added test
2020-08-07 09:47:05 +03:00
56ddf20208
Removed unused alias.
2020-08-07 09:43:49 +03:00
1298a2ea2c
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# mix.lock
2020-08-07 09:38:05 +03:00
e639eee82e
restricted_nicknames: Add names from MastoAPI endpoints
2020-08-06 18:01:29 -05:00
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
2020-08-06 16:54:32 +00:00
03da653a12
Description: Refactor.
2020-08-06 16:41:56 +02:00
bf95dfb240
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-06 15:22:20 +02:00
135ae4e35a
[ #2025 ] Defaulted OAuth login scopes choice to all scopes when user selects no scopes.
2020-08-06 16:00:00 +03:00
10b0e55acf
Merge branch 'whole-word-filter-hotfix' into 'develop'
...
Update filter_view.ex to return whole_word actual value
See merge request pleroma/pleroma!2851
2020-08-06 08:35:39 +00:00
4b47d9c5b6
Merge branch 'command-available-check' into 'develop'
...
#1939 Check command availability for exiftool and git
See merge request pleroma/pleroma!2753
2020-08-06 08:27:10 +00:00
rinpatch