lain
|
e853cfe7c3
|
Revert "Merge branch 'copyright-bump' into 'develop'"
This reverts merge request !3825
|
2023-01-02 20:38:50 +00:00 |
|
marcin mikołajczak
|
10886eeaa2
|
Bump copyright year
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2023-01-01 12:13:06 +01:00 |
|
Haelwenn
|
e40c221c31
|
Merge branch 'from/upstream-develop/tusooa/edits' into 'develop'
Editing
Closes #1429, #2859, and #2288
See merge request pleroma/pleroma!3678
|
2022-09-03 02:16:42 +00:00 |
|
Tusooa Zhu
|
532f6ae3ed
|
Return update notification in mastodon api
|
2022-06-05 16:34:42 -04:00 |
|
marcin mikołajczak
|
31ff467eff
|
Use `types` for filtering notifications
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-03-16 21:15:44 +01:00 |
|
Sean King
|
17aa3644be
|
Copyright bump for 2022
|
2022-02-25 23:11:42 -07:00 |
|
Alex Gleason
|
0114754db2
|
MastodonAPI: Support poll notification
|
2021-07-17 22:19:38 -05:00 |
|
Haelwenn (lanodan) Monnier
|
c4439c630f
|
Bump Copyright to 2021
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'
|
2021-01-13 07:49:50 +01:00 |
|
Alexander Strizhakov
|
9f4fe5485b
|
alias alphabetically order
|
2020-10-13 16:43:59 +03:00 |
|
Alexander Strizhakov
|
a6d8cef33e
|
OAuthScopesPlug module name
|
2020-10-13 16:43:54 +03:00 |
|
lain
|
127ccc4e1c
|
NotificationController: Don't return chat_mentions by default.
|
2020-06-02 14:05:53 +02:00 |
|
Ivan Tashkinov
|
14a49a0483
|
[#2456] Dropped support for embedded `pleroma/account/relationship` in statuses and notifications.
|
2020-05-09 18:05:44 +03:00 |
|
Egor Kislitsyn
|
d08c63500b
|
Ignore unexpected query params
|
2020-05-04 20:16:44 +04:00 |
|
Egor Kislitsyn
|
9c1adb35de
|
Merge branch 'develop' into openapi/notifications
|
2020-04-30 13:52:07 +04:00 |
|
Egor Kislitsyn
|
5238ae3dd3
|
Add OpenAPI spec for NotificationController
|
2020-04-28 21:27:54 +04:00 |
|
Ivan Tashkinov
|
f685cbd309
|
Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
|
2020-04-21 16:29:19 +03: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 |
|
Egor Kislitsyn
|
d545b883eb
|
Add `/api/v1/notifications/:id/dismiss` endpoint
|
2020-04-09 17:08:43 +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 |
|
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 |
|
Egor Kislitsyn
|
34d85f8a54
|
Return 404 if account to filter notifications from is not found
|
2019-12-19 20:45:44 +07:00 |
|
Ivan Tashkinov
|
b93856874d
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
2019-10-06 17:12:17 +03:00 |
|
Ivan Tashkinov
|
64095961fe
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
2019-10-02 20:42:40 +03:00 |
|
Egor Kislitsyn
|
a66a7a328f
|
Extract notification actions from `MastodonAPIController` into `NotificationController`
|
2019-09-24 15:16:44 +07:00 |