akkoma
3 years agoMerge branch 'supported-emojos' into 'develop'
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

3 years agoconfig_db search methods
Alexander Strizhakov [Thu, 3 Dec 2020 16:34:23 +0000 (19:34 +0300)]
config_db search methods

3 years agodump_key/2 no longer used
Mark Felder [Thu, 3 Dec 2020 16:03:44 +0000 (10:03 -0600)]
dump_key/2 no longer used

3 years agoApply 6 suggestion(s) to 1 file(s)
feld [Thu, 3 Dec 2020 16:03:14 +0000 (16:03 +0000)]
Apply 6 suggestion(s) to 1 file(s)

3 years agoCredo
Mark Felder [Thu, 3 Dec 2020 15:58:24 +0000 (09:58 -0600)]
Credo

3 years agoDocs, Changelog: Add info about regional indicators
lain [Thu, 3 Dec 2020 15:18:35 +0000 (16:18 +0100)]
Docs, Changelog: Add info about regional indicators

3 years agoEmoji: Also accept regional indicators
lain [Thu, 3 Dec 2020 15:17:39 +0000 (16:17 +0100)]
Emoji: Also accept regional indicators

3 years agoMerge branch '2339-local-remote-mixup' into 'develop'
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

3 years agoMerge branch 'update-linkify' into 'develop'
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

3 years agoMake the --force flag for reset command consistent with the others and deduplicate...
Mark Felder [Wed, 2 Dec 2020 22:34:23 +0000 (16:34 -0600)]
Make the --force flag for reset command consistent with the others and deduplicate db truncation

3 years agoAdd --force flag for delete and reset commands
Mark Felder [Wed, 2 Dec 2020 22:24:32 +0000 (16:24 -0600)]
Add --force flag for delete and reset commands

Bunch of reorganization and consolidation

3 years agoAdd comment for this mysterious behavior
Mark Felder [Wed, 2 Dec 2020 20:22:59 +0000 (14:22 -0600)]
Add comment for this mysterious behavior

3 years agoNo need for a separate functions here
Mark Felder [Wed, 2 Dec 2020 19:00:07 +0000 (13:00 -0600)]
No need for a separate functions here

3 years agoUse a callback strategy to short circuit the functions and print a nice error
Mark Felder [Wed, 2 Dec 2020 18:33:34 +0000 (12:33 -0600)]
Use a callback strategy to short circuit the functions and print a nice error

3 years agoCentralize check that configdb is enabled which now raises an exception
Mark Felder [Sun, 29 Nov 2020 19:29:36 +0000 (13:29 -0600)]
Centralize check that configdb is enabled which now raises an exception

3 years agoLeft public during debugging
Mark Felder [Sun, 29 Nov 2020 18:59:03 +0000 (12:59 -0600)]
Left public during debugging

3 years agoAdd tests for config dumping
Mark Felder [Sat, 28 Nov 2020 19:32:28 +0000 (13:32 -0600)]
Add tests for config dumping

3 years agoUse inspect instead of faking the output
Mark Felder [Sat, 28 Nov 2020 18:24:37 +0000 (12:24 -0600)]
Use inspect instead of faking the output

3 years agoRemove unnecessary keys command
Mark Felder [Sat, 28 Nov 2020 18:22:30 +0000 (12:22 -0600)]
Remove unnecessary keys command

3 years agoSync docs with mix commands
Mark Felder [Sat, 28 Nov 2020 18:19:00 +0000 (12:19 -0600)]
Sync docs with mix commands

3 years agoThe debug output is no longer there by default
Mark Felder [Sat, 28 Nov 2020 18:09:17 +0000 (12:09 -0600)]
The debug output is no longer there by default

3 years agoEnsure scary warning starts on a new line
Mark Felder [Sat, 28 Nov 2020 18:05:01 +0000 (12:05 -0600)]
Ensure scary warning starts on a new line

3 years agoUpdate ConfigDB docs for new mix commands
Mark Felder [Sat, 28 Nov 2020 17:53:45 +0000 (11:53 -0600)]
Update ConfigDB docs for new mix commands

3 years agoPrint whole config when resetting and include a scary looking message.
Mark Felder [Fri, 27 Nov 2020 22:32:46 +0000 (16:32 -0600)]
Print whole config when resetting and include a scary looking message.

