feld [Sat, 12 Dec 2020 19:20:34 +0000 (19:20 +0000)]
Merge branch 'fix/tracking-majic' into 'develop'
Majic: specify commit so source users do not get surprise updates
See merge request pleroma/pleroma!3200
Mark Felder [Sat, 12 Dec 2020 19:04:16 +0000 (13:04 -0600)]
Majic: specify commit so source users do not get surprise updates
Haelwenn [Fri, 11 Dec 2020 15:01:08 +0000 (15:01 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!3195
ZEN [Thu, 10 Dec 2020 16:11:25 +0000 (16:11 +0000)]
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (106 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/uk/
Haelwenn [Thu, 10 Dec 2020 22:39:38 +0000 (22:39 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!3194
ZEN [Thu, 10 Dec 2020 16:09:44 +0000 (16:09 +0000)]
Added translation using Weblate (Ukrainian)
feld [Wed, 9 Dec 2020 18:30:13 +0000 (18:30 +0000)]
Merge branch 'oauth-entities-expiration-tweaks' into 'develop'
Tweaks to OAuth entities expiration
See merge request pleroma/pleroma!3193
Ivan Tashkinov [Wed, 9 Dec 2020 18:14:39 +0000 (21:14 +0300)]
Tweaks to OAuth entities expiration: changed default to 30 days, removed hardcoded values usage, fixed OAuthView (expires_in).
feld [Wed, 9 Dec 2020 17:10:09 +0000 (17:10 +0000)]
Merge branch 'oauth-token-30-days-expiration' into 'develop'
Changed default OAuth token expiration time to 30 days
See merge request pleroma/pleroma!3192
Ivan Tashkinov [Wed, 9 Dec 2020 16:59:46 +0000 (19:59 +0300)]
Changed default OAuth token expiration time to 30 days.
lain [Wed, 9 Dec 2020 15:55:45 +0000 (15:55 +0000)]
Merge branch 'auth-improvements' into 'develop'
Cookie auth rework / Auth subsystem refactoring and tweaks
Closes pleroma/secteam/pleroma#3
See merge request pleroma/pleroma!3112
lain [Wed, 9 Dec 2020 15:52:31 +0000 (15:52 +0000)]
Merge branch 'stream-follow-updates' into 'develop'
Stream follow updates
Closes #2299
See merge request pleroma/pleroma!3183
Ivan Tashkinov [Wed, 9 Dec 2020 15:43:20 +0000 (18:43 +0300)]
[#3112] .gitattributes fix.
Egor Kislitsyn [Wed, 9 Dec 2020 15:40:40 +0000 (19:40 +0400)]
Update CHANGELOG
lain [Tue, 8 Dec 2020 16:36:51 +0000 (16:36 +0000)]
Merge branch 'feat/warn-large-pool-size' into 'develop'
Add a startup error for modified Repo pool_size
See merge request pleroma/pleroma!3190
lain [Tue, 8 Dec 2020 16:30:10 +0000 (17:30 +0100)]
ApplicationRequirements: Add test, more text for pool size.
lain [Tue, 8 Dec 2020 16:16:43 +0000 (16:16 +0000)]
Apply 1 suggestion(s) to 1 file(s)
feld [Mon, 7 Dec 2020 22:49:45 +0000 (22:49 +0000)]
Merge branch 'features/favicon-unreachable-instance' into 'develop'
instance: Do not fetch unreachable instances
Closes #2346
See merge request pleroma/pleroma!3189
Mark Felder [Mon, 7 Dec 2020 22:36:44 +0000 (16:36 -0600)]
Add a startup error for modified Repo pool_size
Haelwenn (lanodan) Monnier [Mon, 7 Dec 2020 20:18:51 +0000 (21:18 +0100)]
instance.reachable?: Limit to binary input
Haelwenn (lanodan) Monnier [Mon, 7 Dec 2020 19:09:34 +0000 (20:09 +0100)]
instance: Do not fetch unreachable instances
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2346
Ivan Tashkinov [Mon, 7 Dec 2020 18:50:32 +0000 (21:50 +0300)]
[#3112] Changelog entry.
Ivan Tashkinov [Mon, 7 Dec 2020 18:45:04 +0000 (21:45 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
# Conflicts:
# CHANGELOG.md
lain [Mon, 7 Dec 2020 18:06:06 +0000 (18:06 +0000)]
Merge branch 'feature/configdb-mix-tasks' into 'develop'
Add mix tasks to give additional ConfigDB recovery and debugging options
See merge request pleroma/pleroma!3174
Mark Felder [Mon, 7 Dec 2020 17:45:56 +0000 (11:45 -0600)]
Print out settings that will be removed when specifying the group and key for consistency
Fix error message when specified key doesn't exist
Mark Felder [Mon, 7 Dec 2020 17:22:07 +0000 (11:22 -0600)]
Formatting
Mark Felder [Mon, 7 Dec 2020 17:21:06 +0000 (11:21 -0600)]
Slip in a test to ensure we can use the atom syntax in mix task arguments
feld [Mon, 7 Dec 2020 17:13:29 +0000 (17:13 +0000)]
Apply 1 suggestion(s) to 1 file(s)
feld [Mon, 7 Dec 2020 17:12:47 +0000 (17:12 +0000)]
Merge branch 'feature/configdb-mix-tasks-refactoring' into 'feature/configdb-mix-tasks'
[#3174] Refactoring: ConfigDB fetching functions, ConfigDB tests.
See merge request pleroma/pleroma!3187
Ivan Tashkinov [Sun, 6 Dec 2020 15:02:30 +0000 (18:02 +0300)]
[#3174] Refactoring: ConfigDB fetching functions, ConfigDB tests.
Minor fixes.
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.
Egor Kislitsyn [Sat, 5 Dec 2020 19:48:13 +0000 (23:48 +0400)]
Fix typo
Mark Felder [Sat, 5 Dec 2020 14:41:15 +0000 (08:41 -0600)]
Add entry announcing new ConfigDB mix tasks
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
Mark Felder [Fri, 4 Dec 2020 17:37:49 +0000 (11:37 -0600)]
More compact representation
Mark Felder [Fri, 4 Dec 2020 17:30:48 +0000 (11:30 -0600)]
Ensure deleting entire group prints out settings that will be removed before actually removing them
Mark Felder [Fri, 4 Dec 2020 17:19:58 +0000 (11:19 -0600)]
Fix deleting an entire group. Also utilize Pleroma.ConfigDB.delete/1
Mark Felder [Fri, 4 Dec 2020 17:09:13 +0000 (11:09 -0600)]
Use Pleroma.ConfigDB.delete/1 instead of rolling our own
Mark Felder [Fri, 4 Dec 2020 17:04:53 +0000 (11:04 -0600)]
Use Enum.any? to ensure we return true if there are results
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
Alexander Strizhakov [Thu, 3 Dec 2020 16:34:23 +0000 (19:34 +0300)]
config_db search methods
Mark Felder [Thu, 3 Dec 2020 16:03:44 +0000 (10:03 -0600)]
dump_key/2 no longer used
feld [Thu, 3 Dec 2020 16:03:14 +0000 (16:03 +0000)]
Apply 6 suggestion(s) to 1 file(s)
Mark Felder [Thu, 3 Dec 2020 15:58:24 +0000 (09:58 -0600)]
Credo
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 22:34:23 +0000 (16:34 -0600)]
Make the --force flag for reset command consistent with the others and deduplicate db truncation
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
Mark Felder [Wed, 2 Dec 2020 20:22:59 +0000 (14:22 -0600)]
Add comment for this mysterious behavior
Mark Felder [Wed, 2 Dec 2020 19:00:07 +0000 (13:00 -0600)]
No need for a separate functions here
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
Mark Felder [Sun, 29 Nov 2020 19:29:36 +0000 (13:29 -0600)]
Centralize check that configdb is enabled which now raises an exception
Mark Felder [Sun, 29 Nov 2020 18:59:03 +0000 (12:59 -0600)]
Left public during debugging
Mark Felder [Sat, 28 Nov 2020 19:32:28 +0000 (13:32 -0600)]
Add tests for config dumping
Mark Felder [Sat, 28 Nov 2020 18:24:37 +0000 (12:24 -0600)]
Use inspect instead of faking the output
Mark Felder [Sat, 28 Nov 2020 18:22:30 +0000 (12:22 -0600)]
Remove unnecessary keys command
Mark Felder [Sat, 28 Nov 2020 18:19:00 +0000 (12:19 -0600)]
Sync docs with mix commands
Mark Felder [Sat, 28 Nov 2020 18:09:17 +0000 (12:09 -0600)]
The debug output is no longer there by default
Mark Felder [Sat, 28 Nov 2020 18:05:01 +0000 (12:05 -0600)]
Ensure scary warning starts on a new line
Mark Felder [Sat, 28 Nov 2020 17:53:45 +0000 (11:53 -0600)]
Update ConfigDB docs for new mix commands
Mark Felder [Fri, 27 Nov 2020 22:32:46 +0000 (16:32 -0600)]
Print whole config when resetting and include a scary looking message.
Mark Felder [Fri, 27 Nov 2020 22:32:32 +0000 (16:32 -0600)]
Both are really atoms
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
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.
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
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
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
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.
Mark Felder [Wed, 25 Nov 2020 23:51:31 +0000 (17:51 -0600)]
Add the delete and reset instructions
Mark Felder [Wed, 25 Nov 2020 23:49:36 +0000 (17:49 -0600)]
Rename keys to groups
Mark Felder [Wed, 25 Nov 2020 23:46:57 +0000 (17:46 -0600)]
Spelling
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
Mark Felder [Wed, 25 Nov 2020 23:16:23 +0000 (17:16 -0600)]
Better deletion message
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.
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
Egor Kislitsyn [Wed, 2 Dec 2020 15:16:36 +0000 (19:16 +0400)]
Document follow relationship updates and cleanup
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
Egor Kislitsyn [Tue, 1 Dec 2020 20:17:52 +0000 (00:17 +0400)]
Stream follow updates
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.