Commit graph

65 commits

Author SHA1 Message Date
kaniini c23bd05737 Merge branch 'features/flavour-switching' into 'develop'
[MastoAPI] Add switching of frontend flavours

See merge request pleroma/pleroma!807
2019-02-18 04:01:51 +00:00
lambda f26582aae9 Merge branch 'mastoapi-stop-capping-attachments' into 'develop'
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla Mastodon

See merge request pleroma/pleroma!834
2019-02-17 17:37:48 +00:00
lambda 6a8a8e90da Update Differences-in-MastodonAPI-Responses.md 2019-02-17 17:01:22 +00:00
Haelwenn (lanodan) Monnier 4df455f69b
[MastoAPI] Add switching of frontend flavours 2019-02-16 19:50:13 +01:00
rinpatch c788f1543c Add a section on how to identify a pleroma instance, clarify that post upload limit is not capped too 2019-02-16 21:14:07 +03:00
rinpatch 96c725328b Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon 2019-02-16 20:38:25 +03:00
lain 27375e5575 WelcomeMessage: specify that the user has to be local. 2019-02-16 17:25:06 +01:00
lain d812a347ca Add optional welcome message. 2019-02-16 16:42:34 +01:00
Hakaba Hitoyo 16b7c07115 Mark streaming feature for desktop apps in Clients.md 2019-02-13 07:51:14 +00:00
Hakaba Hitoyo 84f22d1cb8 Mark streaming feature for mobile/web apps in Clients.md 2019-02-12 02:35:15 +00:00
succfemboi db407e4d50
add feather to webclients 2019-02-10 16:18:04 +01:00
Haelwenn (lanodan) Monnier 94385313b5
docs/Clients.md: Add Nekonium
[ci skip]
2019-02-10 14:42:32 +01:00
Haelwenn (lanodan) Monnier daa25f3403
docs/Clients.md: Add Twidere, Remove SubwayTooter, sort alphabetically
[ci skip]
2019-02-10 14:32:42 +01:00
Haelwenn (lanodan) Monnier f2d5989ffa
docs/Clients.md: Add Social (GNOME)
[ci skip]
2019-02-10 14:32:42 +01:00
Haelwenn (lanodan) Monnier 91a41ec670
docs/Clients.md: Add per-type sections
helps differenciate between Electrons and others like Brutaldon.
[ci skip]
2019-02-10 14:32:42 +01:00
Haelwenn (lanodan) Monnier 5f767be331
docs/Clients.md: Add Brutaldon, Sengi, Halcyon, Pinafore 2019-02-10 14:32:42 +01:00
Haelwenn (lanodan) Monnier d0cf58d032
WIP: docs/Clients.md: Add documentation about clients supporting pleroma
[ci skip]
2019-02-10 14:32:42 +01:00
rinpatch 9a23f8f3ea Add tests and fix a typo in docs 2019-02-08 20:23:26 +03:00
rinpatch 38ff9b3568 fix typo in config.md 2019-02-08 15:12:44 +03:00
rinpatch 6c21f5aa16 Merge branch 'develop' into feature/keyword-policy 2019-02-08 13:12:33 +03:00
rinpatch 8a0b755c19 rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy 2019-02-08 13:12:09 +03:00
rinpatch 46aa8c18a2 Add keyword policy 2019-02-08 12:38:24 +03:00
Michael Loftis ab80c8ebb8 adds a couple of explicit examples for ExSyslogger 2019-02-06 17:54:30 +00:00
rinpatch 89762ad230 Merge branch 'feature/hellthread-filter-improvements' into 'develop'
Improve hellthread filter

Closes #584

