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 |
|
|
|
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 |
|
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 |
|
kaniini
|
e4babb1c9f
|
Merge branch 'explicit-addressing' into 'develop'
Explicit addressing
See merge request pleroma/pleroma!1239
|
2019-06-05 08:28:20 +00:00 |
|
Maksim Pechnikov
|
96121315f3
|
fix merge
|
2019-06-04 12:41:24 +03: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 |
|
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 |
|
|
|
88414151b4
|
Formatting
|
2019-05-30 21:35:31 +00:00 |
|
|
|
75a37a68d4
|
Install docs should clone from master branch
|
2019-05-30 21:30:42 +00: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 |
|
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 |
|
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 |
|
