sam/pleroma
sam/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
11063 commits 2 branches 40 tags 290 MiB
Commit graph

11063 commits

This branch
This branch
All branches
Author SHA1 Message Date
lain
66122a11b5 AccountController: Build the correct update activity. 
Will fix federation issues.
 2020-08-10 10:33:05 +02:00
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
 2020-08-09 11:18:00 +00:00
lain
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
lain
d0fc48ea67 Merge branch 'develop' into 'feat/floki-fast-html-2' 
# Conflicts:
#   config/config.exs
 2020-08-09 10:53:58 +00:00
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
 2020-08-08 15:16:55 +00:00
Egor Kislitsyn
e5557bf8ba
Add mix task to add expiration to all local statuses 2020-08-08 16:29:40 +04:00
lain
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
Mark Felder
54e2af8293 Merge branch 'develop' into fix/ldap-auth-issues 2020-08-07 14:55:22 -05:00
Mark Felder
474147a67a Make a new function instead of overloading register_changeset/3 2020-08-07 14:54:14 -05:00
rinpatch
881fdb3a97 Add security policy for Pleroma backend 
Closes #1848
 2020-08-07 21:27:15 +03:00
rinpatch
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
lain
60fe0a08f0 Docs: Remove wrong / confusing auth docs. 2020-08-07 17:59:55 +02:00
rinpatch
cb376c4c4c CI: install cmake since fast_html now requires it 2020-08-07 18:06:54 +03:00
lain
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
Mark Felder
6ddea8ebe8 Add a note about the proper value for uid 2020-08-07 09:42:10 -05:00
rinpatch
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
lain
ebb30128af Changelog: Add information about the object age policy 2020-08-07 16:20:13 +02:00
rinpatch
c662b09eee mix.exs: update fast_sanitize to 0.2.0 2020-08-07 16:45:33 +03:00
rinpatch
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
rinpatch
325c7c924b Make Floki use fast_html 2020-08-07 16:45:33 +03:00
lain
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
Alex Gleason
e639eee82e
restricted_nicknames: Add names from MastoAPI endpoints 2020-08-06 18:01:29 -05:00
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
 2020-08-06 16:54:32 +00:00
Ivan Tashkinov
135ae4e35a [#2025] Defaulted OAuth login scopes choice to all scopes when user selects no scopes. 2020-08-06 16:00:00 +03:00
lain
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
lain
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
Mary Kate
f785dba09b changelog for filter whole_word fix 2020-08-05 15:41:35 -05:00
Mary Kate
d6ab9f2132 update test for whole_word in filter 2020-08-05 15:36:25 -05:00
Mark Felder
cb7879c7c1 Add note about removal of Pleroma.Web.Auth.LDAPAuthenticator fallback to Pleroma.Web.Auth.PleromaAuthenticator 2020-08-05 11:53:57 -05:00
Mark Felder
2a4bca5bd7 Comments are good when they're precise... 2020-08-05 11:40:09 -05:00
Roman Chvanikov
7569f225f1 Move checks to application startup 2020-08-05 19:38:55 +03:00
Mark Felder
81126b0142 Add email to user account only if it exists in LDAP 2020-08-05 11:36:12 -05:00
Roman Chvanikov
4672b61106 Merge branch 'develop' into command-available-check 2020-08-05 19:16:48 +03:00
lain
7755f49e28 Merge branch 'migrate-legacy-tags' into 'develop' 
Migrate legacy tags set by AdminFE to match TagPolicy, #2010

See merge request pleroma/pleroma!2836
 2020-08-05 16:03:11 +00:00
lain
9688e332d0 Merge branch 'refactor/config-get' into 'develop' 
Refactor Pleroma.Config.get to return consistent results for nil values

Closes #2001

See merge request pleroma/pleroma!2853
 2020-08-05 15:59:30 +00:00
lain
9d7ce1a6d0 CommonValidations: More refactors. 2020-08-05 17:56:12 +02:00
lain
3655175639 CommonValidations: Refactor same_domain? 2020-08-05 17:36:27 +02:00
lain
9c96fc052a CommonValidations: Extract modification right checker 2020-08-05 17:26:53 +02:00
lain
2173945f90 MailerTest: Give it some time. 2020-08-05 17:26:03 +02:00
Roman Chvanikov
8c57a299b4 Handle non-list keys in Config.fetch/1 2020-08-05 18:23:12 +03:00
Mark Felder
2192d1e492 Permit LDAP users to register without capturing their password hash 
We don't need it, and local auth fallback has been removed.
 2020-08-05 10:07:31 -05:00
Roman Chvanikov
2299bfe4c1 Merge branch 'develop' into refactor/config-get 2020-08-05 17:46:24 +03:00
Roman Chvanikov
97b5701449 Update clear_config macro 2020-08-05 17:46:14 +03:00
Mark Felder
d5e4d8a6f3 Define default authenticator in the config 2020-08-05 09:41:17 -05:00
lain
5221879c35 Fix linting. 2020-08-05 15:40:32 +02:00
Mark Felder
0f9aecbca4 Remove fallback to local database when LDAP is unavailable. 
In many environments this will not work as the LDAP password and the copy stored in Pleroma will stay synchronized.
 2020-08-05 08:18:16 -05:00
Mark Felder
f7146583e5 Remove LDAP mail attribute as a requirement for registering an account 2020-08-05 08:15:57 -05:00
lain
f889400d05 Questions: Move fixes to validators. 2020-08-05 14:51:33 +02:00
lain
b5f0cef156 Apply 1 suggestion(s) to 1 file(s) 2020-08-05 11:33:21 +00:00
lain
70522989d9 Apply 1 suggestion(s) to 1 file(s) 2020-08-05 11:14:58 +00:00