See merge request pleroma/pleroma!766
2019-02-04 12:36:50 +00:00
Karen Konou e10cda7541 implemented tweaks 2019-02-03 22:46:06 +01:00
Karen Konou 10130fa7d6 made toggleable, added docs 2019-02-03 20:27:28 +01:00
Mark Felder 0c08bd4181 Update Mogrify docs and warning for deprecated syntax to encourage
users to enable both strip and auto-orient
2019-02-03 16:39:42 +00:00
href b3b0855456 Merge branch '534_federation_targets_reachability' into 'develop'
[#534] Unreachable federation targets retirement

Closes #534

See merge request pleroma/pleroma!703
2019-02-01 09:14:35 +00:00
Haelwenn 0340fcaeca Merge branch 'docs/pleroma-api-invite-token' into 'develop'
docs/Pleroma-API.md: Add missing token field documentation

See merge request pleroma/pleroma!752
2019-01-31 22:28:08 +00:00
Haelwenn (lanodan) Monnier a7c55c61bb
docs/Pleroma-API.md: Add missing token field documentation
[ci skip]
2019-01-31 23:23:53 +01:00
kaniini dea33f4aec Merge branch 'develop' into 'develop'
Clarify the description of the `logo_mask` configuration key.

See merge request pleroma/pleroma!747
2019-01-31 16:28:40 +00:00
rinpatch 7057891db6 Make rich media support toggleable 2019-01-31 18:18:20 +03:00
Alice a0dc95d084 Clarify the description of the logo_mask configuration key. 2019-01-31 13:14:22 +00:00
kaniini bd5086731e Merge branch 'multiple-hackney-pools' into 'develop'
Use multiple hackney pools

See merge request pleroma/pleroma!739
2019-01-30 19:01:57 +00:00
href 4aff4efa8d
Use multiple hackney pools
* federation (ap, salmon)
* media (rich media, media proxy)
* upload (uploader proxy)

Each "part" will stop fighting others ones -- a huge federation outbound
could before make the media proxy fail to checkout a connection in time.

splitted media and uploaded media for the good reason than an upload
pool will have all connections to the same host (the uploader upstream).
it also has a longer default retention period for connections.
2019-01-30 15:06:46 +01:00
Haelwenn (lanodan) Monnier 7db517ff06
docs/config.md: Fix syntax, pleroma_fe isn’t an atom 2019-01-30 11:51:12 +01:00
Haelwenn (lanodan) Monnier aa492af6c2
docs/config.md: Fix typo, provide an example key with camelCase and where to find more
[ci skip]
2019-01-30 11:33:39 +01:00
Haelwenn (lanodan) Monnier 3f9d0c08ea
docs/Pleroma-API.md: Fix ex_doc title by changing the first h1 to it
[ci skip]
2019-01-29 19:11:54 +01:00
kaniini d03a116654 Merge branch 'hj-happiness-improvement' into 'develop'
New frontend configuration mechanism.

Closes #445

See merge request pleroma/pleroma!700
2019-01-29 13:54:10 +00:00
Ivan Tashkinov d3f9e6f6fe [#534] Merged upstream/develop. 2019-01-28 15:39:14 +03:00
lain bcc559e4e6 Update config.md 2019-01-28 13:06:28 +01:00
Haelwenn (lanodan) Monnier 37520e1e79
docs/Pleroma-API.md: Add note about emoji endpoints similarities
[ci skip]
2019-01-27 14:31:07 +01:00
Ivan Tashkinov 656ed7c84a [#534] Configurable outgoing federation reachability timeout. 2019-01-25 15:10:21 +03:00
lain e221c681dc New frontend configuration mechanism. 2019-01-23 12:40:57 +01:00
rinpatch 74346a7035 Fix merge conflict 2019-01-18 18:31:25 +03:00
Mark Felder 8c368d42a2 Make attachment links configurable
Thanks @href!
2019-01-17 15:48:14 +00:00
rinpatch 4d5f15cd42 Introduce optional unfurling of nsfw content 2019-01-17 11:00:02 +03:00
rinpatch bfe2a11a6b Add config doc 2019-01-16 10:45:56 +03:00
scarlett 9eba6b96dc Fix spellign. 2019-01-11 09:55:33 +00:00
Egor Kislitsyn 48591aab98 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
# Conflicts:
#	docs/config.md
2019-01-09 16:56:31 +07:00