Commit graph

200 commits

Author SHA1 Message Date
Egor
9a39d1d846 Replace Pleroma.Jobs with pleroma_job_queue 2019-03-29 12:46:05 +00:00
lambda
749d53e2b2 Merge branch 'sayonara-gitlab-wiki' into 'develop'
Move out of Gitlab Wiki

See merge request pleroma/pleroma!990
2019-03-29 10:24:52 +00:00
rinpatch
634e09e1a8 Remove duplicated header from i2p.md 2019-03-28 20:29:46 +03:00
rinpatch
9bd80e6044 did it really take me 4 commits to fix this? 2019-03-28 20:27:01 +03:00
rinpatch
d16e2a2e04 Remove duplicated header from admin_api.md 2019-03-28 20:16:59 +03:00
rinpatch
e4601b2c1d remove admin tasks as they have their page in mix tasks category already 2019-03-28 20:16:14 +03:00
rinpatch
d0026761b7 cringe 2019-03-28 20:13:22 +03:00
rinpatch
dfae0050af Move out of Gitlab Wiki
I understand that this change is quite unreadable and hard to review, sorry for forgetting to do atomic commits. This patch does not change too much content wise, it just
* Gets everything from gitlab wiki
* Removes some specific gitlab hacks
* Formats all documentation file names to be in snake case so they look the same way as our code does
2019-03-28 19:46:30 +03:00
eugenijm
cd90695a34 Add PUT /api/pleroma/notification_settings endpoint 2019-03-28 18:55:16 +03:00
eugenijm
10c81fc902 Add user show endpoint for Pleroma admin API 2019-03-27 21:44:15 +03:00
Maxim Filippov
3cf7539bca Add more user filters + move search to its own module 2019-03-27 03:51:59 +05:00
kaniini
1c3d3d0c2b Merge branch 'safe-mentions' into 'develop'
Add safe dm mode option.

See merge request pleroma/pleroma!958
2019-03-22 00:50:24 +00:00
William Pitcock
ae8fa5d0aa docs: document conversation_id extension 2019-03-21 23:27:42 +00:00
Quentin Rameau
80bc9ed2ba Add a gopher url port config option
This lets the user advertise a different port in the gopher urls,
for example listening locally on port 7070 but telling clients to
connect to the regular port 70.
2019-03-21 19:59:43 +03:00
lain
8468f3f6d4 Add safe dm mode option. 2019-03-20 21:09:36 +01:00
Mark Felder
325c106cb5 Document additional pleroma changes to /api/v1/accounts/:id 2019-03-18 19:48:56 +00:00
eugenijm
9971bf5be1 Added documentation for Pleroma-specific is_seen in Mastodon API 2019-03-18 10:40:10 +03:00
eugenijm
43fb03be5a Allow to mark a single notification as read 2019-03-15 23:56:14 +03:00
kaniini
8b352af4dd Merge branch 'feature/openldap-support' into 'develop'
OpenLDAP support

Closes #203

See merge request pleroma/pleroma!859
2019-03-15 19:57:09 +00:00
Haelwenn (lanodan) Monnier
f5b54acc81
Fix headers and add !929 docs to extras
[ci skip]
2019-03-15 10:58:15 +01:00
Haelwenn
41fc67aa49 Merge branch 'mastoapi/mime_type' into 'develop'
Extend MastoAPI to provide attachment mimetypes

See merge request pleroma/pleroma!938
2019-03-15 09:48:50 +00:00
rinpatch
d7a34b604b Extend MastoAPI to provide attachment mimetypes 2019-03-15 11:58:12 +03:00
kaniini
c708656b5e Merge branch 'robotstxt' into 'develop'
Add robots.txt

Closes #723

See merge request pleroma/pleroma!929
2019-03-15 02:50:27 +00:00
William Pearson
3dadaa4432 robots.txt
Add default robots.txt that allows bots access to all paths.
Add mix task to generate robots.txt taht allows bots access to no paths.
Document custom emojis, MRF and static_dir
static_dir documentation includes docs for the robots.txt Mix task.
2019-03-15 02:28:18 +00:00
rinpatch
cbdd11c381 Merge develop to bump elixir version in the CI so I don't get failing formatting 2019-03-14 22:33:20 +03:00
rinpatch
e2fe796c63 Add some tests 2019-03-14 22:02:48 +03:00
link0ff
54e7087ab4 Merge remote-tracking branch 'upstream/develop' into feature/openldap-support 2019-03-14 17:43:30 +02:00
link0ff
9338f061a3 Support LDAP method start_tls 2019-03-12 18:20:02 +02:00
lain
3474066f6d MastoAPI Accounts: Add fetching by nickname.
This is to make it easier for the frontends to handle domain.com/users/nickname
urls.
2019-03-11 15:18:32 +01:00
lambda
2c8deecdd2 Merge branch 'add-local-field-to-status' into 'develop'
MastoAPI StatusView: Add locality indicator.

