Commit graph

14447 commits

Author SHA1 Message Date
Tusooa Zhu
8f08c902a5 Make lint happy 2022-06-29 20:44:16 +01:00
Tusooa Zhu
7107fdc1b9 Extract translatable text 2022-06-29 20:44:16 +01:00
Tusooa Zhu
ed1d9e91bc Make remote follow pages translatable 2022-06-29 20:44:15 +01:00
Tusooa Zhu
775f997c40 Prefer userLanguage cookie over Accept-Language header in detecting locale
https://git.pleroma.social/pleroma/pleroma-meta/-/issues/60
2022-06-29 20:43:41 +01:00
Ilja
a20d2847e2 After code review
Use patern matching to see if someone was superuser before
2022-06-29 20:43:41 +01:00
Ilja
1048bc1bb9 Delete report notifs when demoting from superuser
When someone isn't a superuser any more, they shouldn't see the reporsts any more either.
Here we delete the report notifications from a user when that user gets updated from being a superuser to a non-superuser.
2022-06-29 20:43:41 +01:00
Haelwenn (lanodan) Monnier
91d7150031 mix: Check .git presence 2022-06-29 20:43:41 +01:00
Ilja
8b843be03e Fix test get_user_apps/1
For some reason I had a test who suddenly failed, mix test test/pleroma/web/o_auth/app_test.exs:54. A user has a list of applications and this test adds them and then sees if the list it gets back is the same as the apps it added.

When I ran mix test a day before I didn't have this problem and when I pushed code today in a different MR, the pipeline succeeded (see https://git.pleroma.social/ilja/pleroma/-/jobs/205827), yet locally it failed. So it seems the test can sometimes succeed and sometimes fail, which makes it untrustworthy.

The failure I see is because the returned list is in reverse order. I assume that's not per sé wrong. You just want to know if the apps you added are actually there. I fixed the test by first ordering the lists before comparing.

AFAICT (and as far as that's relevant) the test got introduced in commit cb2a072e62
2022-06-29 20:43:41 +01:00
8de65de3b9 Add unicode 14 support
and add a test with a unicode 14 emoji
2022-06-29 20:43:41 +01:00
2342fface1 Add visibility check in context path (#26)
Reviewed-on: AkkomaGang/akkoma#26
2022-06-29 09:33:57 +00:00
e538102cf5 Merge pull request 'Purge gopher frontend' (#24) from purge-gopher into develop
Reviewed-on: AkkomaGang/akkoma#24
2022-06-27 16:43:37 +00:00
064c36274c Purge gopher frontend 2022-06-27 17:31:16 +01:00
e6cd61619f Purge SSH frontend (#23)
Reviewed-on: AkkomaGang/akkoma#23
2022-06-27 11:32:06 +00:00
0543954d14 Merge pull request 'Allow for embedding object data in publish' (#16) from undo-emoji-remote into develop
Reviewed-on: AkkomaGang/akkoma#16
2022-06-25 17:45:38 +00:00
d392fafa06 Remove debug prints 2022-06-25 18:43:19 +01:00
f2ff05637f Allow for embedding object data in publish 2022-06-25 18:41:26 +01:00
c977a27043 Merge pull request 'emoji reaction standardisation' (#14) from emoji-reaction-standardisation into develop
Reviewed-on: AkkomaGang/akkoma#14
2022-06-25 14:46:32 +00:00
45b7d18871 update api spec for custom emoji reaction 2022-06-25 15:45:10 +01:00
cac39ef817 Bugfix: standardise scheme for emoji reactions 2022-06-25 15:27:46 +01:00
cad4ba2ab3 mix format 2022-06-22 17:20:55 +01:00
883036b245 update changelog 2022-06-22 17:10:55 +01:00
3928cecf6b ensure local statuses are not visible remotely 2022-06-22 17:06:40 +01:00
34e11cef47 check for local_public? on AP route 2022-06-22 16:35:12 +01:00
502382da45 cherry-pick security from upstream 2022-06-22 16:25:05 +01:00
de95ee7772 Merge branch 'develop' of akkoma.dev:AkkomaGang/akkoma into develop 2022-06-21 08:35:13 +01:00
d15d55eda2 update changelog 2022-06-21 08:35:05 +01:00
8e3115e87b Merge pull request 'Use mediaproxy for emoji notifications if enabled' (#7) from sn0w/akkoma:patch/emoji-notification-mediaproxy into develop
Reviewed-on: http://akkoma.dev/AkkomaGang/akkoma/pulls/7
2022-06-17 13:19:57 +00:00
f2f8b81fc4
Use mediaproxy for emoji notifications if enabled 2022-06-17 14:27:22 +02:00
f15c9e8b08 format everything 2022-06-15 18:22:30 +01:00
5b11543c96 update pleroma-fe url 2022-06-15 18:18:23 +01:00
f919035664 update adminfe 2022-06-14 19:04:22 +01:00
b98bd66a94 Revert "update adminfe"
This reverts commit 4532f75da3.
2022-06-14 19:00:24 +01:00
4532f75da3 update adminfe 2022-06-14 18:51:33 +01:00
af1bd3af59 mix format 2022-06-14 17:43:45 +01:00
6e1d9c63da allow %{source} dict in no_empty 2022-06-14 17:41:25 +01:00
6ac2822c73 update fe 2022-06-14 17:29:41 +01:00
1f1c7363df update pleroma-fe 2022-06-14 17:10:31 +01:00
3bc4c3baf4 bump version 2022-06-14 16:35:55 +01:00
c7328c438f update pleromaFE 2022-06-14 16:35:32 +01:00
abefbcec64 Merge branch 'mfm' into develop 2022-06-14 16:25:47 +01:00
0627da0027 mix format 2022-06-14 16:25:28 +01:00
829ae13572 ensure tests pass 2022-06-14 16:24:03 +01:00
4fb2251221 Allow authoring MFM 2022-06-14 15:56:12 +01:00
0333dc2c2f Merge pull request 'Allow reacting with emojis containing a number' (#6) from sn0w/akkoma:patch/broaden-emoji-name-scope into develop
Reviewed-on: http://akkoma.dev/AkkomaGang/akkoma/pulls/6
2022-06-14 10:03:49 +00:00
3f06ccc9e3 allow source from misskey 2022-06-14 10:56:18 +01:00
60bfaed368
Allow reacting with emojis containing a number 2022-06-14 11:47:09 +02:00
fd0cb148b9 bump version, 2.5.1 2022-06-12 14:01:23 +01:00
a43859c8f4 update pleroma-fe 2022-06-12 14:00:52 +01:00
0f5bea2465 Add emoji_url to notifications to allow rendering
Ref #5
2022-06-12 13:35:14 +01:00
785209dece fix event triggers 2022-06-11 19:53:36 +01:00