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

14939 commits

This branch
This branch
All branches
Author SHA1 Message Date
marcin mikołajczak
0312f6770c Merge branch 'develop' into 'edits' 
# Conflicts:
#   priv/static/schemas/litepub-0.1.jsonld
 2022-09-03 14:14:25 +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
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
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
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
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
Sean King
cc0f32c253
Add glitch-lily as an installable frontend 2022-08-19 22:54:56 -06:00
feld
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
Hélène
0cee3c6e93
emoji-test: update to latest 15.0 draft 2022-08-20 00:21:07 +02:00
Alex Gleason
6c87e7f16e Merge branch 'rebased' into 'develop' 
Soapbox BE --> Rebased

See merge request soapbox-pub/soapbox-be!163
 2022-08-19 13:04:41 +00:00
marcin mikołajczak
365ab9ca4d Merge branch 'polls' into 'develop' 
Handle voters count correctly

See merge request soapbox-pub/soapbox-be!165
 2022-08-19 05:23:53 +00:00
marcin mikołajczak
a0923b96a0 Fix voters_count in polls from remote Pleroma instances 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-08-18 23:39:07 +02:00
marcin mikołajczak
322e00e45a Revert "Merge branch 'revert-f6e02270' into 'develop'" 
This reverts commit 5b8ad6bc91, reversing
changes made to f6e02270c3.
 2022-08-18 23:06:18 +02:00
marcin mikołajczak
5b8ad6bc91 Merge branch 'revert-f6e02270' into 'develop' 
Revert "Merge branch 'polls' into 'develop'"

See merge request soapbox-pub/soapbox-be!164
 2022-08-18 06:57:52 +00:00
marcin mikołajczak
4de58c2b2c Revert "Merge branch 'polls' into 'develop'" 
This reverts merge request !152
 2022-08-18 06:38:03 +00:00
marcin mikołajczak
f6e02270c3 Merge branch 'polls' into 'develop' 
Handle voters count correctly

See merge request soapbox-pub/soapbox-be!152
 2022-08-18 06:34:05 +00:00
Alex Gleason
5e69265d22
README: update rebased logo 2022-08-17 11:29:17 -05:00
Alex Gleason
4de6c67e92
Soapbox BE --> Rebased 2022-08-17 11:25:39 -05:00
marcin mikołajczak
fa9106bb1b Merge remote-tracking branch 'soapbox/develop' into polls 2022-08-16 07:42:22 +02:00
marcin mikołajczak
95f18a7296 Add tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Signed-off-by: marcin mikołajczak <me@mkljczk.pl>
 2022-08-15 21:22:06 +02:00
Alex Gleason
02caf99400 Merge branch 'instance-favicon-tests' into 'develop' 
Disable instance favicons in tests

See merge request soapbox-pub/soapbox-be!161
 2022-08-15 01:44:15 +00:00
Alex Gleason
93c237881f
Disable instance favicons in tests 2022-08-14 20:43:19 -05:00
Alex Gleason
f8a8523d29 Merge branch 'instance-favicons' into 'develop' 
Soapbox: enable instance favicons

See merge request soapbox-pub/soapbox-be!160
 2022-08-15 00:41:02 +00:00
Alex Gleason
899ac39d71
Soapbox: enable instance favicons 2022-08-14 19:40:14 -05:00
Alex Gleason
02ffc908f6 Merge branch 'keycloak-default-scope' into 'develop' 
Set better default scope for keycloak

See merge request soapbox-pub/soapbox-be!159
 2022-08-14 22:18:24 +00:00