Commit graph

1208 commits

Author SHA1 Message Date
c6fddd6e0a Add migration cooldown period
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-28 23:48:45 +02:00
Alex Gleason
589e9b395f
Slow down ContextObjectsDeletionMigrator 2022-09-15 11:37:09 -05:00
Alex Gleason
f5e77a3eaa
soapbox-fe --> soapbox 2022-09-13 15:26:28 -05: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
Alex Gleason
ce9bacc3be Merge branch 'fix-subscriptions' into 'develop'
Create notifications async with NotificationWorker, #91

See merge request soapbox-pub/rebased!173
2022-09-06 16:33:02 +00:00
Alex Gleason
7375535af2
Update description.exs with :poll_notifications and :notifications oban queues 2022-09-06 11:04:22 -05:00
marcin mikołajczak
0680650e5d Merge branch 'merge-pleroma' into 'develop'
merge pleroma

See merge request soapbox-pub/rebased!172
2022-09-05 21:53:20 +00:00
580bb1439b Clarify birthday_min_age config description
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-05 20:24:04 +02:00
Alex Gleason
05a20c8d6d
Create notifications async with NotificationWorker, #91 2022-09-05 12:38:30 -05:00
d4eccd86b3 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-05 15:30:14 +02:00
Alex Gleason
c208af8472 Merge branch 'improve-ci' into 'develop'
Improve CI

See merge request soapbox-pub/rebased!168
2022-09-05 04:24:24 +00:00
tusooa
20347898e2 Merge branch 'fix/federation-context-issues' into 'develop'
Fix reply context fixing (Pleroma replies to Misskey threads) and removal of context objects

See merge request pleroma/pleroma!3717
2022-09-04 18:43:36 +00:00
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
Sean King
d67d191344
Fix fedi-fe build URL 2022-08-24 23:39:02 -06:00
Sean King
cc0f32c253
Add glitch-lily as an installable frontend 2022-08-19 22:54:56 -06:00
Alex Gleason
93c237881f
Disable instance favicons in tests 2022-08-14 20:43:19 -05:00
Alex Gleason
899ac39d71
Soapbox: enable instance favicons 2022-08-14 19:40:14 -05:00
Hélène
88c1c76d3e
Migrations: delete contexts with BaseMigrator
Due to the lengthiness of this task, the migration has been adapted into
a BaseMigrator migration, running in the background instead.
2022-08-15 01:47:09 +02:00
Alex Gleason
91ba80466d
Set better default scope for keycloak 2022-08-14 16:16:20 -05:00
Alex Gleason
e1689cb323
Merge remote-tracking branch 'origin/develop' into delete-pleroma-fe 2022-08-13 13:27:25 -05:00
Alex Gleason
9069af3187
soapbox.exs: delete landing-fe 2022-08-13 13:26:39 -05:00
Alex Gleason
e8cfd1da05
Delete Pleroma FE 2022-08-13 12:50:37 -05:00
Alex Gleason
7d478b6ba3
docker.exs: don't call fetch_env! for DB_PASS 2022-08-13 12:15:26 -05:00
Alex Gleason
547fb9bd24
Docker config: pleroma --> postgres, default config 2022-08-12 18:29:49 -05:00
8c8f648168 Merge remote-tracking branch 'soapbox/develop' into webfinger-expanding 2022-08-09 13:11:27 +02:00
25ac4b10dc Add update_nickname_on_user_fetch to description.exs
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-09 13:11:18 +02:00
1455450e42 Set update_nickname_on_user_fetch to false by default
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-09 13:02:42 +02:00
Alex Gleason
d0d1457680
Docker: respect PORT env, use 5000 by default 2022-08-05 09:32:42 -05:00
Alex Gleason
97e141c5e3
docker.exs: simplify database config 2022-08-04 19:53:37 -05:00
55c62d19a8 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-03 23:42:48 +02:00
cca794e5fe Merge remote-tracking branch 'soapbox/develop' into webhooks
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-26 19:12:52 +02:00
5153eba3a8 Add authorized_fetch_mode to description.exs
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-25 19:53:51 +02:00
Alex Gleason
a5aab53a9f
Fix name of exiftool filter in config/soapbox.exs 2022-07-18 13:40:36 -05:00
207d8f391f Merge remote-tracking branch 'soapbox/develop' into webfinger-expanding 2022-07-18 18:34:40 +02:00
abe13622e6 Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-17 16:08:26 +02:00
tusooa
fdc71f6051 Merge branch 'short-description' into 'develop'
Add short_description instance field

Closes #2865

See merge request pleroma/pleroma!3651
2022-07-13 04:42:24 +00:00
b8a566229b tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-03 20:21:05 +02:00
4a57a65695 Mastodon-compatible webhooks
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-06-25 23:26:42 +02:00
Pierre-Louis Bonicoli
6f23fc8e08
Add tlsv1.3 to suggestions 2022-05-31 00:51:48 +02:00
cfb9efd47c Merge remote-tracking branch 'soapbox/develop' into webfinger-expanding
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-05-01 21:55:19 +02:00
fbf9eced11 Add short_description field
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-29 14:04:27 +02:00
6500965fb3 Add short_description field
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-29 14:01:03 +02:00
Alex Gleason
fc7d39fc0c
Fix tests 2022-03-17 13:15:23 -05:00
Alex Gleason
3e6cf43ec8
Add landing-fe, remove Soapbox FE build 2022-03-17 13:03:41 -05:00
d76bfd4e89 Location: user_location_length
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-14 22:52:06 +01:00
7f62c0b74c Merge remote-tracking branch 'origin/feature/1469-webfinger-expanding' into webfinger-expanding
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-13 23:09:57 +01:00
Alex Gleason
44723db71a Merge branch 'develop' into 'default-hellthread'
# Conflicts:
#   config/soapbox.exs
2022-02-07 05:33:38 +00:00
Alex Gleason
a3c77c4eaa
Soapbox: limit 20 media attachments by default 2022-02-06 12:42:29 -06:00
Alex Gleason
502b63d8ea
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-02-06 12:31:53 -06:00