3 years agoBoth are really atoms
Mark Felder [Fri, 27 Nov 2020 22:32:32 +0000 (16:32 -0600)]
Both are really atoms

3 years agoTransform strings to atoms for all cases, including when the atom is a module like...
Mark Felder [Fri, 27 Nov 2020 22:20:28 +0000 (16:20 -0600)]
Transform strings to atoms for all cases, including when the atom is a module like Pleroma.Emails.Mailer

3 years agoSupport atoms and strings as args to the mix task
Mark Felder [Fri, 27 Nov 2020 20:44:05 +0000 (14:44 -0600)]
Support atoms and strings as args to the mix task

Improve output. Show the user what will be deleted before the prompt.

3 years agoFix deletion regression due to strings instead of atoms
Mark Felder [Fri, 27 Nov 2020 20:02:45 +0000 (14:02 -0600)]
Fix deletion regression due to strings instead of atoms
Improve message after successful deletion

3 years agoImprove dumping groups and specific keys; add prompts for delete and reset
Mark Felder [Fri, 27 Nov 2020 19:55:43 +0000 (13:55 -0600)]
Improve dumping groups and specific keys; add prompts for delete and reset

3 years agoSupport listing groups, listing keys in a group, and dumping the config based on...
Mark Felder [Fri, 27 Nov 2020 18:33:55 +0000 (12:33 -0600)]
Support listing groups, listing keys in a group, and dumping the config based on group or specific key in that group

3 years agoSort output by group
Mark Felder [Fri, 27 Nov 2020 18:32:53 +0000 (12:32 -0600)]
Sort output by group

Not the best sorting, but better than nothing.

3 years agoAdd the delete and reset instructions
Mark Felder [Wed, 25 Nov 2020 23:51:31 +0000 (17:51 -0600)]
Add the delete and reset instructions

3 years agoRename keys to groups
Mark Felder [Wed, 25 Nov 2020 23:49:36 +0000 (17:49 -0600)]
Rename keys to groups

3 years agoSpelling
Mark Felder [Wed, 25 Nov 2020 23:46:57 +0000 (17:46 -0600)]
Spelling

3 years agoDocument how to delete individual configuration groups and completely reset the confi...
Mark Felder [Wed, 25 Nov 2020 23:31:44 +0000 (17:31 -0600)]
Document how to delete individual configuration groups and completely reset the config without SQL

3 years agoBetter deletion message
Mark Felder [Wed, 25 Nov 2020 23:16:23 +0000 (17:16 -0600)]
Better deletion message

3 years agoAdd mix tasks to give additional recovery and debugging options
Mark Felder [Wed, 25 Nov 2020 18:44:06 +0000 (12:44 -0600)]
Add mix tasks to give additional recovery and debugging options

- pleroma.config dump: prints the entire config as it would be exported to the filesystem
- pleroma.config dump KEY: prints the configuration under a specific ConfigDB key in the database
- pleroma.config keylist: lists the available keys in ConfigDB
- pleroma.config keydel KEY: deletes ConfigDB entry stored under the key

This should prevent the need for users to manually execute SQL queries.

3 years agoWe no longer expect mentions to link if they are prefixed with too many @'s
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

3 years agoChangelog: Update changelog
lain [Wed, 2 Dec 2020 15:52:44 +0000 (16:52 +0100)]
Changelog: Update changelog

3 years agoDocs: Add info about RGI emoji
lain [Wed, 2 Dec 2020 15:49:38 +0000 (16:49 +0100)]
Docs: Add info about RGI emoji

3 years agoEmoji: Only accept RGI emoji.
lain [Wed, 2 Dec 2020 15:46:19 +0000 (16:46 +0100)]
Emoji: Only accept RGI emoji.

"recommended for general interchange"

3 years agoEmoji: Add test for ZWJ sequence emoji
lain [Wed, 2 Dec 2020 15:18:08 +0000 (16:18 +0100)]
Emoji: Add test for ZWJ sequence emoji

3 years agoDocument follow relationship updates and cleanup
Egor Kislitsyn [Wed, 2 Dec 2020 15:16:36 +0000 (19:16 +0400)]
Document follow relationship updates and cleanup

3 years agoEmoji: Remove unused emoji-data.txt
lain [Wed, 2 Dec 2020 15:15:31 +0000 (16:15 +0100)]
Emoji: Remove unused emoji-data.txt