See merge request pleroma/pleroma!920
2019-03-11 13:26:12 +00:00
lambda
66774b5567 Update Differences-in-MastodonAPI-Responses.md 2019-03-11 13:21:03 +00:00
lain
4811eefa6e MastoAPI StatusView: Add locality indicator. 2019-03-11 13:48:27 +01:00
rinpatch
6caa500cf1 Change order of source code to align with platforms 2019-03-11 08:36:56 +03:00
rinpatch
85632a38f9 Update homepages and provide source code links for Roma apps in Clients.md 2019-03-11 08:33:57 +03:00
4826c06172 Rename Mastalab -> Fedilab in Clients.md 2019-03-11 01:40:34 +00:00
kaniini
130fc9eae6 Merge branch 'fetch-posts-on-first-federation' into 'develop'
Fetch user's outbox posts on first federation with that user

Closes #131

See merge request pleroma/pleroma!907
2019-03-08 22:33:31 +00:00
Ekaterina Vaartis
5021b7836f Fetch user's outbox posts on first federation with that user 2019-03-08 16:27:56 +03:00
kaniini
0fe715f3ba Merge branch 'chore/merge-search-into-list-users' into 'develop'
Merge search endpoint into /users

See merge request pleroma/pleroma!898
2019-03-06 22:27:42 +00:00
Maxim Filippov
76160122f6 Keep heading short 2019-03-06 05:01:38 +03:00
Haelwenn (lanodan) Monnier
a283a1fcd0
Add default config for masto_fe
Related to: https://git.pleroma.social/pleroma/mastofe/merge_requests/22
2019-03-06 02:26:14 +01:00
Maxim Filippov
2d30fc279f Typo 2019-03-05 02:11:15 +03:00
Maxim Filippov
02359d686c local -> only_local 2019-03-04 21:36:47 +03:00
Maxim Filippov
e34710b988 Format & update docs 2019-03-04 21:33:53 +03:00
link0ff
88a672fe88 Move LDAP code to LDAPAuthenticator. Use Authenticator for token_exchange with grant_type as well 2019-03-03 21:20:36 +02:00
link0ff
19e2b85247 Merge remote-tracking branch 'upstream/develop' into feature/openldap-support 2019-03-03 18:29:37 +02:00
kaniini
6c6a2dbfdd Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
Add pagination and search to users

See merge request pleroma/pleroma!873
2019-03-03 15:59:15 +00:00
Maxim Filippov
08c6aeeed7 Add docs 2019-03-02 17:32:46 +03:00
Maxim Filippov
5b08b470f6 Add "local" params to users search 2019-03-01 20:13:02 +03:00
Maxim Filippov
adac745512 Add docs to /users/search 2019-03-01 17:34:14 +03:00
lain
c4235f96bd Add with_muted param. 2019-02-27 16:37:42 +01:00
Maxim Filippov
ed7fd6b47e Add missing docs and tests 2019-02-27 03:08:03 +03:00
Egor
c3ac9424d2 AutoLinker 2019-02-26 23:32:26 +00:00
link0ff
e278d47023 OpenLDAP support 2019-02-22 15:03:43 +02:00
Egor
bff9eb5ef7 Reports 2019-02-20 16:51:25 +00:00
eugenijm
25b9e7a8c3 Added admin API for changing user activation status 2019-02-19 19:37:02 +03:00
kaniini
833161b5d2 Merge branch 'feature/jobs' into 'develop'
Job Queue

See merge request pleroma/pleroma!732
2019-02-18 19:43:06 +00:00
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
16b7c07115 Mark streaming feature for desktop apps in Clients.md 2019-02-13 07:51:14 +00:00
84f22d1cb8 Mark streaming feature for mobile/web apps in Clients.md 2019-02-12 02:35:15 +00:00
Egor Kislitsyn
305d219413 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
# Conflicts:
#	lib/pleroma/web/federator/federator.ex
#	lib/pleroma/web/websub/websub.ex
2019-02-11 13:54:21 +07: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
Egor Kislitsyn
3a3a3996b7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/federator/federator.ex
2019-02-04 20:50:28 +07: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
e10cda7541 implemented tweaks 2019-02-03 22:46:06 +01:00
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
Egor Kislitsyn
d3677d2b4d Merge remote-tracking branch 'MAIN/develop' into feature/jobs 2019-01-31 15:07:49 +07: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
Egor Kislitsyn
55affbca7f add a job queue 2019-01-28 22:17:17 +07:00
Ivan Tashkinov
d3f9e6f6fe [#534] Merged upstream/develop. 2019-01-28 15:39:14 +03:00