Maxim Filippov
|
418ae6638d
|
Merge branch 'develop' into feature/admin-api-user-statuses
|
2019-07-14 00:39:06 +03:00 |
|
Maxim Filippov
|
a9459ff98f
|
Admin API: Endpoint for fetching latest user's statuses
|
2019-07-14 00:37:26 +03:00 |
|
Ariadne Conill
|
0cc638b968
|
docs: note that exclusions usage will be included in the transparency metrics if used
|
2019-07-13 19:00:03 +00:00 |
|
Ariadne Conill
|
80c46d6d8b
|
nodeinfo: implement MRF transparency exclusions
|
2019-07-13 18:53:14 +00:00 |
|
Ivan Tashkinov
|
b74d11e20a
|
[#1041] Added documentation on existing rate limiters.
|
2019-07-13 15:13:26 +03:00 |
|
Mark Felder
|
360e4cdaa2
|
Move these to pleroma namespace in Mastodon API
|
2019-07-12 11:25:58 -05:00 |
|
Roman Chvanikov
|
eae991b06a
|
merge develop
|
2019-07-12 18:08:27 +03:00 |
|
Alexander Strizhakov
|
846ad9a463
|
admin api configure changes
|
2019-07-11 13:02:13 +00:00 |
|
Egor Kislitsyn
|
182f7bbb11
|
Merge branch 'develop' into feature/addressable-lists
|
2019-07-11 13:26:59 +07:00 |
|
Alex S
|
beba7bbc85
|
removing synchronization worker
|
2019-07-10 17:42:18 +03:00 |
|
Maksim
|
12b1454245
|
[#1062] added option to disable send email
|
2019-07-10 05:34:21 +00:00 |
|
Roman Chvanikov
|
371d39e160
|
Merge develop
|
2019-07-09 21:21:09 +03:00 |
|
feld
|
c91b5c87ff
|
Docs/more mastodon api
|
2019-07-09 18:20:36 +00:00 |
|
Mark Felder
|
9a9b60cfbc
|
Merge branch 'develop' into feature/allow-user-query-via-id
|
2019-07-09 12:49:04 -05:00 |
|
Alexander Strizhakov
|
d6b0fce6e9
|
Fix/1019 correct count remote users
|
2019-07-09 17:36:35 +00:00 |
|
Ivan Tashkinov
|
dd5a41e2a4
|
Apply suggestion to docs/config.md
|
2019-07-09 10:39:36 +00:00 |
|
Maxim Filippov
|
9f23502856
|
Fix docs
|
2019-07-06 15:16:56 +03:00 |
|
Ivan Tashkinov
|
ad8d86e7c6
|
Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
|
2019-07-06 10:17:06 +03:00 |
|
Maxim Filippov
|
6c50fbcd14
|
Admin API: Allow querying user by ID
|
2019-07-05 19:33:53 +03:00 |
|
Haelwenn
|
3b05f834f4
|
Merge branch 'fix/docs-dry-run' into 'develop'
OTP Release install docs: Remove --dry-run in cron certbot command
See merge request pleroma/pleroma!1366
|
2019-07-01 04:52:42 +00:00 |
|
Maxim Filippov
|
611f6665ac
|
Update changelog and admin API docs with tags, display_name, avatar additions
|
2019-07-01 03:36:42 +03:00 |
|
Roman Chvanikov
|
d2cb18b2a3
|
Merge branch 'develop' into feature/digest-email
|
2019-06-30 21:23:35 +03:00 |
|
Ivan Tashkinov
|
a799418573
|
[#161] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
# Conflicts:
# CHANGELOG.md
|
2019-06-30 16:05:00 +03:00 |
|
Ivan Tashkinov
|
2b9d914089
|
[#161] Refactoring, documentation.
|
2019-06-30 15:58:50 +03:00 |
|
rinpatch
|
044eb039c2
|
OTP Release install docs: Remove --dry-run in cron certbot command
|
2019-06-30 13:06:10 +03:00 |
|
Maksim
|
acd20f166b
|
[#1026] Filter.AnonymizeFilename added ability to retain file extension with custom text
|
2019-06-30 07:28:35 +00:00 |
|
deorsum
|
4c40ada7a5
|
Add a caveat for docker deployment in the config docs
|
2019-06-29 21:14:11 +10:00 |
|
rinpatch
|
eddcebf8ae
|
Add a warning about service files assuming installation paths
|
2019-06-29 11:35:42 +03:00 |
|
rinpatch
|
b6cfc8f98b
|
Merge branch 'patch-3' into 'develop'
Move all upload contents despite upload folder itself.
See merge request pleroma/pleroma!1352
|
2019-06-29 06:01:33 +00:00 |
|
Yuji Nakao
|
ab6de9b478
|
Move all upload contents despite upload folder itself.
|
2019-06-29 04:24:44 +00:00 |
|
Yuji Nakao
|
b2548e65db
|
Update migrating_from_source_otp_en.md: Replace reload-daemon with daemon-reload.
|
2019-06-29 04:17:49 +00:00 |
|
William Pitcock
|
074ffee0b2
|
docs: add documentation for MediaProxyWarmingPolicy
|
2019-06-28 23:20:17 +00:00 |
|
Roman Chvanikov
|
657277ffc0
|
Resolve conflicts
|
2019-06-29 00:52:50 +03:00 |
|
Julien Wehmschulte
|
e556c96661
|
Update docs/installation/arch_linux_en.md, docs/installation/centos7_en.md, docs/installation/debian_based_en.md, docs/installation/debian_based_jp.md, docs/installation/gentoo_en.md files
|
2019-06-28 18:25:21 +00:00 |
|
lain
|
2286f62a36
|
Merge branch 'release-docs' into 'develop'
Docs on OTP releases
See merge request pleroma/pleroma!1315
|
2019-06-28 15:26:09 +00:00 |
|
rinpatch
|
eeb419e3a0
|
Add a note about the develop branch
|
2019-06-28 09:42:45 +03:00 |
|
rinpatch
|
4f44732100
|
Add a note on what OTP releases are
|
2019-06-27 09:45:13 +03:00 |
|
Alexander Strizhakov
|
c6705144a2
|
don't delete config settings on admin update
|
2019-06-27 04:19:44 +00:00 |
|
rinpatch
|
f5f1bb35c3
|
Instructions on getting the flavour
|
2019-06-26 15:24:06 +03:00 |
|
rinpatch
|
877f91c0c4
|
Do not assume ~pleroma == /opt/pleroma
|
2019-06-26 15:20:22 +03:00 |
|
rinpatch
|
e404335af8
|
Add all the remaining sections to Switching to OTP releases
|
2019-06-26 11:34:58 +03:00 |
|
kaniini
|
9f8e645dce
|
Merge branch 'feature/configurable-pack-extensions' into 'develop'
Make default pack extensions configurable and default to png and gif
See merge request pleroma/pleroma!1338
|
2019-06-26 05:34:02 +00:00 |
|
rinpatch
|
41e4752950
|
Make default pack extensions configurable and default to png and gif
|
2019-06-26 06:48:59 +03:00 |
|
Maksim
|
ec01b7c934
|
Apply suggestion to docs/config.md
|
2019-06-26 03:23:26 +00:00 |
|
Maksim Pechnikov
|
4ad15ad2a9
|
add ignore hosts and TLDs for rich_media
|
2019-06-25 22:25:37 +03:00 |
|
rinpatch
|
44aa895b78
|
Add a note that OTP releases don't contain revision history
|
2019-06-25 05:50:25 +03:00 |
|
rinpatch
|
57d18b06ab
|
Remove the useless specification of test size and make the main points bold
|
2019-06-25 04:55:41 +03:00 |
|
rinpatch
|
687f0aee51
|
Basic skeleton of "Switching a from-source install to OTP releases"
|
2019-06-24 11:51:02 +03:00 |
|
aries
|
550302c041
|
Apply suggestion to docs/config.md
|
2019-06-24 01:09:28 +00:00 |
|
rinpatch
|
7fc226e0fe
|
Remove the warning about alpine as the issue is now solved
|
2019-06-24 02:50:28 +03:00 |
|
aries
|
7daaaf84f1
|
Fix markdown mistakes
|
2019-06-24 01:28:01 +09:00 |
|
aries
|
4bac13966b
|
modify config.md for S3
|
2019-06-24 01:10:55 +09:00 |
|
kaniini
|
8b7860f12f
|
Merge branch 'admin-config' into 'develop'
Admin config
See merge request pleroma/pleroma!1328
|
2019-06-23 05:42:37 +00:00 |
|
rinpatch
|
40a62839ff
|
Use build-base instead of individual packages
|
2019-06-23 08:35:35 +03:00 |
|
Alex S
|
982cad0268
|
support for config groups
|
2019-06-23 08:16:16 +03:00 |
|
rinpatch
|
1d3c5e434d
|
releases_en.md -> otp_en.md
|
2019-06-23 07:44:10 +03:00 |
|
rinpatch
|
66e92dc0ca
|
Add a Further Reading section to the OTP install guide
|
2019-06-23 07:43:45 +03:00 |
|
rinpatch
|
299cefa2bd
|
Add a section on executing mix tasks
|
2019-06-23 03:05:02 +03:00 |
|
rinpatch
|
18eabca978
|
Add a section about updating
|
2019-06-23 02:55:43 +03:00 |
|
rinpatch
|
9d487ba579
|
Add docs about SSL certificate auto-renew
|
2019-06-23 02:42:53 +03:00 |
|
rinpatch
|
7a4c4518b8
|
Remove a note about needing to add RUM to config manually, as it is now
in the config generator
|
2019-06-22 21:18:34 +03:00 |
|
Haelwenn (lanodan) Monnier
|
ab79a18b77
|
docs/clients.md: Remove tootdon
Of course a proprietary client would send the messages home :D
|
2019-06-22 19:34:30 +02:00 |
|
Alex S
|
410add1c30
|
support for tuples with more than 2 values
|
2019-06-22 17:30:53 +03:00 |
|
rinpatch
|
e00e4c0e7a
|
Add a warning about OTP releases on Alpine 3.10
|
2019-06-22 13:41:17 +03:00 |
|
rinpatch
|
177faf15c2
|
Correct dependencies for RUM on alpine and remove installcheck
|
2019-06-22 08:36:36 +03:00 |
|
rinpatch
|
50e3cf9d5e
|
Correct a typo in the apk command
|
2019-06-22 08:31:02 +03:00 |
|
rinpatch
|
dd05dc65d3
|
Do not exit on fail in the one-liner because it closes ssh connection and fix dependencies for alpine
|
2019-06-22 08:30:32 +03:00 |
|
rinpatch
|
1d2332ce79
|
Use uname -m instead of arch for more portability
|
2019-06-22 05:20:36 +03:00 |
|
rinpatch
|
120f84c83d
|
Executing create is unnecessary after the postgres script is executed
|
2019-06-22 04:35:22 +03:00 |
|
rinpatch
|
23608149bc
|
Execute migration commands as the pleroma user and add a note about the need to uncomment the RUM command
|
2019-06-22 02:21:02 +03:00 |
|
rinpatch
|
d1d648b0ec
|
Correct the psql command
|
2019-06-22 02:09:45 +03:00 |
|
rinpatch
|
452d5d3231
|
Merge branch 'develop' into release-docs
|
2019-06-22 02:00:18 +03:00 |
|
rinpatch
|
743bd64883
|
Apply suggestion to docs/installation/releases_en.md
|
2019-06-21 17:00:12 +00:00 |
|
rinpatch
|
de77d7621a
|
Apply suggestion to docs/installation/releases_en.md
|
2019-06-21 16:59:56 +00:00 |
|
rinpatch
|
8b170b96c7
|
Apply suggestion to docs/installation/releases_en.md
|
2019-06-21 16:59:48 +00:00 |
|
rinpatch
|
4bec121798
|
Do not set ownership group in chown commands
|
2019-06-21 06:39:03 +03:00 |
|
rinpatch
|
e824025c52
|
Remove a useless echo
|
2019-06-21 06:37:38 +03:00 |
|
rinpatch
|
16e9304cec
|
Change to long adduser options because the short ones only work on busybox
|
2019-06-21 06:32:34 +03:00 |
|
rinpatch
|
4669a56aa3
|
Add notes on RUM indexes
|
2019-06-21 06:22:34 +03:00 |
|
rinpatch
|
f9515a3611
|
Add a note about RUM indexes package on Debian/Ubuntu
|
2019-06-21 06:14:02 +03:00 |
|
rinpatch
|
d3d98beaad
|
Correct package names for Debian
|
2019-06-21 06:04:39 +03:00 |
|
rinpatch
|
dd23888774
|
OTP release install guide sceleton
|
2019-06-21 05:48:13 +03:00 |
|
William Pitcock
|
630ac6a921
|
docs: better description for mrf anti link spam
|
2019-06-20 03:01:03 +00:00 |
|
William Pitcock
|
736d8ad6be
|
implement anti link spam MRF
|
2019-06-19 15:58:32 +00:00 |
|
lain
|
6745bc951c
|
Documentation: Document chat token response.
|
2019-06-15 11:11:45 +02:00 |
|
rinpatch
|
62ffc00a5d
|
Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'
AccountView: Add user background.
See merge request pleroma/pleroma!1280
|
2019-06-14 16:49:28 +00:00 |
|
Alexander Strizhakov
|
c2ca1f22a2
|
it is changed in compile time
we can't change module attributes and endpoint settings in runtime
|
2019-06-14 15:45:05 +00:00 |
|
lain
|
774637a2f4
|
Mastodon API: Document changes.
|
2019-06-14 11:24:09 +02:00 |
|
lain
|
4265608097
|
Merge branch 'chore/tagpolicy_docs' into 'develop'
Document TagPolicy in `rewrite_policy` section
See merge request pleroma/pleroma!1271
|
2019-06-12 09:52:55 +00:00 |
|
rinpatch
|
ced59be1ae
|
Document TagPolicy in rewrite_policy section
|
2019-06-11 22:15:28 +03:00 |
|
Egor Kislitsyn
|
6f29865d43
|
Add option to restrict all users to local content
|
2019-06-11 21:25:53 +07:00 |
|
Hakaba Hitoyo
|
5d5a9a3a35
|
Better default parameters for suggestion
|
2019-06-11 11:34:22 +00:00 |
|
Egor Kislitsyn
|
ad04d12de6
|
Replace MastodonAPIController.account_register/2 rate limiter
|
2019-06-11 16:06:03 +07:00 |
|
Egor Kislitsyn
|
2e5affce61
|
Add RateLimiter
|
2019-06-11 14:27:41 +07:00 |
|
Roman Chvanikov
|
01fe5abad1
|
Resolve conflicts
|
2019-06-07 01:20:50 +03:00 |
|
Egor
|
f82382de22
|
[#943] Make the unauthenticated users limitation optional
|
2019-06-06 12:17:49 +00:00 |
|
Egor Kislitsyn
|
cfa5572d28
|
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
|
2019-06-05 17:53:15 +07:00 |
|
Ivan Tashkinov
|
3eefb274f4
|
OAuth consumer: tests fix, comments, Keycloak config notes.
|
2019-06-05 13:02:13 +03:00 |
|
kaniini
|
e4babb1c9f
|
Merge branch 'explicit-addressing' into 'develop'
Explicit addressing
See merge request pleroma/pleroma!1239
|
2019-06-05 08:28:20 +00:00 |
|
Egor Kislitsyn
|
6ba9055b51
|
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
|
2019-06-05 12:54:30 +07:00 |
|
Roman Chvanikov
|
b1b1a270e8
|
Fix conflict
|
2019-06-05 02:45:21 +03:00 |
|
Maksim Pechnikov
|
96121315f3
|
fix merge
|
2019-06-04 12:41:24 +03:00 |
|
Egor Kislitsyn
|
9ce928d823
|
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
|
2019-06-04 16:28:23 +07:00 |
|
lain
|
4cab98b7bf
|
Merge remote-tracking branch 'origin/develop' into explicit-addressing
|
2019-06-04 11:23:46 +02:00 |
|
lain
|
25198d48f7
|
Docs: Add Explicit addressing to Readme and changelog.
|
2019-06-04 10:49:57 +02:00 |
|
Maksim Pechnikov
|
4f2e359687
|
Merge branch 'develop' into issue/941
|
2019-06-04 09:49:08 +03:00 |
|
kaniini
|
9f0d0d0805
|
Merge branch 'feature/mrf-subchain' into 'develop'
MRF: subchain policy
See merge request pleroma/pleroma!1233
|
2019-06-04 05:49:54 +00:00 |
|
kaniini
|
9d2563a3de
|
Merge branch 'generic-fe-settings' into 'develop'
Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221
|
2019-06-04 05:43:43 +00:00 |
|
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
|
2019-06-04 05:42:49 +00:00 |
|
Mark Felder
|
6ef145b4fc
|
Merge branch 'develop' into feature/digest-email
|
2019-06-03 15:29:53 -05:00 |
|
Maksim Pechnikov
|
f13d6c7f78
|
update api to set skip_thread_containment
|
2019-06-03 21:02:57 +03:00 |
|
Maksim Pechnikov
|
080e1aa70e
|
add option skip_thread_containment
|
2019-06-03 16:13:37 +03:00 |
|
rinpatch
|
026b245dbc
|
Merge branch 'develop' into feature/polls-2-electric-boogalo
|
2019-06-03 11:14:52 +03:00 |
|
Ivan Tashkinov
|
83663caa81
|
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification.
|
2019-06-02 17:45:32 +03:00 |
|
William Pitcock
|
c724d8df98
|
docs: document mrf_subchain
|
2019-06-02 10:14:56 +00:00 |
|
rinpatch
|
65db5e9f52
|
Resolve merge conflicts
|
2019-06-01 16:29:58 +03:00 |
|
Haelwenn (lanodan) Monnier
|
5d3ece2861
|
Remove now useless flavours switching
|
2019-06-01 01:44:10 +02:00 |
|
lain
|
10fe02acef
|
Documentation: Document Settings store mechanism.
|
2019-05-31 14:59:24 +02:00 |
|
feld
|
88414151b4
|
Formatting
|
2019-05-30 21:35:31 +00:00 |
|
feld
|
75a37a68d4
|
Install docs should clone from master branch
|
2019-05-30 21:30:42 +00:00 |
|
Mark Felder
|
e912f81c82
|
Update docs to reflect we accept nickname for id for both of these endpoints
|
2019-05-29 12:22:14 -05:00 |
|
Roman Chvanikov
|
ce47017c89
|
Merge develop
|
2019-05-29 18:18:22 +03:00 |
|
Egor Kislitsyn
|
f333041a0a
|
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
|
2019-05-24 21:05:57 +07:00 |
|
kaniini
|
75e78d4e23
|
Merge branch 'feature/mrf-user-filter' into 'develop'
mrf: add support for filtering users
See merge request pleroma/pleroma!1188
|
2019-05-22 19:03:14 +00:00 |
|
kaniini
|
f0516d9114
|
Merge branch 'ssh-fixes' into 'develop'
Ssh fixes
Closes #869 and #925
See merge request pleroma/pleroma!1191
|
2019-05-22 18:57:34 +00:00 |
|
William Pitcock
|
7d9b33b3ce
|
update documentation for the new MRF features [no-ci]
|
2019-05-22 18:53:30 +00:00 |
|
Maksim
|
620908a2db
|
[#699] add worker to clean expired oauth tokens
|
2019-05-22 15:44:50 +00:00 |
|
lambda
|
714d8d4ef9
|
Merge branch 'feature/object-pruning' into 'develop'
Object pruning
See merge request pleroma/pleroma!1181
|
2019-05-22 11:04:30 +00:00 |
|
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.
|
2019-05-22 10:44:26 +02:00 |
|
kaniini
|
79c2cef2fb
|
Merge branch 'mongooseim-support' into 'develop'
MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172
|
2019-05-22 04:06:54 +00:00 |
|
William Pitcock
|
16b260fb19
|
add mix task to prune the object database using a configured retention period
|
2019-05-21 21:38:56 +00:00 |
|
lain
|
d378b342ba
|
MongooseIM: Add documentation.
|
2019-05-21 18:57:36 +02:00 |
|
rinpatch
|
76a7429bef
|
Add poll limits to /api/v1/instance and initial state
|
2019-05-21 09:13:10 +03:00 |
|
kaniini
|
943d1b2f26
|
Merge branch 'feature/user-configurable-mascot' into 'develop'
Feature: user configurable mascot
See merge request pleroma/pleroma!1177
|
2019-05-20 18:17:42 +00:00 |
|
Aaron Tinio
|
5aa107d912
|
Document MRF.Simple :report_removal
|
2019-05-21 00:59:12 +08:00 |
|
Sadposter
|
daeae8e2e7
|
Move default mascot configuration to config/
|
2019-05-20 16:12:55 +01:00 |
|
Sadposter
|
54e9cb5c2d
|
Add API endpoints for a custom user mascot
|
2019-05-20 12:39:23 +01:00 |
|
Egor Kislitsyn
|
557f0e33a7
|
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
|
2019-05-17 19:57:14 +07:00 |
|
lain
|
412a3d8a0f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
|
2019-05-17 12:26:59 +02:00 |
|
kaniini
|
bf84d50c76
|
Merge branch 'feature/890-add-report-uri' into 'develop'
Feature/890 add report uri
Closes #890
See merge request pleroma/pleroma!1164
|
2019-05-16 20:11:12 +00:00 |
|
Sergey Suprunenko
|
e2b3a27204
|
Add Reports to Admin API
|
2019-05-16 19:09:18 +00:00 |
|
Egor Kislitsyn
|
fc7246d715
|
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
|
2019-05-16 17:54:24 +07:00 |
|
Alex S
|
8355d0607e
|
trailing spaces
|
2019-05-16 17:03:12 +07:00 |
|
Alex S
|
9d14214eb9
|
Merge branch 'develop' into feature/890-add-report-uri
|
2019-05-16 12:54:06 +07:00 |
|
Alex S
|
aa11fa4864
|
add report uri and report to
|
2019-05-16 12:49:40 +07:00 |
|
kaniini
|
a2771869a3
|
Merge branch 'docs/update_debian_instructions' into 'develop'
Added package to dependency list documentation
See merge request pleroma/pleroma!1161
|
2019-05-16 05:03:37 +00:00 |
|
Angelina Filippova
|
107c83ab2b
|
Note that nicknames is an array
|
2019-05-16 01:48:53 +03:00 |
|
Angelina Filippova
|
0641e685c1
|
Note that nicknames is an array
|
2019-05-16 01:46:43 +03:00 |
|
Angelina Filippova
|
1d2923e5d0
|
Update tag/untag docs
|
2019-05-16 01:36:26 +03:00 |
|
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.
|
2019-05-15 15:36:20 -07:00 |
|