fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-30 17:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
12626 commits 26 branches 108 tags 316 MiB
Commit graph

12626 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Strizhakov 0a5b22bc3b
start limiters in mix tasks 2020-11-20 11:37:01 +03:00
feld 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
feld 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
Maksim Pechnikov 66f411fba0 added subject actor to moderation log 2020-11-19 22:13:45 +03:00
Ivan Tashkinov 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
lain 5e04f4156c Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch 2020-11-19 17:32:57 +01:00
Ivan Tashkinov 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
Haelwenn 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
rinpatch 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
lain b38c3de411 Gitlab CI: Update postgres 2020-11-19 17:15:05 +01:00
rinpatch 1eda5ab267 CHANGELOG.md: Move rum fix entry to patch section 
Also includes minor cosmetical fixes.
 2020-11-19 19:13:19 +03:00
lain 783fa797bb SearchController Test: Fix test 2020-11-19 16:53:26 +01:00
lain 81b6f02a5e Search Test: linting 2020-11-19 16:48:51 +01:00
lain 8b90d62506 Search: Only skip ordering the rum index. 2020-11-19 16:29:31 +01:00
lain 3b86ad0744 Changelog: Document breaking change. 2020-11-19 16:26:17 +01:00
lain 4a5ab690ef Config: Set search_function to websearch by default 2020-11-19 16:17:14 +01:00
lain 1c16c67c21 Cheatsheet: Add info about search_function 2020-11-19 16:16:55 +01:00
lain 1bad91cba2 Changelog: Add info about the websearch option 2020-11-19 16:13:53 +01:00
lain a60242464e Search: Add option to search with the websearch function 2020-11-19 16:12:01 +01:00
Ivan Tashkinov fcad3e716a [#2301] Quick fix: users with is_discoverable == false (default!) are included in search results. 2020-11-19 18:08:22 +03:00
Alexander Strizhakov 46dab37351
little fix 2020-11-19 15:29:26 +03:00
lain 2ee0fc194a Changelog: Add info about search fixes. 2020-11-19 13:23:58 +01:00
lain 5e2ba57327 Activity search: Fix order of results 
Greatly speeds up the search for RUM.
 2020-11-19 13:20:58 +01:00
lain 21eaaf491c Changelog: Add info about reset tokens 2020-11-19 12:29:41 +01:00
lain f6c22f4d08 Cheatsheet: Add docs about reset token expiration 2020-11-19 12:28:39 +01:00
lain 11e0d5f9ac Password Resets: Don't accept tokens above a certain age. 
By default, one day
 2020-11-19 12:27:06 +01:00
lain 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
Alexander Strizhakov 4aaffe3a10
log capture 2020-11-19 09:58:32 +03:00
Alexander Strizhakov 8a8c154b4e
test fixes 2020-11-19 09:58:32 +03:00
Alexander Strizhakov 44f3795b8e
changelog entries for fixes 2020-11-19 09:58:27 +03:00
Alexander Strizhakov be0b874e1d
fix for mastodon forwarded reports 2020-11-19 09:53:14 +03:00
Alexander Strizhakov a840aefda8
formatting 2020-11-19 09:53:13 +03:00
Alexander Strizhakov e2bf6b1f7e
fix for forwarded reports 2020-11-19 09:53:13 +03:00
feld 8a7ee9fe74 Merge branch 'revert-da4660d2' into 'develop' 
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"

See merge request pleroma/pleroma!3158
 2020-11-18 21:16:12 +00:00
feld 42ff5ea95e Revert "Merge branch 'use-https-in-dockerfile' into 'develop'" 
This reverts merge request !2955
 2020-11-18 20:32:30 +00:00
minibikini 6669ac5bf7 Merge branch 'develop' into 'hide-muted-reactions' 
# Conflicts:
#   CHANGELOG.md
 2020-11-18 20:22:40 +00:00
Mark Felder 1d03ba4ffb Fixed emoji reactions not being filtered from blocked and muted accounts 2020-11-18 20:13:25 +00:00
feld a1056aace1 Merge branch 'fix/mix-task-user-delete_activities' into 'develop' 
Fix mix pleroma.user delete_activities task

See merge request pleroma/pleroma!3156
 2020-11-18 18:57:47 +00:00
lain aae669d05e Merge branch 'fix/webpush-and-emojireact' into 'develop' 
Push notifications: add pleroma:emoji_reaction, improve tests

Closes #2185

See merge request pleroma/pleroma!3141
 2020-11-18 18:33:48 +00:00
lain 1b63aa0b4f Apply 1 suggestion(s) to 1 file(s) 2020-11-18 18:27:30 +00:00
lain 6b32e1de23 Merge branch 'frontend-admin-api' into 'develop' 
Add an API to manage frontends

Closes #2238

See merge request pleroma/pleroma!3108
 2020-11-18 17:51:57 +00:00
lain d7b63272b8 Changelog: Move api info to api heading. 2020-11-18 18:32:13 +01:00
Maksim Pechnikov 9c5d1cb9ed fix tests 2020-11-18 09:58:51 +03:00
Maksim 3c00af82dc Apply 1 suggestion(s) to 1 file(s) 2020-11-18 05:19:37 +00:00
Maksim 137b7f9e28 Apply 1 suggestion(s) to 1 file(s) 2020-11-18 05:19:30 +00:00
Maksim e91e2399ee Apply 1 suggestion(s) to 1 file(s) 2020-11-18 05:19:22 +00:00
Maksim ce11f0bc33 Apply 1 suggestion(s) to 1 file(s) 2020-11-18 05:19:09 +00:00
Maksim 25eb222bed Apply 1 suggestion(s) to 1 file(s) 2020-11-18 05:19:01 +00:00
feld fe7008ee39 Merge branch 'update/admin-fe-20201117' into 'develop' 
Update AdminFE

See merge request pleroma/pleroma!3157
 2020-11-17 23:16:17 +00:00
Mark Felder ad7fc35252 Update AdminFE build to pleroma/admin-fe@5b38aea279 2020-11-17 17:01:34 -06:00