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 |
|
|
rinpatch
|
0b4f569c5b
|
Merge branch 'fix/prune-objects-times-out' into 'develop'
Disable timeouts for object pruning query
See merge request pleroma/pleroma!1193
|
2019-05-22 17:19:51 +00:00 |
|
|
rinpatch
|
54e10a3e55
|
Disable timeouts for object pruning query
|
2019-05-22 20:10:52 +03:00 |
|
|
lambda
|
83ca12f45e
|
Merge branch 'issue/699' into 'develop'
[#699] add worker to clean expired oauth tokens
See merge request pleroma/pleroma!1184
|
2019-05-22 15:44:50 +00:00 |
|
|
Maksim
|
620908a2db
|
[#699] add worker to clean expired oauth tokens
|
2019-05-22 15:44:50 +00:00 |
|
|
lambda
|
78ac8ee561
|
Update CHANGELOG.md
|
2019-05-22 11:07:51 +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
|
f323031927
|
Mix: Only start sshd when needed, second try.
|
2019-05-22 12:57:20 +02:00 |
|
|
lambda
|
ad535ae55b
|
Merge branch 'bring-ecto-back-to-mainline' into 'develop'
Mix: Bring ecto-sql back to mainline.
See merge request pleroma/pleroma!1192
|
2019-05-22 10:05:05 +00:00 |
|
|
lain
|
f4cfcead88
|
Mix: Bring ecto-sql back to mainline.
|
2019-05-22 11:44:17 +02:00 |
|
|
lain
|
3b12e1ba7c
|
Changelog: Add tip for debian users.
|
2019-05-22 11:01:10 +02: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 |
|
|
lain
|
db9a82d168
|
Linting.
|
2019-05-22 10:40:15 +02:00 |
|
|
lain
|
b6cf62ddea
|
Mix: Don't start esshd application if we don't need it.
|
2019-05-22 10:28:50 +02:00 |
|
|
lain
|
f9e0d09ec0
|
Changelog: Add SSH mode.
|
2019-05-22 10:17:32 +02:00 |
|
|
lambda
|
ff363f70b5
|
Merge branch 'refactor/keys' into 'develop'
move key generation functions into Pleroma.Keys module
See merge request pleroma/pleroma!1186
|
2019-05-22 06:28:16 +00:00 |
|
|
William Pitcock
|
1344c85e2f
|
salmon: fix credo
|
2019-05-22 05:58:51 +00:00 |
|
|
rinpatch
|
cdac5efd10
|
Merge branch 'bugfix/account_view_source.note' into 'develop'
MastoAPI AccountView: fill source.note with plaintext version of note
Closes #926
See merge request pleroma/pleroma!1189
|
2019-05-22 05:39:01 +00:00 |
|
|
Haelwenn (lanodan) Monnier
|
0e2c215a00
|
MastoAPI AccountView: fill source.note with plaintext version of note
Closes: https://git.pleroma.social/pleroma/pleroma/issues/926
|
2019-05-22 07:22:19 +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 |
|
|
kaniini
|
ab6e15622b
|
Merge branch 'fix/api-fallback' into 'develop'
Do not fallback to index.html for /api/* routes
Closes #920
See merge request pleroma/pleroma!1182
|
2019-05-22 04:05:41 +00:00 |
|
|
kaniini
|
334ffcb86f
|
Merge branch 'bugfix/dm-being-truncated' into 'develop'
Do not truncate DM when it contains newlines and safe_dm_mentions is set to true
Closes #904
See merge request pleroma/pleroma!1185
|
2019-05-22 04:04:20 +00:00 |
|
|
Sergey Suprunenko
|
9134848170
|
Do not truncate DM when it contains newlines and safe_dm_mentions is set to true
|
2019-05-22 04:04:20 +00:00 |
|
|
William Pitcock
|
045803346d
|
move key generation functions into Pleroma.Keys module
|
2019-05-22 03:58:15 +00:00 |
|
|
William Pitcock
|
a023ca004c
|
prune objects task: use Repo.delete_all()
|
2019-05-22 03:12:48 +00:00 |
|
|
Aaron Tinio
|
f76268135c
|
Fix failing test
|
2019-05-22 07:16:11 +08:00 |
|
|
Aaron Tinio
|
3ab9255eda
|
Respond with a 404 Not implemented JSON error message
when requested API is not implemented
|
2019-05-22 07:15:52 +08:00 |
|
|
Aaron Tinio
|
a13d449b24
|
Add tests for fallback routes
|
2019-05-22 05:39:29 +08:00 |
|
|
William Pitcock
|
f446f94290
|
add changelog entry for object pruning
|
2019-05-21 21:38:56 +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 |
|
|
William Pitcock
|
73df9d690d
|
object: fetcher: add support for reinjecting pruned objects
|
2019-05-21 21:38:56 +00:00 |
|
|
William Pitcock
|
c2b0b82e6a
|
object: add Object.prune()
|
2019-05-21 21:38:56 +00:00 |
|
|
lain
|
d378b342ba
|
MongooseIM: Add documentation.
|
2019-05-21 18:57:36 +02:00 |
|
|
kaniini
|
be6b57193a
|
Merge branch 'trivial/increase-hackney-timeouts' into 'develop'
http: bump connection timeout to 10 seconds
See merge request pleroma/pleroma!1183
|
2019-05-21 05:15:29 +00:00 |
|
|
William Pitcock
|
c972d0bb14
|
http: bump connection timeout to 10 seconds
|
2019-05-21 04:59:15 +00:00 |
|
|
kaniini
|
94caca924d
|
Merge branch 'fix/prometheus-ecto-error-when-not-configured' into 'develop'
Fix prometheus-ecto error when not configured
Closes #917
See merge request pleroma/pleroma!1180
|
2019-05-21 01:36:06 +00:00 |
|
|
kaniini
|
d4847b17ca
|
Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop'
Add virtual :thread_muted? field
Closes #901
See merge request pleroma/pleroma!1178
|
2019-05-20 23:30:19 +00:00 |
|
|
Aaron Tinio
|
f96e9b28bb
|
Fix prometheus-ecto error when not configured
|
2019-05-21 07:30:18 +08:00 |
|
|
Mark Felder
|
75c7bb9289
|
Additional reserved usernames
|
2019-05-20 17:18:59 -05: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 |
|
|
kaniini
|
643b563478
|
Merge branch 'doc/mrf-simple-report-removal' into 'develop'
Document MRF.Simple :report_removal
See merge request pleroma/pleroma!1179
|
2019-05-20 18:16:29 +00:00 |
|
|
Aaron Tinio
|
5aa107d912
|
Document MRF.Simple :report_removal
|
2019-05-21 00:59:12 +08:00 |
|
|
Aaron Tinio
|
eb02edcad9
|
Add virtual :thread_muted? field
that may be set when fetching activities
|
2019-05-21 00:35:46 +08:00 |
|
|
Sadposter
|
daeae8e2e7
|
Move default mascot configuration to config/
|
2019-05-20 16:12:55 +01:00 |
|
|
Sadposter
|
d835810610
|
Add changelog entry for mascot config
|
2019-05-20 14:19:42 +01:00 |
|
|
Sadposter
|
3d0d9e7a56
|
Use string map for default mascot
|
2019-05-20 13:10:04 +01:00 |
|
|
Sadposter
|
dc916ba15f
|
Format mascot tests
|
2019-05-20 12:58:17 +01:00 |
|
|
Sadposter
|
e81f0fc6d4
|
Add mascot get/set tests
|
2019-05-20 12:58:06 +01:00 |
|
|
Sadposter
|
54e9cb5c2d
|
Add API endpoints for a custom user mascot
|
2019-05-20 12:39:23 +01:00 |
|
|
kaniini
|
b30b51c3b7
|
Merge branch 'feature/mrf-simple-report-filtering' into 'develop'
Add report filtering to MRF.SimplePolicy
Closes #610
See merge request pleroma/pleroma!1176
|
2019-05-19 22:30:10 +00:00 |
|