Maksim
|
11d08c2de0
|
tests for Pleroma.Uploaders
|
2019-08-10 18:46:26 +00:00 |
|
lain
|
29807ef6a5
|
Merge branch 'feature/digest-email' into 'develop'
Feature/digest email
See merge request pleroma/pleroma!1078
|
2019-08-08 14:38:33 +00:00 |
|
x0rz3q
|
3411f506b3
|
Replace "impode" with "implode" for
|
2019-08-04 14:35:45 +00:00 |
|
Roman Chvanikov
|
36049f08ef
|
Merge develop
|
2019-07-20 01:03:25 +03:00 |
|
Ariadne Conill
|
b2a8ccf37f
|
config: add sign_object_fetches option
|
2019-07-17 21:38:06 +00:00 |
|
kaniini
|
ce73d5f6a5
|
Merge branch 'feature/mention-mrf' into 'develop'
Add MRF MentionPolicy for dropping posts which mention specific actors
See merge request pleroma/pleroma!1439
|
2019-07-17 15:28:41 +00:00 |
|
RX14
|
96a2890a9e
|
Add MRF MentionPolicy for dropping posts which mention specific actors
|
2019-07-17 15:16:55 +01:00 |
|
Ivan Tashkinov
|
2ba07b63f4
|
Apply suggestion to docs/config.md
|
2019-07-16 16:59:02 +00:00 |
|
Ivan Tashkinov
|
889dc17abd
|
[#1094] Rate-limited follow & unfollow actions.
|
2019-07-16 19:18:30 +03:00 |
|
Roman Chvanikov
|
c729883936
|
Merge branch 'develop' into feature/digest-email
|
2019-07-14 21:43:30 +03:00 |
|
Alex S
|
7af27c143d
|
changelog & docs
|
2019-07-14 09:23:43 +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 |
|
Roman Chvanikov
|
eae991b06a
|
merge develop
|
2019-07-12 18:08:27 +03: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
aries
|
550302c041
|
Apply suggestion to docs/config.md
|
2019-06-24 01:09:28 +00: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 |
|
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 |
|
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
|
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 |
|
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 |
|
Ivan Tashkinov
|
3eefb274f4
|
OAuth consumer: tests fix, comments, Keycloak config notes.
|
2019-06-05 13:02:13 +03:00 |
|
Roman Chvanikov
|
b1b1a270e8
|
Fix conflict
|
2019-06-05 02:45:21 +03: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
|
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 |
|