Commit graph

9089 commits

Author SHA1 Message Date
2c62043ef9 Merge remote-tracking branch 'soapbox/develop' into pleroma-events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-05 21:08:08 +01:00
Alex Gleason
4576a5c440
ObjectValidators: fix validate_required on embeds_many fields 2022-11-03 11:56:20 -05: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
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
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
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
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
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
27fb0c80ba Use color overrides from frontend configuration
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-27 00:12:39 +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
8221504ecb Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-10-12 21:52:36 +02:00
Alex Gleason
0447197378 Merge branch 'merge-pleroma' into 'develop'
Merge Pleroma

See merge request soapbox-pub/rebased!184
2022-10-10 01:22:54 +00:00
Alex Gleason
0ee413400f
FEP-e232: support Link mediaType "application/activity+json" 2022-10-09 15:25:34 -05:00
Alex Gleason
ddaeb09e54
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 2022-10-09 13:46:48 -05:00
Alex Gleason
11dfc2589a
Add support for FEP-e232 quotes without quoteUrl 2022-10-09 13:27:16 -05:00
Tusooa Zhu
dd82fd234f
Merge branch 'release/2.4.4' into mergeback/2.4.4 2022-10-08 22:15:09 -04:00
678b6ce17c Add more tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-06 00:06:34 +02:00
e187aff5dd Add some tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-03 23:10:02 +02:00
c45612badd Update spec, fix tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-03 20:13:44 +02:00
73e7549d94 Update scheduled notitfications on edit
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-02 16:32:34 +02:00
Alex Gleason
0cd15c997c
TagValidator: allow Link tags, don't go nuclear for unrecognized Tag types 2022-10-01 19:56:11 -05:00
0612c32c6e Add notifications for updates in events you joined
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-01 22:26:35 +02:00
9ff0eb5c4b Fix event updates
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-01 18:01:52 +02:00
58e0ca0d68 Merge remote-tracking branch 'soapbox/develop' into pleroma-events 2022-09-30 20:04:29 +02:00
Alex Gleason
544be36c80
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma 2022-09-28 17:29:53 -05:00
c6fddd6e0a Add migration cooldown period
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-28 23:48:45 +02:00
Haelwenn
3f1c31b7cd Merge branch 'fix/exclude-deactivated-in-search' into 'develop'
User: search: exclude inactive users from user search

See merge request pleroma/pleroma!3755
2022-09-27 23:58:45 +00:00
f7d9f42243 event editing?
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-27 23:56:20 +02:00
Haelwenn
5d7d623390 Merge branch 'bugfix/elixir-1.14' into 'develop'
Bugfix: Elixir 1.14

See merge request pleroma/pleroma!3740
2022-09-27 21:46:03 +00:00
daccdc179c Only allow event author to accept/reject joins
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-27 21:01:48 +02:00
31d2f9a255 Store internal location data
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-25 23:19:08 +02:00
ba9fe4c6f2 Fix participation requests query
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-25 22:01:34 +02:00
5039c5ca80 Fix notification display
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-24 22:04:44 +02:00
f5fe5b4544 Add shortcuts and share_target to manifest.json
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-24 18:34:09 +02:00
0b65d205c9 Store participation_request_count
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-22 23:42:28 +02:00
c3f59eb9ec format
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-18 13:14:11 +02:00
tusooa
1a7107f4a5 Merge branch 'remove_from_followers' into 'develop'
MastoAPI: POST /api/v1/accounts/:id/remove_from_followers

See merge request pleroma/pleroma!3647
2022-09-16 23:24:13 +00:00
3b498061ed Merge remote-tracking branch 'rebased/develop' into pleroma-events
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-16 21:24:22 +02:00
a1batross
7f63b4c315 User: search: exclude deactivated users from user search
This way we don't pollute search results with deactivated and deleted users
2022-09-16 00:49:16 +03:00
Tusooa Zhu
ea60c4e709
Fix wrong relationship direction 2022-09-14 20:24:04 -04:00
Alex Gleason
f5e77a3eaa
soapbox-fe --> soapbox 2022-09-13 15:26:28 -05:00
Hélène
0b19625bfb
ObjectView: do not fetch an object for its ID
Non-Create/Listen activities had their associated object field
normalized and fetched, but only to use their `id` field, which is both
slow and redundant. This also failed on Undo activities, which delete
the associated object/activity in database.

Undo activities will now render properly and database loads should
improve ever so slightly.
2022-09-11 04:54:04 +02:00
marcin mikołajczak
98ccf6cbdc Merge branch 'webfinger-expanding' into 'develop'
Webfinger expanding

See merge request soapbox-pub/rebased!96
2022-09-10 22:03:10 +00:00
f169b9ee3b Use paths from mastodon groups implementation
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-07 15:03:57 +02:00