Commit graph

15372 commits

Author SHA1 Message Date
Haelwenn
127e7b8ff9 Merge branch 'feature/1469-webfinger-expanding' into 'develop'
Feature/1469 webfinger expanding

Closes #1469 and #2517

See merge request pleroma/pleroma!3361
2022-11-03 15:03:50 +00:00
Alexander Strizhakov
8407e26b0c rebase fix 2022-11-03 10:06:36 -04:00
Alexander Strizhakov
a57c025594 docs update 2022-11-03 09:48:59 -04:00
Alexander Strizhakov
5a9ea98baf XML WebFinger user representation correct domain 2022-11-03 09:48:59 -04:00
Alexander Strizhakov
30ded8876a docs & changelog 2022-11-03 09:48:57 -04:00
Alexander Strizhakov
4121bca895 expanding WebFinger 2022-11-03 09:48:24 -04:00
4c1d0dbb69 Language detection
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-03 00:17:27 +01:00
Alex Gleason
920ba8ddec
Return an error if replying to a deleted status
Fixes https://gitlab.com/soapbox-pub/rebased/-/issues/119
2022-11-02 10:04:32 -05:00
d094cdf55b Rename
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-31 22:42:03 +01:00
9cdce15a42 Update description.exs
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-30 23:07:30 +01:00
68c00fa749 Fix get_language_from_context
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-30 21:59:48 +01:00
55cb9b29fe Do not translate non-public statuses
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-30 21:57:05 +01:00
c1f5138f73 Add tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-30 21:06:31 +01:00
25a9ff0f3d Expose translation service availability
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-30 18:53:29 +01:00
65fb5abc73 Merge remote-tracking branch 'soapbox/develop' into post-languages 2022-10-30 18:47:47 +01:00
8243be681b WIP Translation backends support
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-30 18:47:41 +01:00
972498cac4 Store remote post language information
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-30 10:41:09 +01:00
Haelwenn
da0ef154a6 Merge branch 'from/upstream-develop/tusooa/2930-get-or-fetch' into 'develop'
Fix User.get_or_fetch/1 with usernames starting with http

Closes #2930

See merge request pleroma/pleroma!3751
2022-10-30 00:38:21 +00:00
6a8a8f2a2e StatusView: display language
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-29 19:49:52 +02:00
marcin mikołajczak
6778334542 Merge branch 'colors-override' into 'develop'
Use color overrides from frontend configuration

See merge request soapbox-pub/rebased!191
2022-10-29 14:38:31 +00:00
ff35b13b52 Allow to specify post language
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-29 16:22:57 +02:00
0ff7f6d03c Do not use contentMap if content is not empty
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-29 15:01:17 +02:00
Alex Gleason
611097b1a6 Merge branch 'mix-format' into 'develop'
mix format

See merge request soapbox-pub/rebased!195
2022-10-28 21:26:26 +00:00
Alex Gleason
b734e2f3f1
mix format 2022-10-28 16:09:59 -05:00
Alex Gleason
74c360e4d6 Merge branch 'feature/add-prom_ex' into 'develop'
Add PromEx

See merge request soapbox-pub/rebased!193
2022-10-28 20:58:56 +00:00
marcin mikołajczak
f476bc2c35 Merge branch 'instance-v2' into 'develop'
Add /api/v2/instance route

See merge request soapbox-pub/rebased!194
2022-10-28 20:12:16 +00:00
dea3110ef5 Merge remote-tracking branch 'soapbox/develop' into instance-v2
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-28 20:12:29 +02:00
a77a7a3620 Add /api/v2/instance route
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-28 20:10:10 +02:00
Josh Adams
7edf9d4990 Replace deprecated @view_module
See https://gist.github.com/chrismccord/e53e79ef8b34adf5d8122a47db44d22f#update-your-layouts
2022-10-27 21:03:06 -05:00
Josh Adams
5f2513d119 Make release not break things but be dumb 2022-10-27 20:26:07 -05:00
Josh Adams
36dc0fee1e Don't use a fake ecto feature
See https://github.com/elixir-ecto/ecto/issues/3889
2022-10-27 20:14:55 -05:00
Josh Adams
ec4dc4adac Remove unnecessary newline
L I N T E R S
2022-10-27 20:03:45 -05:00
Josh Adams
ec6ee11ea7 Add most (all?) the promex setup 2022-10-27 19:47:37 -05:00
Josh Adams
b6ef38d611 Bump a ton of dependencies
All in service of bringing in prom_ex, we'll see
2022-10-27 19:38:35 -05:00
Alex Gleason
ad014adc1c Merge branch 'configurable-favicon' into 'develop'
Let favicon be configurable

See merge request soapbox-pub/rebased!192
2022-10-27 20:03:32 +00:00
Alex Gleason
e88d52c4de
Fix OStatusControllerTest 2022-10-27 14:21:13 -05:00
Alex Gleason
6f04447f49
mix format 2022-10-27 13:51:37 -05:00
Alex Gleason
bddd4375bf
Expose favicon URL in instance API 2022-10-27 13:51:25 -05:00
Alex Gleason
35f16d9c47
Render title and favicon on all pages that serve index.html 2022-10-27 13:29:36 -05:00
Alex Gleason
f303a02e86
Let favicon be configurable 2022-10-27 13:15:15 -05:00
tusooa
9fbf01f7a9 Merge branch 'push-updates' into 'develop'
Push.Impl: support edits

See merge request pleroma/pleroma!3760
2022-10-27 12:51:29 +00:00
27fb0c80ba Use color overrides from frontend configuration
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-27 00:12:39 +02:00
470c2ec15f Add Accept test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-25 23:10:21 +02:00
feld
7a519b6a66 Merge branch 'fix-deprecation-text' into 'develop'
Fix deprecation warning for Gun timeout

See merge request pleroma/pleroma!3759
2022-10-24 14:22:49 +00:00
Haelwenn
705ba6d615 Merge branch 'security/PleromaAPI-delete' into 'develop'
CommonAPI: generate ModerationLog for all admin/moderator deletes

See merge request pleroma/pleroma!3765
2022-10-15 12:54:20 +00:00
Haelwenn (lanodan) Monnier
16b06160ac CommonAPI: generate ModerationLog for all admin/moderator deletes
As a side-effect it also changes the ChatMessage delete ID to an
Activity.id rather than MessageReference.id

Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2958
2022-10-14 18:51:08 +02:00
5f54228e38 Send event updates to participants
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-12 23:57:05 +02:00
7ea96a1f56 More tests?
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-12 23:54:30 +02:00
8221504ecb Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-10-12 21:52:36 +02:00
tusooa
c830282628 Merge branch 'weblate-extract' into 'develop'
Extract translatable strings

See merge request pleroma/pleroma!3752
2022-10-11 21:21:36 +00:00