Ivan Tashkinov [Sun, 6 Dec 2020 10:59:35 +0000 (13:59 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
Ivan Tashkinov [Sun, 6 Dec 2020 10:59:10 +0000 (13:59 +0300)]
[#3112] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions.
feld [Fri, 4 Dec 2020 18:17:35 +0000 (18:17 +0000)]
Merge branch 'fix/mix-task-yn-prompt' into 'develop'
Remove Mix.Pleroma.shell_yes?/1
See merge request pleroma/pleroma!3179
Mark Felder [Fri, 4 Dec 2020 18:07:23 +0000 (12:07 -0600)]
Answer new prompt interactively
Mark Felder [Fri, 27 Nov 2020 19:42:28 +0000 (13:42 -0600)]
shell_yes?/1 was not showing the correct message and always defaults to yes which is dangerous
feld [Fri, 4 Dec 2020 17:49:05 +0000 (17:49 +0000)]
Merge branch 'issue/2256' into 'develop'
[#2256] added subject actor to moderation log
See merge request pleroma/pleroma!3164
rinpatch [Thu, 3 Dec 2020 18:29:42 +0000 (18:29 +0000)]
Merge branch 'supported-emojos' into 'develop'
Update Emoji support to unicode 13.1, support all RGI emoji.
See merge request pleroma/pleroma!3186
lain [Thu, 3 Dec 2020 15:18:35 +0000 (16:18 +0100)]
Docs, Changelog: Add info about regional indicators
lain [Thu, 3 Dec 2020 15:17:39 +0000 (16:17 +0100)]
Emoji: Also accept regional indicators
Haelwenn [Thu, 3 Dec 2020 01:28:54 +0000 (01:28 +0000)]
Merge branch '2339-local-remote-mixup' into 'develop'
User: Don't allow local users in remote changesets
Closes #2339
See merge request pleroma/pleroma!3185
feld [Wed, 2 Dec 2020 22:40:13 +0000 (22:40 +0000)]
Merge branch 'update-linkify' into 'develop'
Update Linkify to 0.4.0
See merge request pleroma/pleroma!3184
Mark Felder [Wed, 2 Dec 2020 16:27:55 +0000 (10:27 -0600)]
We no longer expect mentions to link if they are prefixed with too many @'s
lain [Wed, 2 Dec 2020 15:52:44 +0000 (16:52 +0100)]
Changelog: Update changelog
lain [Wed, 2 Dec 2020 15:49:38 +0000 (16:49 +0100)]
Docs: Add info about RGI emoji
lain [Wed, 2 Dec 2020 15:46:19 +0000 (16:46 +0100)]
Emoji: Only accept RGI emoji.
"recommended for general interchange"
lain [Wed, 2 Dec 2020 15:18:08 +0000 (16:18 +0100)]
Emoji: Add test for ZWJ sequence emoji
lain [Wed, 2 Dec 2020 15:15:31 +0000 (16:15 +0100)]
Emoji: Remove unused emoji-data.txt
lain [Wed, 2 Dec 2020 15:15:03 +0000 (16:15 +0100)]
Emoji: Update to Unicode 13.1, switch base file, allow multichar.
lain [Wed, 2 Dec 2020 13:48:11 +0000 (14:48 +0100)]
SideEffects: fix test
lain [Wed, 2 Dec 2020 12:39:29 +0000 (13:39 +0100)]
User: Remove left-over (wrong) fix.
lain [Wed, 2 Dec 2020 11:18:43 +0000 (12:18 +0100)]
User: Don't allow local users in remote changesets
Mark Felder [Tue, 1 Dec 2020 23:26:25 +0000 (17:26 -0600)]
Update Linkify to 0.4.0
rinpatch [Tue, 1 Dec 2020 17:08:05 +0000 (17:08 +0000)]
Merge branch 'fix/search-test-on-exit' into 'develop'
Search tests: Use on_exit for restoring `persistent_term` state
See merge request pleroma/pleroma!3182
rinpatch [Tue, 1 Dec 2020 16:45:25 +0000 (19:45 +0300)]
Search tests: Use on_exit for restoring `persistent_term` state
Otherwise if the assertion failed, the code below which resets the
state would never be reached
Ivan Tashkinov [Mon, 30 Nov 2020 18:55:48 +0000 (21:55 +0300)]
[#3112] Allowed revoking same-user token from any apps. Added tests.
Ivan Tashkinov [Sat, 28 Nov 2020 18:51:27 +0000 (21:51 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
Ivan Tashkinov [Sat, 28 Nov 2020 18:51:06 +0000 (21:51 +0300)]
OAuth form user remembering feature. Local MastoFE login / logout fixes.
Haelwenn [Fri, 27 Nov 2020 14:20:59 +0000 (14:20 +0000)]
Merge branch '2727-gitlab-issues' into 'develop'
Gitlab-CI: Explicitly tag specified arm32 images.
Closes #2327
See merge request pleroma/pleroma!3178
lain [Fri, 27 Nov 2020 12:27:35 +0000 (13:27 +0100)]
Gitlab-CI: Explicitly tag specified arm32 images.
So we don't accidentally run generic images on runners
that only can deal with specific images.
lain [Fri, 27 Nov 2020 11:51:24 +0000 (11:51 +0000)]
Merge branch 'fix/2322-digest-algorithm-case-insensitive' into 'develop'
Digest algorithm is taken from header
Closes #2322
See merge request pleroma/pleroma!3176
Alexander Strizhakov [Thu, 26 Nov 2020 08:12:44 +0000 (11:12 +0300)]
digest algorithm is taken from header
rinpatch [Thu, 26 Nov 2020 15:35:22 +0000 (15:35 +0000)]
Merge branch 'removing-fed-sockets-settings' into 'develop'
Removing remaining fed sockets settings
See merge request pleroma/pleroma!3177
Alexander Strizhakov [Thu, 26 Nov 2020 14:39:38 +0000 (17:39 +0300)]
removing fed sockets settings
feld [Wed, 25 Nov 2020 23:59:52 +0000 (23:59 +0000)]
Merge branch 'fix/mix-debug' into 'develop'
Prevent mix tasks from spewing any internal logging unless DEBUG is in the env
See merge request pleroma/pleroma!3175
Maksim Pechnikov [Wed, 25 Nov 2020 13:44:11 +0000 (16:44 +0300)]
fix spec
Mark Felder [Wed, 25 Nov 2020 18:52:39 +0000 (12:52 -0600)]
Prevent mix tasks from spewing any internal logging unless DEBUG is in the env
e.g., DEBUG=1 mix pleroma.config migrate_from_db
Ivan Tashkinov [Wed, 25 Nov 2020 18:48:18 +0000 (21:48 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
Ivan Tashkinov [Wed, 25 Nov 2020 18:47:23 +0000 (21:47 +0300)]
Session token setting on token exchange. Auth-related refactoring.
rinpatch [Wed, 25 Nov 2020 11:57:13 +0000 (11:57 +0000)]
Merge branch 'fix/2323-release-configuration-provider' into 'develop'
Fix for elixir 1.11
Closes #2323
See merge request pleroma/pleroma!3173
Alexander Strizhakov [Tue, 24 Nov 2020 15:44:48 +0000 (18:44 +0300)]
fix for elixir 1.11
load runtime configs in releases with config provider
rinpatch [Wed, 25 Nov 2020 08:30:58 +0000 (08:30 +0000)]
Merge branch 'features/ruby-elements' into 'develop'
scrubbers/default: Add ruby element and it's childs
See merge request pleroma/pleroma!3172
Haelwenn (lanodan) Monnier [Tue, 24 Nov 2020 23:36:46 +0000 (00:36 +0100)]
scrubbers/default: Add ruby element and it's childs
This allows to format Japanese furigana (aka ruby) notation.
Present in XHTML 1.1, HTML 5 and later. Absent in XHTML 1.0, HTML 4 and earlier.
See https://www.w3.org/TR/ruby/
Haelwenn [Tue, 24 Nov 2020 12:17:09 +0000 (12:17 +0000)]
Merge branch 'chore/jason-in-tests' into 'develop'
Use Jason instead of Poison in tests
See merge request pleroma/pleroma!3171
Mark Felder [Mon, 23 Nov 2020 20:48:14 +0000 (14:48 -0600)]
Fix badly formatted JSON fixtures which causes Jason to erroneously detect control characters
Mark Felder [Mon, 23 Nov 2020 19:28:55 +0000 (13:28 -0600)]
Use Jason instead of Poison in tests
rinpatch [Mon, 23 Nov 2020 17:37:27 +0000 (17:37 +0000)]
Merge branch 'chore/bump-linkify' into 'develop'
[#2293] Update Linkify to 0.3.0
See merge request pleroma/pleroma!3170
Mark Felder [Mon, 23 Nov 2020 17:22:50 +0000 (11:22 -0600)]
Update Linkify to 0.3.0
Added
- Support returning result as iodata and as safe iodata
Fixed
- Hashtags followed by HTML tags "a", "code" and "pre" were not detected
- Incorrect parsing of HTML links inside HTML tags
- Punctuation marks in the end of urls were included in the html links
- Incorrect parsing of mentions with symbols before them
rinpatch [Mon, 23 Nov 2020 14:40:33 +0000 (14:40 +0000)]
Merge branch 'websearch' into 'develop'
Use `websearch_to_tsvector` by default
See merge request pleroma/pleroma!3163
lain [Mon, 23 Nov 2020 14:29:55 +0000 (15:29 +0100)]
Search: Save detected pg version in a persistent term.
lain [Mon, 23 Nov 2020 14:18:19 +0000 (15:18 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
Haelwenn [Mon, 23 Nov 2020 13:43:57 +0000 (13:43 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!3167
Guy Sheffer [Fri, 20 Nov 2020 16:09:10 +0000 (16:09 +0000)]
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/
feld [Sat, 21 Nov 2020 18:11:58 +0000 (18:11 +0000)]
Merge branch 'libmagic' into 'develop'
Add missing libmagic for image upload to dockerfile
See merge request pleroma/pleroma!3168
Guy Sheffer [Sat, 21 Nov 2020 17:57:38 +0000 (19:57 +0200)]
Add missing libmagic for image upload
Ivan Tashkinov [Sat, 21 Nov 2020 16:47:46 +0000 (19:47 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
Ivan Tashkinov [Sat, 21 Nov 2020 16:47:25 +0000 (19:47 +0300)]
Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.
feld [Fri, 20 Nov 2020 18:40:15 +0000 (18:40 +0000)]
Merge branch 'fix/2302-report-duplicates' into 'develop'
Fix for forwarded reports
Closes #2303 and #2302
See merge request pleroma/pleroma!3146
lain [Fri, 20 Nov 2020 15:38:05 +0000 (16:38 +0100)]
Linting.
lain [Fri, 20 Nov 2020 15:33:11 +0000 (16:33 +0100)]
Config, Docs: Remove search_function
lain [Fri, 20 Nov 2020 15:29:11 +0000 (16:29 +0100)]
SearchController Test: Fix test.
lain [Fri, 20 Nov 2020 15:28:00 +0000 (16:28 +0100)]
Changelog: Add info about search changes
lain [Fri, 20 Nov 2020 15:26:43 +0000 (16:26 +0100)]
Search: Change search method based on detected pg version
lain [Fri, 20 Nov 2020 15:26:22 +0000 (16:26 +0100)]
Application: Save postgres version in the environment
lain [Fri, 20 Nov 2020 10:30:02 +0000 (10:30 +0000)]
Merge branch 'fix/mix-tasks' into 'develop'
Start limiters in mix tasks
Closes #2320
See merge request pleroma/pleroma!3165
Alexander Strizhakov [Fri, 20 Nov 2020 08:37:01 +0000 (11:37 +0300)]
start limiters in mix tasks
feld [Thu, 19 Nov 2020 20:33:52 +0000 (20:33 +0000)]
Merge branch '2301-users-search-discoverability-fix' into 'develop'
[#2301] Proper handling of User.is_discoverable
Closes #2301
See merge request pleroma/pleroma!3162
feld [Thu, 19 Nov 2020 20:32:32 +0000 (20:32 +0000)]
Merge branch 'oban-jobs-to-simple-tasks' into 'develop'
Moving some background jobs into simple tasks
Closes #1790
See merge request pleroma/pleroma!3129
Maksim Pechnikov [Thu, 19 Nov 2020 19:13:45 +0000 (22:13 +0300)]
added subject actor to moderation log
Ivan Tashkinov [Thu, 19 Nov 2020 16:35:44 +0000 (19:35 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix
# Conflicts:
# CHANGELOG.md
lain [Thu, 19 Nov 2020 16:32:57 +0000 (17:32 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
Ivan Tashkinov [Thu, 19 Nov 2020 16:30:02 +0000 (19:30 +0300)]
[#2301] Proper handling of `User.is_discoverable`: users appear in in-service search but are hidden from external services like search bots.
Haelwenn [Thu, 19 Nov 2020 16:22:14 +0000 (16:22 +0000)]
Merge branch '2317-old-reset-tokens' into 'develop'
Resolve "Don't allow old password reset tokens"
Closes #2317
See merge request pleroma/pleroma!3160
rinpatch [Thu, 19 Nov 2020 16:20:59 +0000 (16:20 +0000)]
Merge branch 'fix-rum-search' into 'develop'
Fix rum search speed
See merge request pleroma/pleroma!3161
lain [Thu, 19 Nov 2020 16:15:05 +0000 (17:15 +0100)]
Gitlab CI: Update postgres
rinpatch [Thu, 19 Nov 2020 16:13:19 +0000 (19:13 +0300)]
CHANGELOG.md: Move rum fix entry to patch section
Also includes minor cosmetical fixes.
lain [Thu, 19 Nov 2020 15:53:26 +0000 (16:53 +0100)]
SearchController Test: Fix test
lain [Thu, 19 Nov 2020 15:48:51 +0000 (16:48 +0100)]
Search Test: linting
lain [Thu, 19 Nov 2020 15:29:31 +0000 (16:29 +0100)]
Search: Only skip ordering the rum index.
lain [Thu, 19 Nov 2020 15:26:17 +0000 (16:26 +0100)]
Changelog: Document breaking change.
lain [Thu, 19 Nov 2020 15:17:14 +0000 (16:17 +0100)]
Config: Set search_function to `websearch` by default
lain [Thu, 19 Nov 2020 15:16:55 +0000 (16:16 +0100)]
Cheatsheet: Add info about search_function
lain [Thu, 19 Nov 2020 15:13:53 +0000 (16:13 +0100)]
Changelog: Add info about the websearch option
lain [Thu, 19 Nov 2020 15:12:01 +0000 (16:12 +0100)]
Search: Add option to search with the websearch function
Ivan Tashkinov [Thu, 19 Nov 2020 15:08:22 +0000 (18:08 +0300)]
[#2301] Quick fix: users with is_discoverable == false (default!) are included in search results.
Alexander Strizhakov [Thu, 19 Nov 2020 12:29:26 +0000 (15:29 +0300)]
little fix
lain [Thu, 19 Nov 2020 12:23:58 +0000 (13:23 +0100)]
Changelog: Add info about search fixes.
lain [Thu, 19 Nov 2020 12:20:58 +0000 (13:20 +0100)]
Activity search: Fix order of results
Greatly speeds up the search for RUM.
lain [Thu, 19 Nov 2020 11:29:41 +0000 (12:29 +0100)]
Changelog: Add info about reset tokens
lain [Thu, 19 Nov 2020 11:28:39 +0000 (12:28 +0100)]
Cheatsheet: Add docs about reset token expiration
lain [Thu, 19 Nov 2020 11:27:06 +0000 (12:27 +0100)]
Password Resets: Don't accept tokens above a certain age.
By default, one day
lain [Thu, 19 Nov 2020 10:58:28 +0000 (10:58 +0000)]
Merge branch 'hide-muted-reactions' into 'develop'
Hide reactions from muted and blocked users
Closes #1875
See merge request pleroma/pleroma!3147
Alexander Strizhakov [Wed, 18 Nov 2020 13:36:24 +0000 (16:36 +0300)]
log capture
Alexander Strizhakov [Wed, 18 Nov 2020 07:03:48 +0000 (10:03 +0300)]
test fixes
Alexander Strizhakov [Tue, 17 Nov 2020 17:03:28 +0000 (20:03 +0300)]
changelog entries for fixes
Alexander Strizhakov [Tue, 17 Nov 2020 16:57:57 +0000 (19:57 +0300)]
fix for mastodon forwarded reports
Alexander Strizhakov [Mon, 16 Nov 2020 16:41:03 +0000 (19:41 +0300)]
formatting
Alexander Strizhakov [Mon, 16 Nov 2020 16:22:32 +0000 (19:22 +0300)]
fix for forwarded reports
feld [Wed, 18 Nov 2020 21:16:12 +0000 (21:16 +0000)]
Merge branch 'revert-
da4660d2' into 'develop'
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"
See merge request pleroma/pleroma!3158
feld [Wed, 18 Nov 2020 20:32:30 +0000 (20:32 +0000)]
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"
This reverts merge request !2955
minibikini [Wed, 18 Nov 2020 20:22:40 +0000 (20:22 +0000)]
Merge branch 'develop' into 'hide-muted-reactions'
# Conflicts:
# CHANGELOG.md
projects / akkoma / log