a6195c7127
Added translation using Weblate (Dutch)
2022-09-02 19:18:40 +00:00
e949378476
Added translation using Weblate (Dutch)
2022-09-02 19:18:40 +00:00
Haelwenn
01239456a1
Merge branch 'rewrite/integration-test-websocket-client' into 'develop'
...
Rewrite integration-test websocket client with Mint.WebSocket, closes #2812
Closes #2812
See merge request pleroma/pleroma!3649
2022-09-02 19:18:22 +00:00
tusooa
497cd5d5da
Merge branch 'fix/fedi-fe-build-url' into 'develop'
...
Fix fedi-fe build URL, addresses #2920
See merge request pleroma/pleroma!3736
2022-08-27 01:13:03 +00:00
tusooa
a546e6f042
Merge branch 'feature/emoji-15-support' into 'develop'
...
emoji-test: update to latest 15.0 draft
See merge request pleroma/pleroma!3726
2022-08-27 00:59:22 +00:00
tusooa
780fb4514d
Merge branch 'from/upstream-develop/tusooa/static-page-styles' into 'develop'
...
Improve static page style
See merge request pleroma/pleroma!3729
2022-08-27 00:58:18 +00:00
tusooa
84a573877a
Merge branch 'fix_erratic_tests' into 'develop'
...
Fix flaky rate_limiter_test.exs test "it restricts based on config values"
See merge request pleroma/pleroma!3688
2022-08-25 18:39:38 +00:00
tusooa
6811237ffd
Merge branch 'fix_flaky_transfer_task_test.exs' into 'develop'
...
Fix flaky/erratic test/pleroma/config/transfer_task_test.exs
See merge request pleroma/pleroma!3703
2022-08-25 18:38:18 +00:00
tusooa
6f10f93d62
Merge branch 'fix_erratic_participation_test' into 'develop'
...
fix flaky participation_test.exs
See merge request pleroma/pleroma!3689
2022-08-25 18:36:47 +00:00
Ilja
dc72a523c4
fix flaky participation_test.exs
2022-08-25 18:36:46 +00:00
Sean King
d67d191344
Fix fedi-fe build URL
2022-08-24 23:39:02 -06:00
tusooa
8ec985eea1
Merge branch 'fix_flaky_filter_controller_test.exs_200' into 'develop'
...
fix flaky test filter_controller_test.exs:200
See merge request pleroma/pleroma!3699
2022-08-24 15:24:57 +00:00
Ilja
5b2e3a303c
fix flaky test filter_controller_test.exs:200
2022-08-24 15:24:57 +00:00
tusooa
59109f8f74
Merge branch 'fix_flaky_test_user_relationship_test.exs_81' into 'develop'
...
fix flaky test_user_relationship_test.exs:81
See merge request pleroma/pleroma!3697
2022-08-24 15:24:07 +00:00
Ilja
47e3a72b6e
fix flaky test_user_relationship_test.exs:81
2022-08-24 15:24:07 +00:00
tusooa
85c1e1ff4d
Merge branch 'fix/oauth-token-user-caching' into 'develop'
...
OAuthPlug: use user cache instead of joining
See merge request pleroma/pleroma!3734
2022-08-24 15:23:20 +00:00
tusooa
38d9ec41be
Merge branch 'add/glitch-lily-fe' into 'develop'
...
Add glitch-lily as an installable frontend
See merge request pleroma/pleroma!3727
2022-08-24 12:18:02 +00:00
439c1baf25
OAuthPlug: use user cache instead of joining
...
As this plug is called on every request, this should reduce load on the
database by not requiring to select on the users table every single
time, and to instead use the by-ID user cache whenever possible.
2022-08-24 03:40:05 +02:00
Tusooa Zhu
c59a0bd12f
Add margin to forms and make inputs fill whole width
2022-08-20 21:52:20 -04:00
tusooa
a022b9d733
Merge branch 'from/upstream-develop/tusooa/alpine-bump' into 'develop'
...
Use latest alpine version for docker image
See merge request pleroma/pleroma!3719
2022-08-21 01:25:25 +00:00
Sean King
cc0f32c253
Add glitch-lily as an installable frontend
2022-08-19 22:54:56 -06:00
6ccab516a3
Merge branch 'varnish-fix-changelog' into 'develop'
...
Document the changes for Varnish 7.0+ compatibility and RFC compliance
See merge request pleroma/pleroma!3723
2022-08-19 22:41:42 +00:00
0cee3c6e93
emoji-test: update to latest 15.0 draft
2022-08-20 00:21:07 +02:00
80c32ae00b
Document the changes for Varnish 7.0+ compatibility and RFC compliance
2022-08-12 15:06:45 -04:00
Haelwenn
06f9324afe
Merge branch 'from/upstream-develop/tusooa/2912-receiver-reject-mrf' into 'develop'
...
Treat MRF rejects as success in Oban worker
Closes #2912
See merge request pleroma/pleroma!3720
2022-08-12 01:37:40 +00:00
Haelwenn
837d4dc87f
Merge branch 'fix_flaky_tests_where_we_sometimes_loose_db_connections' into 'develop'
...
Fix flaky tests with DB connections; Allow higher amount of restarts for Pleroma.Repo during testing
See merge request pleroma/pleroma!3696
2022-08-12 01:36:11 +00:00
Haelwenn
93f12c0d0d
Merge branch 'from/upstream-develop/tusooa/sync-settings' into 'develop'
...
Synchronized settings for apps (frontends)
See merge request pleroma/pleroma!3698
2022-08-12 01:34:36 +00:00
Haelwenn
6ce3f76b5d
Merge branch 'from/upstream-develop/floatingghost/follow-state' into 'develop'
...
Backport: bugfix/follow-state
Closes #2902
See merge request pleroma/pleroma!3718
2022-08-12 01:32:20 +00:00
514caed573
Merge branch 'fix-varnish7-support' into 'develop'
...
Fix Varnish7 support
See merge request pleroma/pleroma!3722
2022-08-11 15:14:16 +00:00
73b4d0d9a7
Fix the mocks to use uppercase as well
2022-08-10 21:46:56 +00:00
243ed7d60f
Update the recommended VCL configuration
2022-08-10 17:18:06 -04:00
cbdc13b767
Fix Varnish 7 support by ensuring Media Preview Proxy fetches headers with a capitalized HEAD verb
2022-08-10 17:09:58 -04:00
Tusooa Zhu
d487e0160c
Treat containment failure as cancel in ReceiverWorker
2022-08-08 08:41:33 -04:00
Tusooa Zhu
88e0e6acd5
Fix FederatorTest
2022-08-06 00:42:10 -04:00
Tusooa Zhu
a0166e92fa
Treat MRF rejects as success in Oban worker
2022-08-06 00:33:18 -04:00
Tusooa Zhu
5d900a5cd1
Use latest alpine version for docker image
2022-08-05 23:47:53 -04:00
f2a9285ff0
bugfix/follow-state ( #104 )
...
Reviewed-on: #104
2022-08-03 01:07:53 -04:00
Haelwenn
b2ba307f4d
Merge branch 'from/upstream-develop/tusooa/2871-fix-local-public' into 'develop'
...
local only fixes
Closes #2871
See merge request pleroma/pleroma!3660
2022-08-02 05:39:50 +00:00
Haelwenn
7299795eb4
Merge branch 'from/upstream-develop/tusooa/backup-without-email' into 'develop'
...
Allow users to create backups without providing email address
See merge request pleroma/pleroma!3665
2022-08-02 05:23:49 +00:00
Haelwenn
f8540b0a9d
Merge branch 'weblate' into 'develop'
...
Translations update from Pleroma Weblate
See merge request pleroma/pleroma!3716
2022-08-02 05:10:51 +00:00
Yating Zhan
99d4823ab1
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 18.9% (189 of 998 strings)
Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
2022-07-31 22:00:56 +00:00
tusooa
cc533e6956
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 18.9% (189 of 998 strings)
Translation: Pleroma/Pleroma Backend (domain config_descriptions)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-config_descriptions/zh_Hans/
2022-07-31 22:00:56 +00:00
Haelwenn
7de21ec991
Merge branch 'from/develop/tusooa/emit-move' into 'develop'
...
Implement moving account
See merge request pleroma/pleroma!3524
2022-07-31 22:00:40 +00:00
Haelwenn
5ef2dc317d
Change test case wording
2022-07-31 21:34:23 +00:00
tusooa
c80096522c
Merge branch 'develop' into 'from/develop/tusooa/emit-move'
...
# Conflicts:
# CHANGELOG.md
# test/pleroma/user_test.exs
2022-07-31 21:32:49 +00:00
Haelwenn
b5266097a1
Merge branch 'mutes' into 'develop'
...
MastoAPI: Use `duration` param for mute expiration duration
See merge request pleroma/pleroma!3715
2022-07-31 19:41:25 +00:00
marcin mikołajczak
5d3d6a58f7
Use duration param for mute expiration duration
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-31 17:22:34 +02:00
Haelwenn
0814d0e0cb
Merge branch 'fix/proper-emoji-qualification' into 'develop'
...
Emoji: implement full-qualifier using combinations
See merge request pleroma/pleroma!3709
2022-07-28 04:46:15 +00:00
Haelwenn
0f9f3d2897
Merge branch 'from/upstream-develop/tusooa/2384-pagination' into 'develop'
...
Make mutes and blocks behave the same as other lists
Closes #2384
See merge request pleroma/pleroma!3693
2022-07-28 04:37:10 +00:00
Haelwenn
18d6a58c7e
Merge branch 'from/upstream-develop/tusooa/gettext-extract' into 'develop'
...
Extract translatable strings
See merge request pleroma/pleroma!3712
2022-07-28 04:33:17 +00:00
