bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15124 commits 1 branch 0 tags 292 MiB
Commit graph

15124 commits

This branch
This branch
All branches
Author SHA1 Message Date
Haelwenn
b439e91f57 Revert "Merge branch 'rewrite/integration-test-websocket-client' into 'develop'" 
This reverts merge request !3649
 2022-09-02 22:35:40 +00:00
Haelwenn
e22a772240 Merge branch 'weblate' into 'develop' 
Translations update from Pleroma Weblate

See merge request pleroma/pleroma!3735
 2022-09-02 22:10:44 +00:00
Haelwenn (lanodan) Monnier
21ab7369ca Bump minimum Elixir version to 1.10 
With the release of Elixir 1.14, Elixir 1.9 is now end-of-life.

Elixir 1.10 Release Notes:
https://github.com/elixir-lang/elixir/releases/tag/v1.10.0
 2022-09-02 22:53:54 +02:00
Fristi
0d8c6b0488 Translated using Weblate (Dutch) 
Currently translated at 63.8% (30 of 47 strings)

Translation: Pleroma/Pleroma Backend (domain posix_errors)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-posix_errors/nl/
 2022-09-02 19:18:40 +00:00
Fristi
9af5da6666 Translated using Weblate (Dutch) 
Currently translated at 100.0% (83 of 83 strings)

Translation: Pleroma/Pleroma Backend (domain static_pages)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-static_pages/nl/
 2022-09-02 19:18:40 +00:00
Fristi
425fbce7be Translated using Weblate (Dutch) 
Currently translated at 100.0% (106 of 106 strings)

Translation: Pleroma/Pleroma Backend (domain errors)
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-backend-domain-errors/nl/
 2022-09-02 19:18:40 +00:00
Fristi
a6195c7127 Added translation using Weblate (Dutch) 2022-09-02 19:18:40 +00:00
Fristi
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
Alex Gleason
e94b73052f Merge branch 'compat-ua' into 'develop' 
Use "Pleroma" in user-agent

See merge request soapbox-pub/rebased!171
 2022-09-01 13:34:09 +00:00
Alex Gleason
9578013fc2
Use "Pleroma" in user-agent 2022-09-01 08:03:34 -05:00
Tusooa Zhu
c32e28e1b0
Fix SideEffectsTest 2022-09-01 07:33:58 -04:00
Tusooa Zhu
20a0dd6516
Exclude Announce instead of restricting to Create in visibility_tags 2022-08-31 22:14:54 -04:00
Tusooa Zhu
ffd379456b
Do not stream out Announces to public timelines 2022-08-31 15:57:06 -04:00
marcin mikołajczak
f610f051e8 Merge branch 'merge-pleroma' into 'develop' 
merge pleroma

See merge request soapbox-pub/rebased!170
 2022-08-30 18:31:32 +00:00
marcin mikołajczak
a15bf235cf Merge remote-tracking branch 'pleroma/develop' into HEAD 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-30 10:15:07 +02:00
Alex Gleason
8f6d1ca33e
Don't warn importing prod.secret.exs if CI=true 2022-08-29 21:33:25 -05:00
Alex Gleason
2c2d532836
GitLab CI: don't use cached deps for release 2022-08-29 20:48:51 -05:00
Alex Gleason
35111b5b53
GitLab CI: try copying prod build for test 2022-08-29 20:01:55 -05:00
Alex Gleason
71632053bb Merge branch 'readme-logo' into 'develop' 
README: check Rebased logo into repo

See merge request soapbox-pub/rebased!169
 2022-08-29 17:07:42 +00:00
Alex Gleason
0696ecc4b4
README: check Rebased logo into repo 2022-08-29 11:52:57 -05:00
Tusooa Zhu
f9b86c3c22
Make local-only posts stream in local timeline 2022-08-27 19:34:56 -04:00
Tusooa Zhu
3afa1903ee
Do not stream out Create of ChatMessage 2022-08-27 17:51:41 -04: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
Alex Gleason
770058b274
unit-testing --> test 2022-08-26 17:37:59 -05:00
Alex Gleason
b1bea70f8e
Overhaul CI 2022-08-26 17:36:49 -05:00
Alex Gleason
d8761c0fb7
Use Soapbox CI base image 2022-08-26 16:31:10 -05:00
Alex Gleason
8833ea7a1b Merge branch 'rebased-fixes' into 'develop' 
Fix Rebased --> Pleroma instance version

See merge request soapbox-pub/rebased!167
 2022-08-25 19:28:51 +00:00
Alex Gleason
d230d70170
Nodeinfo: fix Rebased --> Pleroma 2022-08-25 14:11:28 -05:00
Alex Gleason
a4c9739965
Fix Rebased --> Pleroma instance version 2022-08-25 14:02:38 -05: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
marcin mikołajczak
84955a01e7 Merge branch 'static-pages-styles' into 'develop' 
Improve? static pages styles

See merge request soapbox-pub/rebased!166
 2022-08-25 13:38:00 +00:00
marcin mikołajczak
64d515df28 Use colors from frontend configuration 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-25 14:58:28 +02:00
marcin mikołajczak
83946653d6 maybe try using prefers-color-scheme 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-25 12:13:06 +02:00
marcin mikołajczak
01950c1223 Update static pages styles 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-25 11:58:54 +02: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
Hélène
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