Alex Gleason
b734e2f3f1
mix format
2022-10-28 16:09:59 -05:00
Josh Adams
5f2513d119
Make release not break things but be dumb
2022-10-27 20:26:07 -05:00
Josh Adams
ec6ee11ea7
Add most (all?) the promex setup
2022-10-27 19:47:37 -05:00
Alex Gleason
6f04447f49
mix format
2022-10-27 13:51:37 -05:00
Alex Gleason
f303a02e86
Let favicon be configurable
2022-10-27 13:15:15 -05:00
8221504ecb
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
2022-10-12 21:52:36 +02:00
e187aff5dd
Add some tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-10-03 23:10:02 +02:00
58e0ca0d68
Merge remote-tracking branch 'soapbox/develop' into pleroma-events
2022-09-30 20:04:29 +02:00
Alex Gleason
5dfb582bd2
Revert "Merge branch 'from/upstream-develop/tusooa/2169-queue-limit' into 'develop'"
...
This reverts commit 757a21554f5d7d623390
2022-09-28 17:41:36 -05: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
Tusooa Zhu
467b6cad6f
Reduce incoming and outgoing federation queue sizes to 5
2022-09-17 16:34:33 -04: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
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
c6bc523914
Clarify birthday_min_age config description
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-09-05 20:25:01 +02: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
tusooa
f7c2073103
Merge branch 'bump/min-elixir-1.10' into 'develop'
...
Bump minimum Elixir version to 1.10
See merge request pleroma/pleroma!3741
2022-09-05 15:19:34 +00: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
Haelwenn (lanodan) Monnier
21ab7369ca
Bump minimum Elixir version to 1.10
...
With the release of Elixir 1.14, Elixir 1.9 is now end-of-life.
Elixir 1.10 Release Notes:
https://github.com/elixir-lang/elixir/releases/tag/v1.10.0
2022-09-02 22:53:54 +02: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
ee8f11b085
Export to ical
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-30 10:05:39 +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
Ilja
b53cf7d4b3
Change default moderator privileges to better match what we previously had
...
Moderators were able to delete statusses via pleroma-fe. For that reason I now gave them :messages_delete by default.
They are also able to recieve reports through the notifications. For that reason I now gave them :reports_manage_reports by default.
They were also able to see deactivated accounts through pleroma-fe. However
* they were unable to tell if the account is deactivated or not (which was a bug and fixed by thes privileges MR this commit is part of)
* they were not able to actually change the activation state.
Because of this, I decided to *not* give them the privilege :users_manage_activation_state as this would give significantly more
privileges, while not giving it will actually improve the current experience as it works around the existing bug of not showing activation state.
2022-08-07 07:22:33 +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
Ilja
c045a49909
Add privilege for announcements
2022-07-14 08:40:26 +02:00
Ilja
44d14e8a9c
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into fine_grained_moderation_privileges
2022-07-14 07:07:19 +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
Ilja
f88ed1df75
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into fine_grained_moderation_privileges
2022-07-05 12:05:19 +02:00
b8a566229b
tests
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-07-03 20:21:05 +02:00
Ilja
42d4bd3a5d
Rename pipelines and add forgotten tags
...
I renamed some tags before, but forgot to rename the pipelines
I also had some tags which I forgot to add to the config, description, etc.
These have now been done/added
2022-07-02 08:55:14 +02:00
Ilja
51f87ba30c
Change order of privilege tags to make more sense
...
The tags were listed in different places
They were listed in a rather randomly order
I reordered them in a way I think makes more sense
2022-07-02 07:59:46 +02:00
Ilja
c0e4b1b3e2
Fix typo's
...
priviledge |-> privilege
2022-07-02 07:52:39 +02:00
Ilja
37fdf148b0
Rename privilege tags
...
I first focussed on getting things working
Now that they do and we know what tags there are, I put some thought in providing better names
I use the form <what_it_controls>_<what_it_allows_you_to_do>
:statuses_read => :messages_read
:status_delete => :messages_delete
:user_read => :users_read
:user_deletion => :users_delete
:user_activation => :users_manage_activation_state
:user_invite => :users_manage_invites
:user_tag => :users_manage_tags
:user_credentials => :users_manage_credentials
:report_handle => :reports_manage_reports
:emoji_management => :emoji_manage_emoji
2022-07-01 10:28:09 +02:00
4a57a65695
Mastodon-compatible webhooks
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-06-25 23:26:42 +02:00
Ilja
ecd42a2ce1
Add privilige :emoji_management
2022-06-21 12:10:27 +02:00
Ilja
0ee8f33250
Add privilige :status_delete
...
It also allows to update a message, so it's not just deleting. I need a better name...
2022-06-21 12:10:27 +02:00
Ilja
cbb26262a5
Add privileges for :user_read
2022-06-21 12:10:27 +02:00
Ilja
3f26f1b30f
Add privileges for :report_handle
2022-06-21 12:10:27 +02:00
Ilja
14e697a64f
Add privileges for :user_invite
2022-06-21 12:10:27 +02:00
Ilja
e102d25d23
Add privileges for :user_activation
2022-06-21 12:10:27 +02:00
Ilja
cb60cc4e02
Add privileges for :user_tag
2022-06-21 12:10:27 +02:00
Ilja
5a65e2dac5
Remove privileged_staff
...
Everything that was done through this setting, can now be set by giving the proper privileges to the roles.
2022-06-21 12:10:27 +02:00
Ilja
8a9144ca8b
Add priviledges for :user_credentials
...
I only moved the ones from the :require_privileged_staff block for now
2022-06-21 12:10:27 +02:00
Ilja
9f6c364759
Add privilege :user_deletion
2022-06-21 12:10:27 +02:00
Ilja
5b19543f0a
Add new setting and Plug to allow for privilege settings for staff
2022-06-21 12:10:26 +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
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
