lain [Wed, 23 Dec 2020 13:41:04 +0000 (14:41 +0100)]
Merge branch 'stable' into mergeback/2.2.1
lain [Wed, 23 Dec 2020 13:35:41 +0000 (13:35 +0000)]
Merge branch 'release/2.2.1' into 'stable'
Release/2.2.1
See merge request pleroma/pleroma!3214
lain [Wed, 23 Dec 2020 10:56:08 +0000 (11:56 +0100)]
Fixtures: Add application actor fixture.
lain [Wed, 23 Dec 2020 10:40:34 +0000 (11:40 +0100)]
Merge branch 'release/2.2.1' of git.pleroma.social:pleroma/pleroma into release/2.2.1
lain [Wed, 23 Dec 2020 10:39:19 +0000 (11:39 +0100)]
Update changelog
lain [Wed, 23 Dec 2020 10:35:41 +0000 (10:35 +0000)]
Apply 1 suggestion(s) to 1 file(s)
lain [Wed, 23 Dec 2020 10:16:13 +0000 (11:16 +0100)]
Linting
lain [Wed, 23 Dec 2020 08:35:19 +0000 (09:35 +0100)]
Update frontend
lain [Tue, 22 Dec 2020 20:59:37 +0000 (21:59 +0100)]
Mix: Update version.
lain [Tue, 22 Dec 2020 20:54:31 +0000 (21:54 +0100)]
Update changelog
lain [Tue, 22 Dec 2020 20:32:11 +0000 (21:32 +0100)]
Report fixes.
lain [Tue, 22 Dec 2020 20:22:48 +0000 (21:22 +0100)]
Mix: Update linkify to 0.4.1
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 [Tue, 24 Nov 2020 15:44:48 +0000 (18:44 +0300)]
fix for elixir 1.11
load runtime configs in releases with config provider
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 [Sat, 12 Dec 2020 19:01:30 +0000 (13:01 -0600)]
Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix
lain [Tue, 22 Dec 2020 20:05:12 +0000 (21:05 +0100)]
Update changelog
lain [Thu, 19 Nov 2020 15:29:31 +0000 (16:29 +0100)]
Search: Only skip ordering the rum index.
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.
Mark Felder [Tue, 17 Nov 2020 15:28:46 +0000 (15:28 +0000)]
Document fixing the pleroma.user delete_activities mix task
Mark Felder [Tue, 17 Nov 2020 15:15:53 +0000 (15:15 +0000)]
Need to start web_resp cache or mix task fails
Mark Felder [Mon, 16 Nov 2020 19:54:02 +0000 (19:54 +0000)]
Document S3 and Elixir 1.11 compat fix
Mark Felder [Mon, 16 Nov 2020 19:51:44 +0000 (19:51 +0000)]
Fix S3 uploads with Elixir 1.11
Haelwenn (lanodan) Monnier [Sat, 14 Nov 2020 21:27:13 +0000 (22:27 +0100)]
pleroma.instance: Fix Exiftool module name
Alexander Strizhakov [Fri, 13 Nov 2020 06:07:08 +0000 (09:07 +0300)]
remove PurgeExpiredActivity from Oban db config
feld [Tue, 22 Dec 2020 14:53:04 +0000 (14:53 +0000)]
Merge branch 'update-elixir-make' into 'develop'
Update for retired elixir_make package version
See merge request pleroma/pleroma!3211
Alexander Strizhakov [Tue, 22 Dec 2020 14:42:23 +0000 (17:42 +0300)]
update for retired elixir_make package version
rinpatch [Tue, 22 Dec 2020 11:31:06 +0000 (11:31 +0000)]
Merge branch 'update/instance-gen-template' into 'develop'
Update instance.gen template
See merge request pleroma/pleroma!3210
Mark Felder [Mon, 21 Dec 2020 21:19:24 +0000 (15:19 -0600)]
Do not include pool_size in the template. It encourages unwanted fiddling :)
lain [Mon, 21 Dec 2020 17:13:52 +0000 (17:13 +0000)]
Merge branch 'develop' into 'develop'
WebFinger: add subscribe_address in return data of JSON responses
See merge request pleroma/pleroma!3206
Kaizhe Huang [Sun, 20 Dec 2020 13:54:15 +0000 (00:54 +1100)]
Fix trailing whitespaces in lib/pleroma/web/web_finger.ex
lain [Sun, 20 Dec 2020 13:40:08 +0000 (13:40 +0000)]
Merge branch 'fix/remove-sharelock-warning-oban-configdb' into 'develop'
config/description.exs: Remove outdated information about Oban
See merge request pleroma/pleroma!3208
rinpatch [Sun, 20 Dec 2020 09:59:53 +0000 (09:59 +0000)]
Merge branch 'bugfix/mastofe-install-script' into 'develop'
download-mastofe-build.sh: Proper exit when artifact is missing
Closes #2329
See merge request pleroma/pleroma!3191
Kaizhe Huang [Sat, 19 Dec 2020 11:11:47 +0000 (22:11 +1100)]
Add test for subscribe_address in JSON WebFinger response
rinpatch [Sat, 19 Dec 2020 08:27:42 +0000 (11:27 +0300)]
config/description.exs: Remove outdated information about Oban
The version of Oban we depend on no longer uses ShareLocks, so this
note no longer applies.
FiveYellowMice [Fri, 18 Dec 2020 13:48:38 +0000 (13:48 +0000)]
WebFinger: add subscribe_address in return data of JSON responses
rinpatch [Thu, 17 Dec 2020 18:34:49 +0000 (18:34 +0000)]
Merge branch 'long-life-oauth-tokens' into 'develop'
[#2353] Virtually never-expiring OAuth tokens (new and already issued ones)
Closes #2353
See merge request pleroma/pleroma!3205
Ivan Tashkinov [Thu, 17 Dec 2020 17:49:00 +0000 (20:49 +0300)]
[#2353] Virtually never-expiring OAuth tokens (new and already issued ones).
feld [Thu, 17 Dec 2020 16:00:30 +0000 (16:00 +0000)]
Merge branch 'registration-workflow' into 'develop'
Improve registration workflow, fixes #2175
Closes #2235 and #2175
See merge request pleroma/pleroma!3068
Alex Gleason [Thu, 17 Dec 2020 15:04:43 +0000 (09:04 -0600)]
Merge remote-tracking branch 'upstream/develop' into registration-workflow
lain [Wed, 16 Dec 2020 11:35:45 +0000 (11:35 +0000)]
Merge branch 'fix/2336-mastoapi-ws-posts-dropping' into 'develop'
Fix mastoapi ws posts dropping
Closes #2336
See merge request pleroma/pleroma!3198
Haelwenn (lanodan) Monnier [Tue, 8 Dec 2020 22:46:13 +0000 (23:46 +0100)]
download-mastofe-build.sh: Proper exit when artifact is missing
lain [Tue, 15 Dec 2020 15:16:03 +0000 (15:16 +0000)]
Merge branch 'support/2255_posix_errors' into 'develop'
[#2255] added error messages for posix error code
See merge request pleroma/pleroma!3138
lain [Tue, 15 Dec 2020 14:39:15 +0000 (14:39 +0000)]
Merge branch 'fix/config-gen-detect-exiftool' into 'develop'
instance.gen: Warn that stripping exif requires exiftool
Closes #2343
See merge request pleroma/pleroma!3197
lain [Tue, 15 Dec 2020 14:04:10 +0000 (14:04 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!3201
shironeko [Sun, 13 Dec 2020 04:47:36 +0000 (04:47 +0000)]
Translated using Weblate (Chinese (Simplified))
Currently translated at 87.7% (93 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hans/
lain [Tue, 15 Dec 2020 11:32:49 +0000 (11:32 +0000)]
Merge branch 'chore/refactor-hide-counts' into 'develop'
Minor refactoring of the logic for hiding followers/following counts.
See merge request pleroma/pleroma!3202
Mark Felder [Mon, 14 Dec 2020 19:27:42 +0000 (13:27 -0600)]
Minor refactoring of the logic for hiding followers/following counts.
Field is not nullable anymore, and this is more readable.
Alexander Strizhakov [Sun, 13 Dec 2020 12:47:43 +0000 (15:47 +0300)]
changelog
Alexander Strizhakov [Sat, 12 Dec 2020 14:30:08 +0000 (17:30 +0300)]
Fix for dropping posts/notifs in WS when mix task is executed
- start oban in mix tasks with empty queues, plugins and crontab
- fix for update_users_following_followers_counts
- fix for removed logo.png
- typo in resend confirmation emails mix task docs
- fix for uploads mix task (start Majic.Pool)
- fix for creating user mix task (start :fast_html app)
rinpatch [Sun, 13 Dec 2020 12:16:41 +0000 (12:16 +0000)]
Merge branch 'fix/hackney-follow-redirects' into 'develop'
Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix
Closes #2342
See merge request pleroma/pleroma!3199
Mark Felder [Sat, 12 Dec 2020 19:21:59 +0000 (13:21 -0600)]
Fixed Rich Media Previews
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
Mark Felder [Sat, 12 Dec 2020 19:01:30 +0000 (13:01 -0600)]
Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix
rinpatch [Sat, 12 Dec 2020 17:37:14 +0000 (20:37 +0300)]
instance.gen: Warn that stripping exif requires exiftool
And default to no if it is not installed
Closes #2343
rinpatch [Sat, 12 Dec 2020 17:35:38 +0000 (20:35 +0300)]
instance.gen task: Only show files which will be actually overwritten
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
projects / akkoma / log