Haelwenn
|
b2ba307f4d
|
Merge branch 'from/upstream-develop/tusooa/2871-fix-local-public' into 'develop'
local only fixes
Closes #2871
See merge request pleroma/pleroma!3660
|
2022-08-02 05:39:50 +00:00 |
|
marcin mikołajczak
|
5d3d6a58f7
|
Use duration param for mute expiration duration
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-07-31 17:22:34 +02:00 |
|
Haelwenn
|
0f9f3d2897
|
Merge branch 'from/upstream-develop/tusooa/2384-pagination' into 'develop'
Make mutes and blocks behave the same as other lists
Closes #2384
See merge request pleroma/pleroma!3693
|
2022-07-28 04:37:10 +00:00 |
|
tusooa
|
301ce5bc62
|
Merge branch 'mute-expiration' into 'develop'
MastoAPI: Show mutes expiration date
See merge request pleroma/pleroma!3682
|
2022-07-23 00:34:15 +00:00 |
|
tusooa
|
8aba7c08d1
|
Merge branch 'notification_types' into 'develop'
MastoAPI: Use `types` for filtering notifications
See merge request pleroma/pleroma!3648
|
2022-07-17 03:17:43 +00:00 |
|
tusooa
|
fdc71f6051
|
Merge branch 'short-description' into 'develop'
Add short_description instance field
Closes #2865
See merge request pleroma/pleroma!3651
|
2022-07-13 04:42:24 +00:00 |
|
Tusooa Zhu
|
c1874bc8f9
|
Make mutes and blocks behave the same as other lists
|
2022-07-12 19:03:18 -04:00 |
|
Haelwenn
|
6b937d1473
|
Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop'
Server announcements (1st pass)
See merge request pleroma/pleroma!3643
|
2022-07-03 20:58:20 +00:00 |
|
marcin mikołajczak
|
b0f83aea29
|
Store mutes expiration date
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-06-16 20:38:37 +02:00 |
|
Tusooa Zhu
|
c48be59f58
|
Show local-only statuses in public timeline for authenticated users
Ref: fix-local-public
|
2022-05-06 13:54:02 -04:00 |
|
Tusooa Zhu
|
7d1dae3bef
|
Restrict mastodon api announcements to logged-in users only
|
2022-04-02 02:25:13 -04:00 |
|
marcin mikołajczak
|
fbf9eced11
|
Add short_description field
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-03-29 14:04:27 +02:00 |
|
Haelwenn
|
d7c53da77a
|
Merge branch 'from/upstream-develop/tusooa/translate-pages' into 'develop'
Translate backend-rendered pages
See merge request pleroma/pleroma!3634
|
2022-03-20 18:14:37 +00: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 |
|
Tusooa Zhu
|
881179ec72
|
Remove GET /api/v1/announcements/:id
|
2022-03-08 19:22:28 -05:00 |
|
Tusooa Zhu
|
d569694ae9
|
Show only visible announcements in MastodonAPI
|
2022-03-08 19:20:29 -05:00 |
|
Tusooa Zhu
|
009817c9ee
|
Correct docstring for AnnouncementController.show
|
2022-03-08 17:00:49 -05:00 |
|
Tusooa Zhu
|
2b39b36e49
|
Implement POST /api/v1/announcements/:id/dismiss
|
2022-03-08 16:59:20 -05:00 |
|
Tusooa Zhu
|
aa1fff279e
|
Implement GET /api/v1/announcements/:id
|
2022-03-08 16:19:35 -05:00 |
|
Tusooa Zhu
|
5169ad8f14
|
Implement announcement read relationships
|
2022-03-08 13:09:49 -05:00 |
|
Tusooa Zhu
|
e644f8dea5
|
Allow user to register with custom language
|
2022-03-02 01:41:13 -05:00 |
|
Tusooa Zhu
|
396f036b13
|
Allow update_credentials to update User.language
|
2022-03-02 00:58:02 -05:00 |
|
Sean King
|
17aa3644be
|
Copyright bump for 2022
|
2022-02-25 23:11:42 -07:00 |
|
marcin mikołajczak
|
e473bcf7a0
|
Max media attachment count
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-06 17:41:15 +01:00 |
|
marcin mikołajczak
|
ab12a05a43
|
AccountView: Add test for show_birthday
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-25 17:34:36 +01:00 |
|
marcin mikołajczak
|
c1ae35ff2c
|
Fix show_birthday
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-25 17:04:41 +01: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 |
|
Alex Gleason
|
aaa9314f4c
|
Merge remote-tracking branch 'origin/develop' into birth-dates
|
2022-01-22 14:24:50 -06:00 |
|
Alex Gleason
|
66e8c6f90f
|
Birthdays: birth_date --> birthday
|
2022-01-22 13:21:55 -06:00 |
|
marcin mikołajczak
|
74cf0f0355
|
Update changelog
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-19 23:52:46 +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 |
|
|
6284353025
|
Add blockers_visible to features list when it's enabled
|
2022-01-14 23:08:33 +00: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
|
4f249b2397
|
Merge remote-tracking branch 'origin/develop' into account-endorsements
|
2022-01-10 20:04:14 +01:00 |
|
marcin mikołajczak
|
1657db656c
|
AccountController.lookup: skip auth
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-28 20:02:59 +01:00 |
|
marcin mikołajczak
|
0dd1caa841
|
AccountController.lookup: skip visibility check
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-28 18:24:48 +01:00 |
|
marcin mikołajczak
|
9032d065e6
|
wip
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-28 18:07:19 +01:00 |
|
marcin mikołajczak
|
746c9daa62
|
Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-28 16:27:27 +01:00 |
|
marcin mikołajczak
|
f734579965
|
MastoAPI: Add GET /api/v1/accounts/lookup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-28 16:11:17 +01:00 |
|
Alex Gleason
|
7704a722c0
|
AppController: remove unnecessary require Logger
|
2021-12-27 18:30:16 -06:00 |
|
Alex Gleason
|
2e4a1c56c3
|
AppController: test creating with and without a user
|
2021-12-27 18:14:15 -06:00 |
|
Alex Gleason
|
f5c3d45120
|
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
|
2021-12-27 18:01:25 -06:00 |
|
|
1c223331fc
|
API: show info about privileged staff in instance metadata
|
2021-12-27 02:28:09 +03:00 |
|
marcin mikołajczak
|
de006443f0
|
MastoAPI: Profile directory
|
2021-12-26 02:35:17 +00:00 |
|
Alex Gleason
|
73609211a4
|
Merge branch 'account-notes' into 'develop'
MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540
|
2021-12-25 01:41:12 +00:00 |
|
Alex Gleason
|
b96a58ff28
|
Merge branch 'account-subscriptions' into 'develop'
MastoAPI: accept notify param in follow request
See merge request pleroma/pleroma!3555
|
2021-12-25 01:34:27 +00:00 |
|
Alex Gleason
|
50892a198d
|
Merge branch 'mkljczk-develop-patch-64464' into 'develop'
Add "exposable_reactions" to features, if showing reactions
See merge request pleroma/pleroma!3523
|
2021-12-19 18:51:41 +00:00 |
|