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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
3d0d9e7a56
|
Use string map for default mascot
|
2019-05-20 13:10:04 +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 |
|
Aaron Tinio
|
2375e9a95b
|
Add report filtering to MRF.SimplePolicy
|
2019-05-20 06:02:50 +08:00 |
|
rinpatch
|
8e9a764dfc
|
Merge branch 'feature/mrf-always-nsfw' into 'develop'
suppress link previews from posts marked sensitive
Closes #865
See merge request pleroma/pleroma!1173
|
2019-05-18 07:13:18 +00:00 |
|
William Pitcock
|
c4a55e167a
|
add Changelog entry
|
2019-05-17 23:00:14 +00:00 |
|
William Pitcock
|
dc08159538
|
also suppress link previews from posts marked #nsfw
|
2019-05-17 22:13:24 +00:00 |
|
William Pitcock
|
290f5b2cfe
|
config: make sending the user agent configurable, disable sending the user agent in tests
|
2019-05-17 20:28:58 +00:00 |
|
William Pitcock
|
d3b8cd342f
|
http: request builder: send user-agent when making requests
|
2019-05-17 19:04:17 +00:00 |
|
William Pitcock
|
0da1233e8e
|
rich media: suppress link previews if post is marked as sensitive
|
2019-05-17 18:49:43 +00:00 |
|
William Pitcock
|
78588dbd80
|
mrf: simple policy: mark all posts instead of posts with media as sensitive if they match media_nsfw
|
2019-05-17 18:49:10 +00:00 |
|
lain
|
075eecec90
|
Linting.
|
2019-05-17 18:32:30 +02:00 |
|
lain
|
f959bf7aa6
|
MongooseIM: Add basic integration endpoints.
|
2019-05-17 18:21:11 +02:00 |
|
lain
|
412a3d8a0f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
|
2019-05-17 12:26:59 +02:00 |
|
lambda
|
e5b34f5e05
|
Merge branch 'ecto_sql_update' into 'develop'
Dependencies: Update Ecto SQL.
See merge request pleroma/pleroma!1160
|
2019-05-17 10:21:38 +00:00 |
|
lambda
|
1dcdcd8871
|
Merge branch 'bugfix/903-mastoapi-relationship-requested' into 'develop'
MastoAPI account_view.ex: requested is false when following is true
Closes #903
See merge request pleroma/pleroma!1169
|
2019-05-17 10:07:51 +00:00 |
|
lambda
|
46684db84d
|
Update account_view.ex
|
2019-05-17 09:53:44 +00:00 |
|
lain
|
249b31ffe5
|
Fix specs.
|
2019-05-17 11:49:13 +02:00 |
|
Alexander Strizhakov
|
7ed682213f
|
Fix/902 random compile failing
|
2019-05-17 07:25:20 +00:00 |
|
Haelwenn (lanodan) Monnier
|
68c75a08e8
|
MastoAPI account_view.ex: requested is false when following is true
Closes: https://git.pleroma.social/pleroma/pleroma/issues/903
|
2019-05-17 07:44:09 +02:00 |
|
Aaron Tinio
|
70235ce840
|
Fix typo: s/"tags"/"tag"/g
|
2019-05-17 09:02:34 +08: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
|
2c303afc8b
|
Remove duplicated entries in users' following lists
|
2019-05-16 20:04:08 +00:00 |
|
Sergey Suprunenko
|
e2b3a27204
|
Add Reports to Admin API
|
2019-05-16 19:09:18 +00:00 |
|
|
|
e190b3022b
|
Merge branch 'fix/domain-unblocked-reblogs' into 'develop'
Fix domain-unblocked reblogs
Closes #892
See merge request pleroma/pleroma!1157
|
2019-05-16 18:57:14 +00:00 |
|
Mark Felder
|
ebb0482116
|
Merge branch 'develop' into conversations-import
|
2019-05-16 13:11:17 -05:00 |
|
lambda
|
fde30aee43
|
Merge branch 'feature/sql-thread-sat' into 'develop'
SQL thread visibility solver
See merge request pleroma/pleroma!971
|
2019-05-16 13:44:22 +00:00 |
|
Alexander Strizhakov
|
73ae58fdfa
|
Feature/896 toggling confirmation
|
2019-05-16 13:23:41 +00: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 |
|
