Haelwenn
|
41f2ee69a8
|
Merge branch 'from/upstream-develop/tusooa/backup-status' into 'develop'
Detail backup states
Closes #3024
See merge request pleroma/pleroma!3809
|
2023-06-27 12:08:11 +00:00 |
tusooa
|
c5d946bc92
|
Fix emoji reactions for legacy 2-tuple formats
|
2023-03-26 15:12:40 -04:00 |
Alexander Tumin
|
2c2ea16b50
|
Allow custom emoji reactions: Add pleroma_custom_emoji_reactions feature, review changes
|
2023-03-12 11:39:17 +03:00 |
floatingghost
|
787e30c5fd
|
Allow reacting with remote emoji when they exist on the post (#200)
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/200
|
2023-03-02 11:18:16 +03:00 |
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 |
tusooa
|
070fbb89e1
|
Lint
|
2022-12-24 00:04:51 -05:00 |
tusooa
|
bdd63d2a3a
|
Expose backup status via Pleroma API
|
2022-12-24 00:04:50 -05:00 |
tusooa
|
9874b4c985
|
Merge branch 'develop' into 'from/upstream-develop/tusooa/2892-backup-scope'
# Conflicts:
# CHANGELOG.md
|
2022-09-05 15:00:19 +00:00 |
Tusooa Zhu
|
a7f01ffc1d
|
Make backups require its own scope
|
2022-08-09 00:34:04 -04:00 |
Tusooa Zhu
|
8371fd8ca2
|
Implement settings api
|
2022-07-16 01:20:25 -04:00 |
Sean King
|
17aa3644be
|
Copyright bump for 2022
|
2022-02-25 23:11:42 -07:00 |
marcin mikołajczak
|
0266bc3c96
|
Birthdays: hide_birthday -> show_birthday
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-23 09:13:33 +01:00 |
marcin mikołajczak
|
dfb2808535
|
Birth dates: Add tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-18 23:15:31 +01:00 |
marcin mikołajczak
|
397f67fef8
|
Format code, expose instance configuration related to birth dates
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-18 18:18:38 +01:00 |
marcin mikołajczak
|
b108b05650
|
Birth dates, birthday reminders API, allow instance admins to require minimum age
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-18 14:57:48 +01:00 |
marcin mikołajczak
|
eedf551eed
|
Add more tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-12 22:41:34 +01:00 |
marcin mikołajczak
|
0f90fd5805
|
WIP account endorsements
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-12 18:15:10 +01:00 |
marcin mikołajczak
|
9032d065e6
|
wip
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-28 18:07:19 +01:00 |
Alex Gleason
|
f5c3d45120
|
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
|
2021-12-27 18:01:25 -06:00 |
marcin mikołajczak
|
dff435488d
|
Add link headers in ChatController.index2
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-12 17:43:18 +01:00 |
marcin mikołajczak
|
a9b0027071
|
Account endorsements
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-29 12:44:57 +01:00 |
Sean King
|
d02cf7b0cd
|
Fix lint
|
2021-08-28 18:17:09 -06:00 |
Sean King
|
a14e1c0003
|
Move GET /api/v1/apps to GET /api/v1/pleroma/apps
|
2021-08-28 18:02:36 -06:00 |
Alex Gleason
|
45b7325b9e
|
Refactor skipped plugs into Pleroma.Web functions
Speeds up recompilation by reducing compile cycles
|
2021-06-08 19:15:04 -05:00 |
Alex Gleason
|
7c96c82b5b
|
Merge remote-tracking branch 'pleroma/develop' into cycles-views
|
2021-05-29 12:17:24 -05:00 |
Alex Gleason
|
c9e4200ed2
|
Create real Views for all Controllers
This makes views depend on each other at runtime instead of compile-time
|
2021-05-29 12:15:57 -05:00 |
Egor Kislitsyn
|
92ab72dbbb
|
Update OpenApiSpex dependency
|
2021-03-05 15:51:29 +04:00 |
lain
|
4a9d3a1f28
|
Merge branch 'features/reports-enhancements' into 'develop'
Enhance reports in Pleroma API: index, show
See merge request pleroma/pleroma!3280
|
2021-02-28 16:45:15 +00:00 |
rinpatch
|
2ab9499258
|
OAuthScopesPlug: remove transform_scopes in favor of explicit admin scope definitions
Transforming scopes is no longer necessary since we are dropping
support for accessing admin api without `admin:` prefix in scopes.
|
2021-02-17 21:37:23 +03:00 |
Haelwenn (lanodan) Monnier
|
ff72ce31ca
|
Enhance reports in Pleroma API: index, show
|
2021-02-17 18:46:53 +01:00 |
rinpatch
|
d7ad288c84
|
Chats: Introduce /api/v2/pleroma/chats which implements pagination
Also removes incorrect claim that /api/v1/pleroma/chats supports
pagination and deprecates it.
Closes #2140
|
2021-02-17 16:03:24 +03:00 |
Mark Felder
|
af37a5c51a
|
Also make this maybe_ for consistency
|
2021-02-04 14:33:49 -06:00 |
Mark Felder
|
860b5c7804
|
Change user.deactivated field to user.is_active
|
2021-01-15 11:24:46 -06: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 |
Mark Felder
|
ad79983614
|
Fix URL generated for backup files, try to create a source of truth we can reuse throughout the codebase
|
2021-01-08 17:32:42 -06:00 |
Alex Gleason
|
3342f6a7ef
|
Backups: render ID in API
|
2021-01-07 13:06:22 -06:00 |
lain
|
e1e7e4d379
|
Object: Rework how Object.normalize works
Now it defaults to not fetching, and the option is named.
|
2021-01-04 13:38:31 +01:00 |
lain
|
713612c377
|
Cachex: Make caching provider switchable at runtime.
Defaults to Cachex.
|
2020-12-18 17:44:46 +01:00 |
lain
|
6bb4f4e172
|
Merge branch 'support/2255_posix_errors' into 'develop'
[#2255] added error messages for posix error code
See merge request pleroma/pleroma!3138
|
2020-12-15 15:16:03 +00:00 |
Maksim Pechnikov
|
9c5d1cb9ed
|
fix tests
|
2020-11-18 09:58:51 +03:00 |
Maksim
|
25eb222bed
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-11-18 05:19:01 +00:00 |
Egor Kislitsyn
|
fb41bd1a85
|
Hide reactions from muted and blocked users
|
2020-11-16 22:50:14 +04:00 |
Maksim Pechnikov
|
1830b6aae5
|
added error messages for posix error code
|
2020-11-13 15:21:59 +03:00 |
lain
|
504a829edb
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status
|
2020-11-04 15:38:10 +01:00 |
Egor Kislitsyn
|
ca95cbe0b4
|
Add `with_muted` param to ChatController.index/2
|
2020-11-04 16:40:12 +04:00 |
Egor Kislitsyn
|
be52819a11
|
Hide chats from muted users
|
2020-11-02 17:51:54 +04:00 |
feld
|
38b481d112
|
Merge branch 'feature/account-export' into 'develop'
Add account export
Closes #847
See merge request pleroma/pleroma!2918
|
2020-10-31 17:03:40 +00:00 |
eugenijm
|
8e41baff40
|
Add idempotency_key to the chat_message entity.
|
2020-10-31 05:50:59 +03:00 |
Haelwenn
|
2ca98f2d94
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-10-21 19:40:37 +00:00 |