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 |
|
|
|
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 |
|
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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
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 |
|
|
|
e473bcf7a0
|
Max media attachment count
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-06 17:41:15 +01:00 |
|
Alex Gleason
|
94838fc10a
|
Add HellthreadPolicy by default
|
2022-02-01 15:28:53 -06:00 |
|
Alex Gleason
|
5371017fa7
|
Merge remote-tracking branch 'pleroma/quote-post' into inline-quote-default
|
2022-01-27 15:01:58 -06:00 |
|
Alex Gleason
|
a3d65937ab
|
Add InlineQuotePolicy as a default MRF
|
2022-01-27 15:01:20 -06:00 |
|
Alex Gleason
|
93a340668f
|
Merge remote-tracking branch 'origin/develop' into quote-post
|
2022-01-25 11:57:04 -06:00 |
|
Alex Gleason
|
25786c804b
|
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
|
2022-01-25 09:39:25 -06:00 |
|
Alex Gleason
|
dd7977bb68
|
Merge branch 'birth-dates' into 'develop'
Birth dates
See merge request pleroma/pleroma!3608
|
2022-01-25 15:35:47 +00:00 |
|
Alex Gleason
|
51dd5a6e21
|
Merge remote-tracking branch 'pleroma/quote-post' into quote-improvements
|
2022-01-24 17:18:30 -06:00 |
|
Alex Gleason
|
7f1d82a523
|
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
|
2022-01-24 16:55:39 -06:00 |
|
Alex Gleason
|
1cb8326cfb
|
Merge remote-tracking branch 'origin/develop' into quote-post
|
2022-01-24 16:48:37 -06:00 |
|
Alex Gleason
|
0571f8f553
|
Add InlineQuotePolicy to force quote URLs inline
|
2022-01-24 16:44:35 -06:00 |
|
Alex Gleason
|
53de3a9d44
|
Revert "Merge branch 'log-slow-queries' into 'develop'"
This reverts merge request !3553
|
2022-01-24 18:54:43 +00:00 |
|
Alex Gleason
|
98ce239ebc
|
Update description.exs
|
2022-01-22 13:28:00 -06:00 |
|
Alex Gleason
|
66e8c6f90f
|
Birthdays: birth_date --> birthday
|
2022-01-22 13:21:55 -06:00 |
|
Alex Gleason
|
64f48c4239
|
Merge remote-tracking branch 'pleroma/develop' into next
|
2022-01-22 11:24:43 -06:00 |
|
|
|
397f67fef8
|
Format code, expose instance configuration related to birth dates
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-18 18:18:38 +01:00 |
|
|
|
b108b05650
|
Birth dates, birthday reminders API, allow instance admins to require minimum age
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-18 14:57:48 +01:00 |
|
|
|
0f90fd5805
|
WIP account endorsements
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-12 18:15:10 +01:00 |
|