3 years agoEmoji: Update to Unicode 13.1, switch base file, allow multichar.
lain [Wed, 2 Dec 2020 15:15:03 +0000 (16:15 +0100)]
Emoji: Update to Unicode 13.1, switch base file, allow multichar.

3 years agoSideEffects: fix test
lain [Wed, 2 Dec 2020 13:48:11 +0000 (14:48 +0100)]
SideEffects: fix test

3 years agoUser: Remove left-over (wrong) fix.
lain [Wed, 2 Dec 2020 12:39:29 +0000 (13:39 +0100)]
User: Remove left-over (wrong) fix.

3 years agoUser: Don't allow local users in remote changesets
lain [Wed, 2 Dec 2020 11:18:43 +0000 (12:18 +0100)]
User: Don't allow local users in remote changesets

3 years agoUpdate Linkify to 0.4.0
Mark Felder [Tue, 1 Dec 2020 23:26:25 +0000 (17:26 -0600)]
Update Linkify to 0.4.0

3 years agoStream follow updates
Egor Kislitsyn [Tue, 1 Dec 2020 20:17:52 +0000 (00:17 +0400)]
Stream follow updates

3 years agoMerge branch 'fix/search-test-on-exit' into 'develop'
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

3 years agoSearch tests: Use on_exit for restoring `persistent_term` state
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

