kaniini
9f0d0d0805
Merge branch 'feature/mrf-subchain' into 'develop'
...
MRF: subchain policy
See merge request pleroma/pleroma!1233
5 years ago
kaniini
9d2563a3de
Merge branch 'generic-fe-settings' into 'develop'
...
Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221
5 years ago
kaniini
a536f515dd
Merge branch 'ueberauth_config_extension' into 'develop'
...
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification
See merge request pleroma/pleroma!1234
5 years ago
Mark Felder
6ef145b4fc
Merge branch 'develop' into feature/digest-email
5 years ago
Maksim Pechnikov
f13d6c7f78
update api to set skip_thread_containment
5 years ago
Maksim Pechnikov
080e1aa70e
add option skip_thread_containment
5 years ago
rinpatch
026b245dbc
Merge branch 'develop' into feature/polls-2-electric-boogalo
5 years ago
Ivan Tashkinov
83663caa81
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification.
5 years ago
William Pitcock
c724d8df98
docs: document mrf_subchain
5 years ago
rinpatch
65db5e9f52
Resolve merge conflicts
5 years ago
Haelwenn (lanodan) Monnier
5d3ece2861
Remove now useless flavours switching
5 years ago
lain
10fe02acef
Documentation: Document Settings store mechanism.
5 years ago
feld
88414151b4
Formatting
5 years ago
feld
75a37a68d4
Install docs should clone from master branch
5 years ago
Mark Felder
e912f81c82
Update docs to reflect we accept nickname for id for both of these endpoints
5 years ago
Roman Chvanikov
ce47017c89
Merge develop
5 years ago
Egor Kislitsyn
f333041a0a
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
kaniini
75e78d4e23
Merge branch 'feature/mrf-user-filter' into 'develop'
...
mrf: add support for filtering users
See merge request pleroma/pleroma!1188
5 years ago
kaniini
f0516d9114
Merge branch 'ssh-fixes' into 'develop'
...
Ssh fixes
Closes #869 and #925
See merge request pleroma/pleroma!1191
5 years ago
William Pitcock
7d9b33b3ce
update documentation for the new MRF features [no-ci]
5 years ago
Maksim
620908a2db
[ #699 ] add worker to clean expired oauth tokens
5 years ago
lambda
714d8d4ef9
Merge branch 'feature/object-pruning' into 'develop'
...
Object pruning
See merge request pleroma/pleroma!1181
5 years ago
lain
b22145cbc4
Documentation: Specify PEM format for SSH keys.
...
Otherwise openssh-client 7.9 will generate a different format that can't be used
by esshd.
5 years ago
kaniini
79c2cef2fb
Merge branch 'mongooseim-support' into 'develop'
...
MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172
5 years ago
William Pitcock
16b260fb19
add mix task to prune the object database using a configured retention period
5 years ago
lain
d378b342ba
MongooseIM: Add documentation.
5 years ago
rinpatch
76a7429bef
Add poll limits to /api/v1/instance and initial state
5 years ago
kaniini
943d1b2f26
Merge branch 'feature/user-configurable-mascot' into 'develop'
...
Feature: user configurable mascot
See merge request pleroma/pleroma!1177
5 years ago
Aaron Tinio
5aa107d912
Document MRF.Simple :report_removal
5 years ago
Sadposter
daeae8e2e7
Move default mascot configuration to `config/`
5 years ago
Sadposter
54e9cb5c2d
Add API endpoints for a custom user mascot
5 years ago
Egor Kislitsyn
557f0e33a7
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
lain
412a3d8a0f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
5 years ago
kaniini
bf84d50c76
Merge branch 'feature/890-add-report-uri' into 'develop'
...
Feature/890 add report uri
Closes #890
See merge request pleroma/pleroma!1164
5 years ago
Sergey Suprunenko
e2b3a27204
Add Reports to Admin API
5 years ago
Egor Kislitsyn
fc7246d715
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Alex S
8355d0607e
trailing spaces
5 years ago
Alex S
9d14214eb9
Merge branch 'develop' into feature/890-add-report-uri
5 years ago
Alex S
aa11fa4864
add report uri and report to
5 years ago
kaniini
a2771869a3
Merge branch 'docs/update_debian_instructions' into 'develop'
...
Added package to dependency list documentation
See merge request pleroma/pleroma!1161
5 years ago
Angelina Filippova
107c83ab2b
Note that nicknames is an array
5 years ago
Angelina Filippova
0641e685c1
Note that nicknames is an array
5 years ago
Angelina Filippova
1d2923e5d0
Update tag/untag docs
5 years ago
PolymerWitch
0ae15c2306
Added package to dependency list
...
Added the erlang-ssh package to the dependency list and the installation
command instructions. The project wouldn't build otherwise.
5 years ago
lain
f1e67bdc31
Search: Add optional rum indexing / searching.
5 years ago
Egor Kislitsyn
a7a8f3bc2c
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Egor Kislitsyn
fc9b4410c4
Add documentation
5 years ago
Egor Kislitsyn
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Alexander Strizhakov
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
5 years ago
Sachin Joshi
f01f995816
make url uniform in admin api
5 years ago
Roman Chvanikov
f1f7a11222
Merge develop
5 years ago
Alexander Strizhakov
bfeb33e951
Merge develop
...
Merge conflict in lib/pleroma/activity.ex
5 years ago
Roman Chvanikov
b6b5b16ba4
Merge develop
5 years ago
Egor Kislitsyn
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Alex S
f46295faa7
unused config paramater
5 years ago
Maksim
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
5 years ago
lambda
aacac9da0b
Merge branch 'feature/bbs' into 'develop'
...
BBS / SSH
See merge request pleroma/pleroma!997
5 years ago
Alexander Strizhakov
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
5 years ago
lain
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
5 years ago
xse
2982061dfa
Fix syntax highlighting + clarify :frontend_configuration
5 years ago
Roman Chvanikov
0f0cc2703b
Merge develop
5 years ago
rinpatch
ce3789e39a
Add default_scope to /api/v1/update_credentials
6 years ago
kaniini
48f68fd133
Merge branch 'feature/mastoapi-new-config' into 'develop'
...
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
This patch:
- Fixes `rights` in TwitterAPI ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
See merge request pleroma/pleroma!1093
6 years ago
Mark Felder
24c3e2db2c
Add mediaproxy whitelist capability
6 years ago
rinpatch
dfc8425659
Move settings to Source subentity
6 years ago
Egor Kislitsyn
c157e27a00
Merge branch 'develop' into feature/disable-account
6 years ago
rinpatch
4baea6e6d9
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
...
This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
6 years ago
Sergey Suprunenko
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
6 years ago
kaniini
10c40e13d2
Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'
...
Add `in_reply_to_account_acct` to MastoAPI status entity
See merge request pleroma/pleroma!1086
6 years ago
kaniini
7dcac0bac0
Merge branch 'develop' into 'develop'
...
Add shortcode_globs setting to documentation
See merge request pleroma/pleroma!1087
6 years ago
ilja
74ef14b04e
Add :emoji settings to config.md
6 years ago
Alex S
d35246c449
added healthcheck setting to instance config
6 years ago
ilja
c876b04aeb
Add shortcode_globs setting to documentation
6 years ago
rinpatch
f60d072bbb
Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity
6 years ago
Alexander Strizhakov
88f0be9693
Feature/826 healthcheck endpoint
6 years ago
Egor Kislitsyn
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
kaniini
7fcbda702e
Merge branch 'rework-emoji-management' into 'develop'
...
Remove finmoji and add a way to download emojis in packs
Closes #817 and #821
See merge request pleroma/pleroma!1073
6 years ago
Roman Chvanikov
b87ad13803
Move comments for email_notifications config to docs
6 years ago
Haelwenn (lanodan) Monnier
d086319733
differences_in_mastoapi_responses.md: `content_type` parameter of post submission
6 years ago
Ekaterina Vaartis
8f93d4c423
Remove most finmoji mentions where appropriate
6 years ago
Ekaterina Vaartis
31cff7dbca
Document the pleroma.emoji task
6 years ago
witches.live
8166cefa21
Include explicit warning for emerge config line as it will vary more widely based on current version of postgres
6 years ago
Alexander Strizhakov
ada384207b
typo fix
...
docs for RelMe provider
6 years ago
Mark Felder
1aa4994f6d
Do not require authentication for user search in MastoAPI
6 years ago
kaniini
73df3046e0
Merge branch 'feature/788-separate-email-addresses' into 'develop'
...
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
6 years ago
Hakurei Reimu
10096bbf2b
add extra_cookie_attrs option to config
...
Allow instance admins to set their own SameSite cookie policy from
the config. Default value in the config is `Lax`.
6 years ago
lain
088f378408
Custom Emoji docs: Make it clear that config.exs is not for lewd.
6 years ago
Egor Kislitsyn
38926a063a
add `/api/pleroma/disable_account` to `docs/api/pleroma_api.md`
6 years ago
Haelwenn (lanodan) Monnier
48982169dc
docs/installation/arch_linux_en.md: Remove useless ODBC
...
See [1] for confirmation.
1: https://git.pleroma.social/pleroma/pleroma/merge_requests/1050#note_24402
6 years ago
Alex S
c349573791
Merge develop to 788-separate-email-addresses
...
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
6 years ago
lambda
184ae60b21
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
...
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
6 years ago
Alex S
fe511a6c65
Merge branch 'develop' into feature/788-separate-email-addresses
6 years ago
Alex S
fe13a1d78c
adding notify_email setting for trigger emails
6 years ago
lambda
e5d553aa45
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
...
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
6 years ago
Sadposter
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
6 years ago
lambda
c8440b5e0c
Merge branch 'fix/emoji-api-nonsense' into 'develop'
...
Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038
6 years ago
Haelwenn (lanodan) Monnier
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
6 years ago
kaniini
97395e013e
Merge branch 'notification-pleroma-settings' into 'develop'
...
Notification controls
Closes #738
See merge request pleroma/pleroma!988
6 years ago
rinpatch
b57b43027c
Change response format of /api/pleroma/emoji to the one that actually makes sense
6 years ago
Alex S
012bb5dcc9
renaming expire_at -> expires_at
...
keyword style change
6 years ago
Alex S
b810aac117
added docs to docs/api/admin_api.md
...
code style and little renamings
6 years ago
Sadposter
e6778003ab
JSON need quotes!
6 years ago
Sadposter
c05fe4da0a
Document subscription endpoints, fix typos
...
Also adds a quick error case on the subscription endpoints
to avoid 500s
6 years ago
Mark Felder
da64a5aece
Document the admin API endpoints for controlling follow/unfollow
6 years ago
feld
3b12eeda19
Add ability to ship logs to a Slack channel
6 years ago
rinpatch
79cb34a4b0
Fix preview not being usable in form data
6 years ago
lambda
a79ce94dd4
Merge branch 'feature/fake-statuses' into 'develop'
...
Add fake status submit
See merge request pleroma/pleroma!995
6 years ago
rinpatch
fdb4357e9b
Rename fake param to preview and make the tests check that the object was not inserted to the db
6 years ago
rinpatch
e2b94d8f33
Make only important note bold rather than the whole paragraph because it looks better that way
6 years ago
rinpatch
a309b49c2d
Remove outdated howto change config and port and move it to config.md instead
6 years ago
rinpatch
949cfde065
restart makes no sense here as we instructed to stop the service before
6 years ago
rinpatch
bff8cde0cf
Instruct to stop the service only after git pulling and getting deps to minimize downtimes
6 years ago
rinpatch
7c69c6f624
change bold text to be proper geadings in introduction.md
6 years ago
rinpatch
b46e6f0949
Fix backup/restore page to have proper headings
6 years ago
lain
3fc4ea45df
BBS: Add documentation.
6 years ago
rinpatch
42b779527c
document fake option
6 years ago
rinpatch
afbc905a1c
qs
6 years ago
rinpatch
11584488d1
Improve PleromaJobQeue config documentation
6 years ago
Egor
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
6 years ago
lambda
749d53e2b2
Merge branch 'sayonara-gitlab-wiki' into 'develop'
...
Move out of Gitlab Wiki
See merge request pleroma/pleroma!990
6 years ago
rinpatch
634e09e1a8
Remove duplicated header from i2p.md
6 years ago
rinpatch
9bd80e6044
did it really take me 4 commits to fix this?
6 years ago
rinpatch
d16e2a2e04
Remove duplicated header from admin_api.md
6 years ago
rinpatch
e4601b2c1d
remove admin tasks as they have their page in mix tasks category already
6 years ago
rinpatch
d0026761b7
cringe
6 years ago
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
6 years ago
eugenijm
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
6 years ago
eugenijm
10c81fc902
Add user show endpoint for Pleroma admin API
6 years ago
Maxim Filippov
3cf7539bca
Add more user filters + move search to its own module
6 years ago
kaniini
1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
6 years ago
William Pitcock
ae8fa5d0aa
docs: document `conversation_id` extension
6 years ago
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.
6 years ago
lain
8468f3f6d4
Add safe dm mode option.
6 years ago
Mark Felder
325c106cb5
Document additional pleroma changes to /api/v1/accounts/:id
6 years ago
eugenijm
9971bf5be1
Added documentation for Pleroma-specific is_seen in Mastodon API
6 years ago
eugenijm
43fb03be5a
Allow to mark a single notification as read
6 years ago
kaniini
8b352af4dd
Merge branch 'feature/openldap-support' into 'develop'
...
OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859
6 years ago
Haelwenn (lanodan) Monnier
f5b54acc81
Fix headers and add !929 docs to extras
...
[ci skip]
6 years ago
Haelwenn
41fc67aa49
Merge branch 'mastoapi/mime_type' into 'develop'
...
Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938
6 years ago
rinpatch
d7a34b604b
Extend MastoAPI to provide attachment mimetypes
6 years ago
kaniini
c708656b5e
Merge branch 'robotstxt' into 'develop'
...
Add robots.txt
Closes #723
See merge request pleroma/pleroma!929
6 years ago
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.
6 years ago
rinpatch
cbdd11c381
Merge develop to bump elixir version in the CI so I don't get failing formatting
6 years ago
rinpatch
e2fe796c63
Add some tests
6 years ago
link0ff
54e7087ab4
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
6 years ago
link0ff
9338f061a3
Support LDAP method start_tls
6 years ago
lain
3474066f6d
MastoAPI Accounts: Add fetching by nickname.
...
This is to make it easier for the frontends to handle domain.com/users/nickname
urls.
6 years ago
lambda
2c8deecdd2
Merge branch 'add-local-field-to-status' into 'develop'
...
MastoAPI StatusView: Add locality indicator.
See merge request pleroma/pleroma!920
6 years ago
lambda
66774b5567
Update Differences-in-MastodonAPI-Responses.md
6 years ago
lain
4811eefa6e
MastoAPI StatusView: Add locality indicator.
6 years ago
rinpatch
6caa500cf1
Change order of source code to align with platforms
6 years ago
rinpatch
85632a38f9
Update homepages and provide source code links for Roma apps in Clients.md
6 years ago
Hakaba Hitoyo
4826c06172
Rename Mastalab -> Fedilab in Clients.md
6 years ago
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
6 years ago
Ekaterina Vaartis
5021b7836f
Fetch user's outbox posts on first federation with that user
6 years ago
kaniini
0fe715f3ba
Merge branch 'chore/merge-search-into-list-users' into 'develop'
...
Merge search endpoint into /users
See merge request pleroma/pleroma!898
6 years ago
Maxim Filippov
76160122f6
Keep heading short
6 years ago
Haelwenn (lanodan) Monnier
a283a1fcd0
Add default config for masto_fe
...
Related to: https://git.pleroma.social/pleroma/mastofe/merge_requests/22
6 years ago
Maxim Filippov
2d30fc279f
Typo
6 years ago
Maxim Filippov
02359d686c
local -> only_local
6 years ago
Maxim Filippov
e34710b988
Format & update docs
6 years ago
link0ff
88a672fe88
Move LDAP code to LDAPAuthenticator. Use Authenticator for token_exchange with grant_type as well
6 years ago
link0ff
19e2b85247
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
6 years ago
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
6 years ago
Maxim Filippov
08c6aeeed7
Add docs
6 years ago
Maxim Filippov
5b08b470f6
Add "local" params to users search
6 years ago
Maxim Filippov
adac745512
Add docs to /users/search
6 years ago
lain
c4235f96bd
Add `with_muted` param.
6 years ago
Maxim Filippov
ed7fd6b47e
Add missing docs and tests
6 years ago
Egor
c3ac9424d2
AutoLinker
6 years ago
link0ff
e278d47023
OpenLDAP support
6 years ago
Egor
bff9eb5ef7
Reports
6 years ago
eugenijm
25b9e7a8c3
Added admin API for changing user activation status
6 years ago
kaniini
833161b5d2
Merge branch 'feature/jobs' into 'develop'
...
Job Queue
See merge request pleroma/pleroma!732
6 years ago
kaniini
c23bd05737
Merge branch 'features/flavour-switching' into 'develop'
...
[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807
6 years ago
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
6 years ago
lambda
6a8a8e90da
Update Differences-in-MastodonAPI-Responses.md
6 years ago
Haelwenn (lanodan) Monnier
4df455f69b
[MastoAPI] Add switching of frontend flavours
6 years ago
rinpatch
c788f1543c
Add a section on how to identify a pleroma instance, clarify that post upload limit is not capped too
6 years ago
rinpatch
96c725328b
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon
6 years ago
lain
27375e5575
WelcomeMessage: specify that the user has to be local.
6 years ago
lain
d812a347ca
Add optional welcome message.
6 years ago
Hakaba Hitoyo
16b7c07115
Mark streaming feature for desktop apps in Clients.md
6 years ago
Hakaba Hitoyo
84f22d1cb8
Mark streaming feature for mobile/web apps in Clients.md
6 years ago
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
6 years ago
succfemboi
db407e4d50
add feather to webclients
6 years ago
Haelwenn (lanodan) Monnier
94385313b5
docs/Clients.md: Add Nekonium
...
[ci skip]
6 years ago
Haelwenn (lanodan) Monnier
daa25f3403
docs/Clients.md: Add Twidere, Remove SubwayTooter, sort alphabetically
...
[ci skip]
6 years ago
Haelwenn (lanodan) Monnier
f2d5989ffa
docs/Clients.md: Add Social (GNOME)
...
[ci skip]
6 years ago
Haelwenn (lanodan) Monnier
91a41ec670
docs/Clients.md: Add per-type sections
...
helps differenciate between Electrons and others like Brutaldon.
[ci skip]
6 years ago
Haelwenn (lanodan) Monnier
5f767be331
docs/Clients.md: Add Brutaldon, Sengi, Halcyon, Pinafore
6 years ago
Haelwenn (lanodan) Monnier
d0cf58d032
WIP: docs/Clients.md: Add documentation about clients supporting pleroma
...
[ci skip]
6 years ago
rinpatch
9a23f8f3ea
Add tests and fix a typo in docs
6 years ago
rinpatch
38ff9b3568
fix typo in config.md
6 years ago
rinpatch
6c21f5aa16
Merge branch 'develop' into feature/keyword-policy
6 years ago
rinpatch
8a0b755c19
rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy
6 years ago
rinpatch
46aa8c18a2
Add keyword policy
6 years ago
Michael Loftis
ab80c8ebb8
adds a couple of explicit examples for ExSyslogger
6 years ago
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
6 years ago
rinpatch
89762ad230
Merge branch 'feature/hellthread-filter-improvements' into 'develop'
...
Improve hellthread filter
Closes #584
See merge request pleroma/pleroma!766
6 years ago
Karen Konou
e10cda7541
implemented tweaks
6 years ago
Karen Konou
10130fa7d6
made toggleable, added docs
6 years ago
Mark Felder
0c08bd4181
Update Mogrify docs and warning for deprecated syntax to encourage
...
users to enable both strip and auto-orient
6 years ago
href
b3b0855456
Merge branch '534_federation_targets_reachability' into 'develop'
...
[#534 ] Unreachable federation targets retirement
Closes #534
See merge request pleroma/pleroma!703
6 years ago
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
6 years ago
Haelwenn (lanodan) Monnier
a7c55c61bb
docs/Pleroma-API.md: Add missing token field documentation
...
[ci skip]
6 years ago
kaniini
dea33f4aec
Merge branch 'develop' into 'develop'
...
Clarify the description of the `logo_mask` configuration key.
See merge request pleroma/pleroma!747
6 years ago
rinpatch
7057891db6
Make rich media support toggleable
6 years ago
Alice
a0dc95d084
Clarify the description of the `logo_mask` configuration key.
6 years ago
Egor Kislitsyn
d3677d2b4d
Merge remote-tracking branch 'MAIN/develop' into feature/jobs
6 years ago
kaniini
bd5086731e
Merge branch 'multiple-hackney-pools' into 'develop'
...
Use multiple hackney pools
See merge request pleroma/pleroma!739
6 years ago
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.
6 years ago
Haelwenn (lanodan) Monnier
7db517ff06
docs/config.md: Fix syntax, pleroma_fe isn’t an atom
6 years ago
Haelwenn (lanodan) Monnier
aa492af6c2
docs/config.md: Fix typo, provide an example key with camelCase and where to find more
...
[ci skip]
6 years ago
Haelwenn (lanodan) Monnier
3f9d0c08ea
docs/Pleroma-API.md: Fix ex_doc title by changing the first h1 to it
...
[ci skip]
6 years ago
kaniini
d03a116654
Merge branch 'hj-happiness-improvement' into 'develop'
...
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
6 years ago
Egor Kislitsyn
55affbca7f
add a job queue
6 years ago
Ivan Tashkinov
d3f9e6f6fe
[ #534 ] Merged `upstream/develop`.
6 years ago
lain
bcc559e4e6
Update config.md
6 years ago
Haelwenn (lanodan) Monnier
37520e1e79
docs/Pleroma-API.md: Add note about emoji endpoints similarities
...
[ci skip]
6 years ago
Ivan Tashkinov
656ed7c84a
[ #534 ] Configurable outgoing federation reachability timeout.
6 years ago
lain
e221c681dc
New frontend configuration mechanism.
6 years ago
rinpatch
74346a7035
Fix merge conflict
6 years ago
Mark Felder
8c368d42a2
Make attachment links configurable
...
Thanks @href!
6 years ago
rinpatch
4d5f15cd42
Introduce optional unfurling of nsfw content
6 years ago
rinpatch
bfe2a11a6b
Add config doc
6 years ago
scarlett
9eba6b96dc
Fix spellign.
6 years ago
Egor Kislitsyn
48591aab98
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
...
# Conflicts:
# docs/config.md
6 years ago
Egor Kislitsyn
0c750bc432
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
6 years ago
Egor Kislitsyn
6428ef77ad
add default configuration for the pinned statuses and some doc
6 years ago
lain
0fae04c4e3
Add a setting for users to autofollow on sign up.
6 years ago
Haelwenn (lanodan) Monnier
c9b99d4486
config/config.exs: Add syslog backends
6 years ago
rinpatch
b73a1a33de
Merge branch 'captcha' into 'develop'
...
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
6 years ago
lain
1a0391c8a4
Add documentation.
6 years ago
Haelwenn (lanodan) Monnier
286632dfa2
Add docs/Admin-API.md
...
[ci skip]
6 years ago
lain
5811e65e67
Add some hard limits on inserted activities.
6 years ago
Karen Konou
c76179419d
Renamed the things
6 years ago
Karen Konou
c92f91ffeb
Add documentation
6 years ago
Ekaterina Vaartis
336e37d98f
Make captcha (kocaptcha) stateless
...
Also rename seconds_retained to seconds_valid since that's how it is
now. Put it down from 180 to 20 seconds. The answer data is now
stored in an encrypted text transfered to the client and back, so no
ETS is needed
6 years ago
kaniini
2e2030ada8
Merge branch '114_email_confirmation' into 'develop'
...
[#114 ] Email confirmation
See merge request pleroma/pleroma!546
6 years ago
kaniini
fda148a9a2
Merge branch 'documentation/copy-pleroma-api' into 'develop'
...
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints
See merge request pleroma/pleroma!571
6 years ago
rinpatch
d6b133ec51
Pleroma-API.md: Additionnal endpoints
6 years ago
Haelwenn (lanodan) Monnier
6adea5a7b2
Move to docs
6 years ago
rinpatch
4a6855d9ee
Provide plaintext representations of content/cw in MastoAPI
8 years ago
Egor Kislitsyn
9abf832b03
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
lambda
e19590c93f
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
...
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
6 years ago
lambda
fd45cab9ec
Merge branch 'twitter_oauth' into 'develop'
...
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
6 years ago
lambda
23067908de
Merge branch 'feature/770-add-emoji-tags' into 'develop'
...
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
6 years ago
Egor Kislitsyn
c3d5c3513a
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
6 years ago
Egor Kislitsyn
a1a854646e
Merge branch 'develop' into use-jobs-in-webpush
6 years ago