alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,097 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

6894 Commits

Author SHA1 Message Date
Ivan Tashkinov 2def3cbf41 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy 
# Conflicts:
#	config/config.exs
#	mix.lock
 2020-08-11 15:13:29 +03:00
lain 686002164a Merge branch '204-fix' into 'develop' 
Fix 500 errors when returning :no_content, fixes #2029

Closes #2029

See merge request pleroma/pleroma!2856
 2020-08-11 09:18:56 +00:00
feld 78484fe0ef Merge branch 'admin-active-filter' into 'develop' 
Admin API: Filter out unapproved users when the `active` filter is on

Closes #2037

See merge request pleroma/pleroma!2872
 2020-08-10 17:16:38 +00:00
Egor Kislitsyn 249f21dcbb Admin API: Filter out unapproved users when the `active` filter is on 2020-08-10 18:27:39 +04:00
lain 93fbf39954 Merge branch 'revert-a6d3bb5f' into 'develop' 
Revert "Merge branch 'issue/1023' into 'develop'"

Closes #2033

See merge request pleroma/pleroma!2868
 2020-08-10 13:59:38 +00:00
lain 11fc90744c Transmogrifier: Remove duplicate code. 2020-08-10 15:31:36 +02:00
lain 5c4548d5e7 Revert "Merge branch 'issue/1023' into 'develop'" 
This reverts merge request !2763
 2020-08-10 13:05:13 +00:00
lain 66122a11b5 AccountController: Build the correct update activity. 
Will fix federation issues.
 2020-08-10 10:33:05 +02:00
Egor Kislitsyn e5557bf8ba
Add mix task to add expiration to all local statuses 2020-08-08 16:29:40 +04: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
Alex Gleason 673e8e3ac1
Force 204 responses to be empty, fixes #2029 2020-08-07 13:02:39 -05: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
Ivan Tashkinov 1298a2ea2c Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy 
# Conflicts:
#	mix.lock
 2020-08-07 09:38:05 +03: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
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 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
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
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
lain 00c4c6a382 CommonValidations: Remove superfluous function 
The `is_active` functionality was integrated into the presence
checker.
 2020-08-05 12:24:34 +02:00
Roman Chvanikov 6f60ac9f41 Refactor config 2020-08-05 13:00:49 +03:00
lain 19c108170e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation 2020-08-05 11:12:14 +02:00
MK Fain f341a8e142 Update filter_view.ex to return whole_word actual value 2020-08-05 02:01:27 +00:00
Karol Kosek 577b11167c
templates/layout/app.html.eex: fix link color 2020-08-05 00:01:30 +02:00
rinpatch b1b6a7dfa8 Merge branch 'deactivated-user-posts' into 'develop' 
Deactivated user posts

Closes #2011

See merge request pleroma/pleroma!2845
 2020-08-04 19:17:30 +00:00
rinpatch fede37e4c6 Merge branch 'chore/consolidate-rich-media-http' into 'develop' 
Consolidate construction of Rich Media Parser HTTP requests

See merge request pleroma/pleroma!2827
 2020-08-04 19:16:38 +00:00
Egor Kislitsyn 91fbb5b21f
Fix ActivityExpirationPolicy 2020-08-04 18:26:37 +04:00
lain 878c7f3f30 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation 2020-08-04 15:28:41 +02:00
Haelwenn (lanodan) Monnier 0f088d8ce3
question_validator: Allow content to be an empty-string (blank) 2020-08-04 14:29:16 +02:00
lain 1a00713744 CommonValidations: Treat deactivated users as not present. 2020-08-04 14:17:03 +02:00
Roman Chvanikov 56e9bf3393 Unify Config.get behaviour for atom/list key param 2020-08-04 14:35:47 +03:00
lain 28584bb224 Merge branch 'email-blacklist' into 'develop' 
Add email blacklist, fixes #1404

Closes #1404

See merge request pleroma/pleroma!2837
 2020-08-04 11:00:30 +00:00
Alex Gleason 4f57e85ab9
Email blacklist: Update phrasing again 2020-08-03 22:20:49 -05:00
Alex Gleason 058daf498f
Email blacklist: Update response phrasing 2020-08-03 19:57:53 -05:00
lain e3953923ac Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop' 
fixes 1957 Add option to send user chatmessage instead of dm

Closes #1957

See merge request pleroma/pleroma!2782
 2020-08-03 21:01:56 +00:00
Mark Felder 016d8d6c56 Consolidate construction of Rich Media Parser HTTP requests 2020-08-03 12:37:31 -05:00
lain 56b5b9aa27 Merge branch 'follower-mrf-again' into 'develop' 
Follower mrf again

See merge request pleroma/pleroma!2833
 2020-08-03 14:22:11 +00:00