3 years ago[#3112] Allowed revoking same-user token from any apps. Added tests.
Ivan Tashkinov [Mon, 30 Nov 2020 18:55:48 +0000 (21:55 +0300)]
[#3112] Allowed revoking same-user token from any apps. Added tests.

3 years agoMerge remote-tracking branch 'remotes/origin/develop' into auth-improvements
Ivan Tashkinov [Sat, 28 Nov 2020 18:51:27 +0000 (21:51 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements

3 years agoOAuth form user remembering feature. Local MastoFE login / logout fixes.
Ivan Tashkinov [Sat, 28 Nov 2020 18:51:06 +0000 (21:51 +0300)]
OAuth form user remembering feature. Local MastoFE login / logout fixes.

3 years agoMerge branch '2727-gitlab-issues' into 'develop'
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

3 years agoGitlab-CI: Explicitly tag specified arm32 images.
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.

3 years agoMerge branch 'fix/2322-digest-algorithm-case-insensitive' into 'develop'
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

3 years agodigest algorithm is taken from header
Alexander Strizhakov [Thu, 26 Nov 2020 08:12:44 +0000 (11:12 +0300)]
digest algorithm is taken from header

3 years agoMerge branch 'removing-fed-sockets-settings' into 'develop'
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

3 years agoremoving fed sockets settings
Alexander Strizhakov [Thu, 26 Nov 2020 14:39:38 +0000 (17:39 +0300)]
removing fed sockets settings

3 years agoMerge branch 'fix/mix-debug' into 'develop'
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

3 years agofix spec
Maksim Pechnikov [Wed, 25 Nov 2020 13:44:11 +0000 (16:44 +0300)]
fix spec

3 years agoPrevent mix tasks from spewing any internal logging unless DEBUG is in the env
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

3 years agoMerge remote-tracking branch 'remotes/origin/develop' into auth-improvements
Ivan Tashkinov [Wed, 25 Nov 2020 18:48:18 +0000 (21:48 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements

3 years agoSession token setting on token exchange. Auth-related refactoring.
Ivan Tashkinov [Wed, 25 Nov 2020 18:47:23 +0000 (21:47 +0300)]
Session token setting on token exchange. Auth-related refactoring.

3 years agoMerge branch 'fix/2323-release-configuration-provider' into 'develop'
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

3 years agofix for elixir 1.11
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

3 years agoMerge branch 'features/ruby-elements' into 'develop'
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

3 years agoscrubbers/default: Add ruby element and it's childs
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/

3 years agoMerge branch 'chore/jason-in-tests' into 'develop'
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

3 years agoFix badly formatted JSON fixtures which causes Jason to erroneously detect control...
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

3 years agoUse Jason instead of Poison in tests
Mark Felder [Mon, 23 Nov 2020 19:28:55 +0000 (13:28 -0600)]
Use Jason instead of Poison in tests

3 years agoMerge branch 'chore/bump-linkify' into 'develop'
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

3 years agoUpdate Linkify to 0.3.0
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

3 years agoMerge branch 'websearch' into 'develop'
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

3 years agoSearch: Save detected pg version in a persistent term.
lain [Mon, 23 Nov 2020 14:29:55 +0000 (15:29 +0100)]
Search: Save detected pg version in a persistent term.

3 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
lain [Mon, 23 Nov 2020 14:18:19 +0000 (15:18 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch

3 years agoMerge branch 'weblate-pleroma-pleroma' into 'develop'
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

3 years agoMerge branch 'cherry-pick-a65fc78c' into 'stable'
feld [Sat, 21 Nov 2020 18:29:26 +0000 (18:29 +0000)]
Merge branch 'cherry-pick-a65fc78c' into 'stable'

Dockerfile fixes for stable

See merge request pleroma/pleroma!3169

3 years agoInstall file-dev in Dockerfile build stage
Michael Walker [Thu, 12 Nov 2020 22:20:17 +0000 (22:20 +0000)]
Install file-dev in Dockerfile build stage

This is required by the majic, added in #2534.

3 years agoMerge branch 'libmagic' into 'develop'
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

(cherry picked from commit a65fc78c6a14e1333ce71d28824a490a8a6da69b)

e6af7dc7 Add missing libmagic for image upload

3 years agoTranslated using Weblate (Hebrew)
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/

3 years agoMerge branch 'libmagic' into 'develop'
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

3 years agoAdd missing libmagic for image upload
Guy Sheffer [Sat, 21 Nov 2020 17:57:38 +0000 (19:57 +0200)]
Add missing libmagic for image upload

3 years agoMerge remote-tracking branch 'remotes/origin/develop' into auth-improvements
Ivan Tashkinov [Sat, 21 Nov 2020 16:47:46 +0000 (19:47 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements

3 years agoSession-based OAuth auth fixes (token expiration check), refactoring, tweaks.
Ivan Tashkinov [Sat, 21 Nov 2020 16:47:25 +0000 (19:47 +0300)]
Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.

3 years agoUpdate CHANGELOG.md: registration workflow
Alex Gleason [Sat, 21 Nov 2020 16:24:45 +0000 (10:24 -0600)]
Update CHANGELOG.md: registration workflow

3 years agoMerge remote-tracking branch 'upstream/develop' into registration-workflow
Alex Gleason [Sat, 21 Nov 2020 16:23:53 +0000 (10:23 -0600)]
Merge remote-tracking branch 'upstream/develop' into registration-workflow

3 years agoMerge branch 'cherry-pick-8a7ee9fe' into 'stable'
feld [Fri, 20 Nov 2020 21:40:23 +0000 (21:40 +0000)]
Merge branch 'cherry-pick-8a7ee9fe' into 'stable'

Merge branch 'revert-da4660d2' into 'stable'

See merge request pleroma/pleroma!3166

3 years agoMerge branch 'revert-da4660d2' into 'develop'
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

(cherry picked from commit 8a7ee9fe74f64680da366b0da51038bed022061b)

42ff5ea9 Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"

3 years agoMerge branch 'fix/2302-report-duplicates' into 'develop'
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

3 years agoLinting.
lain [Fri, 20 Nov 2020 15:38:05 +0000 (16:38 +0100)]
Linting.

3 years agoConfig, Docs: Remove search_function
lain [Fri, 20 Nov 2020 15:33:11 +0000 (16:33 +0100)]
Config, Docs: Remove search_function

3 years agoSearchController Test: Fix test.
lain [Fri, 20 Nov 2020 15:29:11 +0000 (16:29 +0100)]
SearchController Test: Fix test.

3 years agoChangelog: Add info about search changes
lain [Fri, 20 Nov 2020 15:28:00 +0000 (16:28 +0100)]
Changelog: Add info about search changes

3 years agoSearch: Change search method based on detected pg version
lain [Fri, 20 Nov 2020 15:26:43 +0000 (16:26 +0100)]
Search: Change search method based on detected pg version

3 years agoApplication: Save postgres version in the environment
lain [Fri, 20 Nov 2020 15:26:22 +0000 (16:26 +0100)]
Application: Save postgres version in the environment

3 years agoMerge branch 'fix/mix-tasks' into 'develop'
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

3 years agostart limiters in mix tasks
Alexander Strizhakov [Fri, 20 Nov 2020 08:37:01 +0000 (11:37 +0300)]
start limiters in mix tasks