6e51845d44
Merge remote-tracking branch 'pleroma/develop' into secure-mode
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-12-27 16:41:16 +01:00
d5d4c7c11d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
2022-12-19 18:48:26 -07:00
7aa17cd651
Merge branch 'doc_readme_nixos' into 'develop'
...
add nixos to supported distros
See merge request pleroma/pleroma!3600
2022-12-20 01:13:03 +00:00
60df2d8a97
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fine_grained_moderation_privileges
2022-12-18 22:03:48 -07:00
8afad1e46e
reccomend tagged releases over pulling stable
2022-12-06 17:24:04 +00:00
c7a0df8006
Remove Quack from docs and cheatsheet
2022-11-18 10:09:52 -05:00
1b0e47b79b
Merge branch 'from/upstream-develop/tusooa/no-strip-report' into 'develop'
...
Give admin the choice to not strip reported statuses
Closes #2887
See merge request pleroma/pleroma!3773
2022-11-12 17:55:50 +00:00
e3e68b9377
Update config cheatsheet
2022-11-12 12:55:02 -05:00
eb70676931
Update links to Soapbox
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-11-11 12:13:30 +01:00
648e012022
ObjectAgePolicy: Make strip_followers behavior for followers-only explicit
2022-11-07 14:58:47 +01:00
f2e4b425e1
Document some caveats of webfinger domain setting
2022-11-03 21:13:00 +00:00
a57c025594
docs update
2022-11-03 09:48:59 -04:00
30ded8876a
docs & changelog
2022-11-03 09:48:57 -04:00
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
e40c221c31
Merge branch 'from/upstream-develop/tusooa/edits' into 'develop'
...
Editing
Closes #1429 , #2859 , and #2288
See merge request pleroma/pleroma!3678
2022-09-03 02:16:42 +00:00
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
93f12c0d0d
Merge branch 'from/upstream-develop/tusooa/sync-settings' into 'develop'
...
Synchronized settings for apps (frontends)
See merge request pleroma/pleroma!3698
2022-08-12 01:34:36 +00:00
c899af1d6a
Reject requests from specified instances if `authorized_fetch_mode` is enabled
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-08-05 11:06:30 +02:00
c80096522c
Merge branch 'develop' into 'from/develop/tusooa/emit-move'
...
# Conflicts:
# CHANGELOG.md
# test/pleroma/user_test.exs
2022-07-31 21:32:49 +00:00
1a67a20364
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:40:24 +00:00
f9fc3a153d
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:40:10 +00:00
ce0a6737e7
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:40:02 +00:00
97e8c8a10a
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:39:26 +00:00
d24d74b1a7
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:39:21 +00:00
db789acf1e
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:39:11 +00:00
d622fe8d48
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:39:03 +00:00
02b4b4da47
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:38:45 +00:00
02947bafeb
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:38:30 +00:00
ad730c2135
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:38:23 +00:00
2baf3084a1
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:38:01 +00:00
92da9c4a47
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:37:41 +00:00
275c60208b
Apply ilja's suggestion(s) to 1 file(s)
2022-07-18 05:37:27 +00:00
8113dd31ee
Add api docs for settings endpoint
2022-07-16 01:27:16 -04:00
44d14e8a9c
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into fine_grained_moderation_privileges
2022-07-14 07:07:19 +02:00
8ddea16b0d
DOCS: Add some small piece about setting up a Gitlab-runner
...
This is based on me setting one up, but I kept it general with mostly linking to other documentation.
The idea is that to just provide some Pleroma-specific info, maybe give some pointers, and point to the right (external) docs.
2022-07-13 20:54:24 +02:00
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
f88ed1df75
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into fine_grained_moderation_privileges
2022-07-05 12:05:19 +02:00
4edc867b87
Merge branch 'develop' into 'from/upstream-develop/tusooa/edits'
...
# Conflicts:
# lib/pleroma/constants.ex
2022-07-03 22:24:57 +00:00
de37583c49
Merge branch 'image_description_from_exif_data' into 'develop'
...
Use EXIF data of image for image description
See merge request pleroma/pleroma!3535
2022-07-03 21:14:25 +00:00
6b937d1473
Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop'
...
Server announcements (1st pass)
See merge request pleroma/pleroma!3643
2022-07-03 20:58:20 +00:00
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
15748fd301
Add better explanation in the Cheatsheet about what each tag does
2022-07-02 08:17:22 +02:00
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
c0e4b1b3e2
Fix typo's
...
priviledge |-> privilege
2022-07-02 07:52:39 +02:00
7d234d097c
Add option to docs about instance gen
2022-07-01 12:15:02 +02:00
8303af84ce
Rename the Exiftool module
...
No migrations or checks yet
2022-07-01 12:15:02 +02:00
551721e41a
Rename the new module
2022-07-01 12:13:46 +02:00
cd316d7269
Use EXIF data of image to prefill image description
...
During attachment upload Pleroma returns a "description" field. Pleroma-fe has an MR to use that to pre-fill the image description field, <https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1399 >
* This MR allows Pleroma to read the EXIF data during upload and return the description to the FE
* If a description is already present (e.g. because a previous module added it), it will use that
* Otherwise it will read from the EXIF data. First it will check -ImageDescription, if that's empty, it will check -iptc:Caption-Abstract
* If no description is found, it will simply return nil, just like before
* When people set up a new instance, they will be asked if they want to read metadata and this module will be activated if so
This was taken from an MR i did on Pleroma and isn't finished yet.
2022-07-01 12:13:46 +02:00
0d697bc15a
Add docs and CHANGELOG entries
2022-07-01 10:50:32 +02:00
fe2d4778ee
Expose content type of status sources
2022-06-04 12:57:30 -04:00
marcin mikołajczak