lain
|
5b39526198
|
AccountController: Use code 400 for self-follow.
|
2020-04-22 15:04:26 +02:00 |
|
lain
|
3c828016d9
|
Merge branch 'openapi/custom-emojis' into 'develop'
Add OpenAPI spec for CustomEmojiController
See merge request pleroma/pleroma!2375
|
2020-04-21 10:13:50 +00:00 |
|
lain
|
28165dad3a
|
Merge branch 'cleanup-subscription-controller' into 'develop'
Cleanup SubscriptionController
See merge request pleroma/pleroma!2393
|
2020-04-20 13:01:17 +00:00 |
|
Haelwenn
|
a17bfb5fab
|
Merge branch 'feature/1584-client-captcha-options' into 'develop'
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
|
2020-04-17 09:19:35 +00:00 |
|
rinpatch
|
badd888ccb
|
Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
Enforcement of OAuth scopes check for authenticated API endpoints
See merge request pleroma/pleroma!2349
|
2020-04-16 21:58:57 +00:00 |
|
rinpatch
|
942d7467ca
|
Merge branch 'develop' into features/remove-user-source_data
|
2020-04-16 21:28:52 +03:00 |
|
Egor Kislitsyn
|
cf4ebba774
|
Cleanup SubscriptionController
|
2020-04-15 23:14:47 +04:00 |
|
Ivan Tashkinov
|
bedf92e064
|
Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
|
2020-04-15 19:20:34 +03:00 |
|
Egor Kislitsyn
|
4dca712e90
|
Add OpenAPI spec for DomainBlockController
|
2020-04-13 22:44:52 +04:00 |
|
Egor Kislitsyn
|
c28aaf9d82
|
Add OpenAPI spec for CustomEmojiController
|
2020-04-13 21:21:04 +04:00 |
|
Ivan Tashkinov
|
a21baf89d8
|
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
|
2020-04-13 09:16:51 +03:00 |
|
Haelwenn (lanodan) Monnier
|
9172d719cc
|
profile emojis in User.emoji instead of source_data
|
2020-04-10 06:20:02 +02:00 |
|
Egor Kislitsyn
|
d545b883eb
|
Add /api/v1/notifications/:id/dismiss endpoint
|
2020-04-09 17:08:43 +04:00 |
|
lain
|
d2e21fbc96
|
Merge branch 'open-api' into 'develop'
Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345
|
2020-04-09 09:48:56 +00:00 |
|
lain
|
349b9d86dc
|
Merge branch 'remake-remodel-2' into 'develop'
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
|
2020-04-06 11:59:01 +00:00 |
|
Ivan Tashkinov
|
fc81e5a49c
|
Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).
|
2020-04-06 10:20:44 +03:00 |
|
Egor Kislitsyn
|
23219e6fb3
|
Add OpenAPI
|
2020-04-01 23:13:08 +04:00 |
|
Ivan Tashkinov
|
2f2bd7fe72
|
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
|
2020-04-01 19:49:09 +03:00 |
|
Ivan Tashkinov
|
012d428e1f
|
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
|
2020-03-25 09:05:17 +03:00 |
|
Ivan Tashkinov
|
e743c22329
|
Fixed incorrect usage of "relations" as a short form of "relationships".
|
2020-03-25 09:04:00 +03:00 |
|
lain
|
1d75d0ed7a
|
Merge branch 'admin-api-change-password' into 'develop'
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
|
2020-03-24 17:34:13 +00:00 |
|
Alexander Strizhakov
|
a6ee6784bc
|
creating trusted app from adminFE & mix task
|
2020-03-23 10:44:47 +03:00 |
|
Alexander Strizhakov
|
fe15f0ba15
|
restrict_unauthenticated setting
|
2020-03-20 16:36:20 +03:00 |
|
lain
|
3c2c32b460
|
Merge branch 'remake-remodel' into develop
|
2020-03-19 18:00:55 +01:00 |
|
eugenijm
|
13cce9c0de
|
Admin API: PATCH /api/pleroma/admin/users/:nickname/credentials, GET /api/pleroma/admin/users/:nickname/credentials.
|
2020-03-16 20:42:37 +03:00 |
|
rinpatch
|
38f796a5c6
|
Merge branch 'feature/mastofe-admin-scope' into 'develop'
auth_controller.ex: Add admin scope to MastoFE
See merge request pleroma/pleroma!2256
|
2020-03-13 18:58:52 +00:00 |
|
|
|
2019f3b3ff
|
Merge branch 'fix/signup-without-email' into 'develop'
Allow account registration without an email
See merge request pleroma/pleroma!2246
|
2020-03-11 16:53:05 +00:00 |
|
lain
|
4bce13fa2f
|
MastodonController: Return 404 errors correctly.
|
2020-03-04 18:09:06 +01:00 |
|
Mark Felder
|
05da5f5cca
|
Update Copyrights
|
2020-03-03 16:44:49 -06:00 |
|
Egor Kislitsyn
|
4a45b96a91
|
Merge branch 'develop' into fix/signup-without-email
|
2020-03-02 15:35:49 +04:00 |
|
Haelwenn (lanodan) Monnier
|
6da6540036
|
Bump copyright years of files changed after 2020-01-07
Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
|
2020-03-02 06:08:45 +01:00 |
|
rinpatch
|
b5465bf385
|
timeline controller: add a TODO for replacing copypaste with a macro
|
2020-03-01 02:03:46 +03:00 |
|
rinpatch
|
ffcebe7e22
|
timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user
|
2020-03-01 01:13:08 +03:00 |
|
Haelwenn (lanodan) Monnier
|
3ef2ff3e47
|
auth_controller.ex: Add admin scope to MastoFE
Related: https://git.pleroma.social/pleroma/pleroma/issues/1265
|
2020-02-29 01:25:14 +01:00 |
|
Egor Kislitsyn
|
f446744a6a
|
Allow account registration without an email
|
2020-02-26 20:13:53 +04:00 |
|
Maksim Pechnikov
|
21a2a05407
|
Merge branch 'develop' into issue/1383
|
2020-01-28 20:39:20 +03:00 |
|
|
|
dabd535e43
|
Remove user recommendation by third party engine
|
2020-01-27 13:21:50 +00:00 |
|
Maksim Pechnikov
|
8589632d09
|
fixed delete ScheduledActivity
|
2020-01-23 17:18:23 +03:00 |
|
Maksim Pechnikov
|
b8d5c09f48
|
Merge branch 'develop' into issue/1383
|
2020-01-22 09:30:30 +03:00 |
|
Maksim Pechnikov
|
6e88a7e591
|
exclude blocked user posts from search results
|
2020-01-21 07:40:13 +03:00 |
|
lain
|
6a716e3fe5
|
Merge branch 'credo/version-bump-1.1.5' into 'develop'
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
|
2020-01-20 14:42:43 +00:00 |
|
Haelwenn
|
e8759cb5ba
|
Merge branch 'hashtag-benchmarks' into 'develop'
Hashtag benchmarks
See merge request pleroma/pleroma!2116
|
2020-01-20 11:26:07 +00:00 |
|
Haelwenn (lanodan) Monnier
|
5c533e10e7
|
Bump credo to 1.1.5
|
2020-01-20 12:17:14 +01:00 |
|
lain
|
2ee6754095
|
Mix Tasks: Add pleroma.benchmarks.tags
|
2020-01-14 17:24:26 +01:00 |
|
Egor Kislitsyn
|
34d85f8a54
|
Return 404 if account to filter notifications from is not found
|
2019-12-19 20:45:44 +07:00 |
|
Maksim Pechnikov
|
67cb46e15d
|
Merge branch 'develop' into issue/1383
|
2019-12-14 21:44:10 +03:00 |
|
Mark Felder
|
9ef912aecf
|
Merge branch 'develop' into issue/1411
|
2019-12-11 15:02:53 -06:00 |
|
|
|
701815e64c
|
[ActivityPub] Configurable ActivityPub actor type
|
2019-12-10 13:19:26 +00:00 |
|
Maksim Pechnikov
|
5876a9cb79
|
Merge branch 'develop' into issue/1383
|
2019-12-08 19:52:46 +03:00 |
|
lain
|
e8cee4d9a0
|
ActivityPub: For user timelines, respects blocks.
Unless the timeline belongs to a blocked user.
|
2019-12-06 14:25:13 +01:00 |
|
