Commit Graph

16429 Commits

Author SHA1 Message Date
lain
c1129ff674 Tests: Reset all cachex caches between synchronous tests
Don't bother in the async case, it doesn't make sense there.
2020-12-18 11:53:43 +01:00
rinpatch
afc68a052c 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
2020-12-17 18:34:49 +00:00
Ivan Tashkinov
62bf4a1292 [#2353] Virtually never-expiring OAuth tokens (new and already issued ones). 2020-12-17 20:49:00 +03:00
feld
ff7f7416f7 Merge branch 'registration-workflow' into 'develop'
Improve registration workflow, fixes #2175

Closes #2235 and #2175

See merge request pleroma/pleroma!3068
2020-12-17 16:00:30 +00:00
Alex Gleason
80891e83d8
Merge remote-tracking branch 'upstream/develop' into registration-workflow 2020-12-17 09:05:36 -06:00
lain
8b8c317c0f Merge branch 'fix/2336-mastoapi-ws-posts-dropping' into 'develop'
Fix mastoapi ws posts dropping

Closes #2336

See merge request pleroma/pleroma!3198
2020-12-16 11:35:45 +00:00
Haelwenn (lanodan) Monnier
5c75bfc586
download-mastofe-build.sh: Proper exit when artifact is missing 2020-12-15 16:31:23 +01:00
lain
6bb4f4e172 Merge branch 'support/2255_posix_errors' into 'develop'
[#2255] added error messages for posix error code

See merge request pleroma/pleroma!3138
2020-12-15 15:16:03 +00:00
lain
0d285cf44f 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
2020-12-15 14:39:15 +00:00
lain
09f6056b16 Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate

See merge request pleroma/pleroma!3201
2020-12-15 14:04:10 +00:00
shironeko
2d29fd7c8f 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/
2020-12-15 11:33:10 +00:00
lain
b8c3dfc78c Merge branch 'chore/refactor-hide-counts' into 'develop'
Minor refactoring of the logic for hiding followers/following counts.

See merge request pleroma/pleroma!3202
2020-12-15 11:32:49 +00:00
Mark Felder
6dac2ac71a Minor refactoring of the logic for hiding followers/following counts.
Field is not nullable anymore, and this is more readable.
2020-12-14 13:27:42 -06:00
Alexander Strizhakov
c37f78d1c8 changelog 2020-12-14 11:02:32 -06:00
Alexander Strizhakov
cebe3c7def 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)
2020-12-14 11:02:32 -06:00
rinpatch
f687befb93 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
2020-12-13 12:16:41 +00:00
Mark Felder
dfde4af0fd Fixed Rich Media Previews 2020-12-12 13:23:51 -06:00
feld
1e3eb9e004 Merge branch 'fix/tracking-majic' into 'develop'
Majic: specify commit so source users do not get surprise updates

See merge request pleroma/pleroma!3200
2020-12-12 19:20:34 +00:00
Mark Felder
7d78c00049 Majic: specify commit so source users do not get surprise updates 2020-12-12 13:04:16 -06:00
Mark Felder
3299fea9e3 Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix 2020-12-12 13:01:30 -06:00
rinpatch
7133c0c5ea instance.gen: Warn that stripping exif requires exiftool
And default to no if it is not installed

Closes #2343
2020-12-12 20:38:51 +03:00
rinpatch
6aece536eb instance.gen task: Only show files which will be actually overwritten 2020-12-12 20:35:38 +03:00
Mark Felder
f318d8e56d Use Pleroma.Formatter.markdown_to_html/1 in the tests 2020-12-11 17:28:00 -06:00
Mark Felder
6520599b7d Update Earmark to 1.4.13, use the new compact_output mode 2020-12-11 17:23:03 -06:00
Alex Gleason
642729b49f Fix AudioVideoValidator markdown 2020-12-11 17:22:54 -06:00
Alex Gleason
f1c67115d8 Upgrade linkify, test URL issues, fixes #2026 #1942 2020-12-11 17:22:48 -06:00
Alex Gleason
f8c93246d6 Refactor Earmark code, fix tests 2020-12-11 17:22:42 -06:00
Alex Gleason
b2548cfcda Sanitizer: allow <hr> tags 2020-12-11 17:22:37 -06:00
Alex Gleason
c4f4e48e57 Remove some N/A tests 2020-12-11 17:22:30 -06:00
Alex Gleason
ba71bbf610 Improve Formatter.minify/2 2020-12-11 17:22:24 -06:00
Alex Gleason
e9e17e5df3 Upgrade Earmark to v1.4.10 2020-12-11 17:22:17 -06:00
Haelwenn
f2bf2131b4 Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate

See merge request pleroma/pleroma!3195
2020-12-11 15:01:08 +00:00
ZEN
2db42ac978 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/
2020-12-11 00:56:57 +00:00
Haelwenn
b8cda9d96e Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate

See merge request pleroma/pleroma!3194
2020-12-10 22:39:38 +00:00
ZEN
98deed65b3 Added translation using Weblate (Ukrainian) 2020-12-10 16:09:45 +00:00
feld
45e1cf902a Merge branch 'oauth-entities-expiration-tweaks' into 'develop'
Tweaks to OAuth entities expiration

See merge request pleroma/pleroma!3193
2020-12-09 18:30:13 +00:00
Ivan Tashkinov
7fff9c1bee Tweaks to OAuth entities expiration: changed default to 30 days, removed hardcoded values usage, fixed OAuthView (expires_in). 2020-12-09 21:14:39 +03:00
feld
c308224aaf Merge branch 'oauth-token-30-days-expiration' into 'develop'
Changed default OAuth token expiration time to 30 days

See merge request pleroma/pleroma!3192
2020-12-09 17:10:09 +00:00
Ivan Tashkinov
7da0349d73 Changed default OAuth token expiration time to 30 days. 2020-12-09 19:59:46 +03:00
lain
477c6c8e55 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
2020-12-09 15:55:45 +00:00
lain
1436a2fa2d Merge branch 'stream-follow-updates' into 'develop'
Stream follow updates

Closes #2299

See merge request pleroma/pleroma!3183
2020-12-09 15:52:31 +00:00
Ivan Tashkinov
055a306380 [#3112] .gitattributes fix. 2020-12-09 18:43:20 +03:00
Egor Kislitsyn
97068196a9
Update CHANGELOG 2020-12-09 19:40:40 +04:00
lain
e73d878b38 Merge branch 'feat/warn-large-pool-size' into 'develop'
Add a startup error for modified Repo pool_size

See merge request pleroma/pleroma!3190
2020-12-08 16:36:51 +00:00
lain
50d16a9e27 ApplicationRequirements: Add test, more text for pool size. 2020-12-08 17:30:10 +01:00
lain
5b9b7b4888 Apply 1 suggestion(s) to 1 file(s) 2020-12-08 16:16:43 +00:00
feld
9d0839504e Merge branch 'features/favicon-unreachable-instance' into 'develop'
instance: Do not fetch unreachable instances

Closes #2346

See merge request pleroma/pleroma!3189
2020-12-07 22:49:45 +00:00
Mark Felder
fb3fd692c6 Add a startup error for modified Repo pool_size 2020-12-07 16:44:55 -06:00
Haelwenn (lanodan) Monnier
1403798820
instance.reachable?: Limit to binary input 2020-12-07 21:20:44 +01:00
Haelwenn (lanodan) Monnier
e1a2e8b17c
instance: Do not fetch unreachable instances
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2346
2020-12-07 20:11:47 +01:00