e07f8f8aa5
Merge branch 'weblate-pleroma-pleroma' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma!3167
2020-11-23 13:43:57 +00:00
15550f7c4b
Merge branch 'cherry-pick-a65fc78c' into 'stable'
...
Dockerfile fixes for stable
See merge request pleroma/pleroma!3169
2020-11-21 18:29:26 +00:00
9b7ade6568
Install file-dev in Dockerfile build stage
...
This is required by the majic, added in #2534 .
2020-11-21 12:17:50 -06:00
22f85e0570
Merge branch 'libmagic' into 'develop'
...
Add missing libmagic for image upload to dockerfile
See merge request pleroma/pleroma!3168
(cherry picked from commit a65fc78c6ae6af7dc7
2020-11-21 18:12:33 +00:00
d5f5d01495
Translated using Weblate (Hebrew)
...
Currently translated at 100.0% (106 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/he/
2020-11-21 18:12:07 +00:00
a65fc78c6a
Merge branch 'libmagic' into 'develop'
...
Add missing libmagic for image upload to dockerfile
See merge request pleroma/pleroma!3168
2020-11-21 18:11:58 +00:00
e6af7dc777
Add missing libmagic for image upload
2020-11-21 19:57:38 +02:00
489b12cde4
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-11-21 19:47:46 +03:00
ccc2cf0e87
Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.
2020-11-21 19:47:25 +03:00
4999efad3f
Update CHANGELOG.md: registration workflow
2020-11-21 10:24:45 -06:00
30ed7b502f
Merge remote-tracking branch 'upstream/develop' into registration-workflow
2020-11-21 10:23:53 -06:00
9fc3356a06
Merge branch 'cherry-pick-8a7ee9fe' into 'stable'
...
Merge branch 'revert-da4660d2' into 'stable'
See merge request pleroma/pleroma!3166
2020-11-20 21:40:23 +00:00
ba3bf16c70
Merge branch 'revert-da4660d2' into 'develop'
...
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"
See merge request pleroma/pleroma!3158
(cherry picked from commit 8a7ee9fe7442ff5ea9
2020-11-20 21:30:04 +00:00
ecd1ef8cb5
Merge branch 'fix/2302-report-duplicates' into 'develop'
...
Fix for forwarded reports
Closes #2303 and #2302
See merge request pleroma/pleroma!3146
2020-11-20 18:40:15 +00:00
e4289792d2
Linting.
2020-11-20 16:38:05 +01:00
25a03a9b5b
Config, Docs: Remove search_function
2020-11-20 16:33:11 +01:00
8532325d65
SearchController Test: Fix test.
2020-11-20 16:29:11 +01:00
cc52f03566
Changelog: Add info about search changes
2020-11-20 16:28:00 +01:00
9a1e5f5d48
Search: Change search method based on detected pg version
2020-11-20 16:26:43 +01:00
a407e33c78
Application: Save postgres version in the environment
2020-11-20 16:26:22 +01:00
d8924e1a56
Merge branch 'fix/mix-tasks' into 'develop'
...
Start limiters in mix tasks
Closes #2320
See merge request pleroma/pleroma!3165
2020-11-20 10:30:02 +00:00
0a5b22bc3b
start limiters in mix tasks
2020-11-20 11:37:01 +03:00
79a509ee61
Merge branch '2301-users-search-discoverability-fix' into 'develop'
...
[#2301 ] Proper handling of User.is_discoverable
Closes #2301
See merge request pleroma/pleroma!3162
2020-11-19 20:33:52 +00:00
cd1b4155d5
Merge branch 'oban-jobs-to-simple-tasks' into 'develop'
...
Moving some background jobs into simple tasks
Closes #1790
See merge request pleroma/pleroma!3129
2020-11-19 20:32:32 +00:00
66f411fba0
added subject actor to moderation log
2020-11-19 22:13:45 +03:00
b27d8f7437
Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix
...
# Conflicts:
# CHANGELOG.md
2020-11-19 19:35:44 +03:00
5e04f4156c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
2020-11-19 17:32:57 +01:00
e164c37139
[ #2301 ] Proper handling of `User.is_discoverable`: users appear in in-service search but are hidden from external services like search bots.
2020-11-19 19:30:02 +03:00
c8d11c3064
Merge branch '2317-old-reset-tokens' into 'develop'
...
Resolve "Don't allow old password reset tokens"
Closes #2317
See merge request pleroma/pleroma!3160
2020-11-19 16:22:14 +00:00
6fc38aac88
Merge branch 'fix-rum-search' into 'develop'
...
Fix rum search speed
See merge request pleroma/pleroma!3161
2020-11-19 16:20:59 +00:00
b38c3de411
Gitlab CI: Update postgres
2020-11-19 17:15:05 +01:00
1eda5ab267
CHANGELOG.md: Move rum fix entry to patch section
...
Also includes minor cosmetical fixes.
2020-11-19 19:13:19 +03:00
783fa797bb
SearchController Test: Fix test
2020-11-19 16:53:26 +01:00
81b6f02a5e
Search Test: linting
2020-11-19 16:48:51 +01:00
8b90d62506
Search: Only skip ordering the rum index.
2020-11-19 16:29:31 +01:00
3b86ad0744
Changelog: Document breaking change.
2020-11-19 16:26:17 +01:00
4a5ab690ef
Config: Set search_function to `websearch` by default
2020-11-19 16:17:14 +01:00
1c16c67c21
Cheatsheet: Add info about search_function
2020-11-19 16:16:55 +01:00
1bad91cba2
Changelog: Add info about the websearch option
2020-11-19 16:13:53 +01:00
a60242464e
Search: Add option to search with the websearch function
2020-11-19 16:12:01 +01:00
fcad3e716a
[ #2301 ] Quick fix: users with is_discoverable == false (default!) are included in search results.
2020-11-19 18:08:22 +03:00
46dab37351
little fix
2020-11-19 15:29:26 +03:00
2ee0fc194a
Changelog: Add info about search fixes.
2020-11-19 13:23:58 +01:00
5e2ba57327
Activity search: Fix order of results
...
Greatly speeds up the search for RUM.
2020-11-19 13:20:58 +01:00
21eaaf491c
Changelog: Add info about reset tokens
2020-11-19 12:29:41 +01:00
f6c22f4d08
Cheatsheet: Add docs about reset token expiration
2020-11-19 12:28:39 +01:00
11e0d5f9ac
Password Resets: Don't accept tokens above a certain age.
...
By default, one day
2020-11-19 12:27:06 +01:00
6f9b03384f
Merge branch 'hide-muted-reactions' into 'develop'
...
Hide reactions from muted and blocked users
Closes #1875
See merge request pleroma/pleroma!3147
2020-11-19 10:58:28 +00:00
4aaffe3a10
log capture
2020-11-19 09:58:32 +03:00
8a8c154b4e
test fixes
2020-11-19 09:58:32 +03:00
Haelwenn