|
|
a0eb48b785
|
Merge remote-tracking branch 'soapbox/develop' into status-notification-type
|
2022-04-14 20:15:21 +02:00 |
|
Alex Gleason
|
fc25b626da
|
Merge branch 'merge-upstream' into 'develop'
Merge upstream
See merge request soapbox-pub/soapbox-be!108
|
2022-03-23 20:37:40 +00:00 |
|
|
|
7bc95acca0
|
Add "status" notification type
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-03-22 20:29:28 +01:00 |
|
|
|
4c56e0fceb
|
Support account location field
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-03-14 22:41:33 +01:00 |
|
Alex Gleason
|
b56b0fb4e9
|
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
|
2022-03-09 16:34:57 -06:00 |
|
Sean King
|
17aa3644be
|
Copyright bump for 2022
|
2022-02-25 23:11:42 -07:00 |
|
|
|
c8fc411b77
|
Add index for assigned_account
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-25 17:15:46 +01:00 |
|
|
|
6d18e6595c
|
Instance rules
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-05 18:07:04 +01:00 |
|
Alex Gleason
|
dde02e9806
|
Merge remote-tracking branch 'pleroma/quote-post' into merge-upstream
|
2022-01-28 17:53:56 -06:00 |
|
Alex Gleason
|
4883b996ad
|
Actually, don't send _misskey_quote anymore
|
2022-01-28 17:53:19 -06:00 |
|
Alex Gleason
|
281ccab704
|
Merge remote-tracking branch 'pleroma/quote-post' into merge-upstream
|
2022-01-28 16:21:37 -06:00 |
|
Alex Gleason
|
b73a53ec69
|
Handle Fedibird's new quoteUri field
|
2022-01-28 15:55:52 -06:00 |
|
Alex Gleason
|
ac3426cbca
|
Transmogrifier: federate quotes with _misskey_quote field
|
2022-01-28 14:06:32 -06:00 |
|
Alex Gleason
|
93a340668f
|
Merge remote-tracking branch 'origin/develop' into quote-post
|
2022-01-25 11:57:04 -06:00 |
|
Alex Gleason
|
0f4e0e667e
|
Merge branch 'recipients-inline' into 'develop'
ForceMentionsInContent: wrap mentions in a span, fix the formatting
See merge request pleroma/pleroma!3620
|
2022-01-25 17:43:39 +00:00 |
|
Alex Gleason
|
25786c804b
|
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
|
2022-01-25 09:39:25 -06:00 |
|
|
|
249fe88d12
|
Birthdays: users_birthday_month_day_index
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-25 11:49:42 +01:00 |
|
Alex Gleason
|
6bc109b31d
|
Merge remote-tracking branch 'pleroma/recipients-inline' into recipients-inline
|
2022-01-24 20:20:04 -06:00 |
|
Alex Gleason
|
d5644a52aa
|
ForceMentionsInContent: wrap inline mentions with span tag
|
2022-01-24 19:11:45 -06:00 |
|
Alex Gleason
|
51dd5a6e21
|
Merge remote-tracking branch 'pleroma/quote-post' into quote-improvements
|
2022-01-24 17:18:30 -06:00 |
|
Alex Gleason
|
cd9341dbff
|
Scrubber.Default: allow span.quote-inline for quote post compatibility
|
2022-01-24 15:34:23 -06:00 |
|
Alex Gleason
|
683f96da00
|
Merge remote-tracking branch 'pleroma/quote-post' into quote-post
|
2022-01-23 16:10:36 -06:00 |
|
|
|
61bae9a407
|
Create index for show_birthday
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-01-23 12:07:05 +01:00 |
|
|
|
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
|
4f51c41f9f
|
@context: add quoteUrl
|
2022-01-22 23:29:55 -06: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 |
|
Alex Gleason
|
64f48c4239
|
Merge remote-tracking branch 'pleroma/develop' into next
|
2022-01-22 11:24:43 -06:00 |
|
|
|
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 |
|
Alex Gleason
|
a4436bcc3f
|
Merge remote-tracking branch 'origin/stable' into mergeback
|
2022-01-14 12:37:00 -06:00 |
|
rinpatch
|
a98a127718
|
Pleroma-FE bundle: update to b13d8f7e6339e877a38a28008630dc8ec64abcdf
|
2022-01-11 13:49:06 +03:00 |
|
Ivan Tashkinov
|
a7bdefc208
|
mix format
|
2021-12-29 11:44:33 +03:00 |
|
Ivan Tashkinov
|
0c7fb520bf
|
Added index on [:target_id, :relationship_type] to :user_relationships (speeds up Notification.exclude_blockers/_).
|
2021-12-29 11:41:21 +03:00 |
|
Alex Gleason
|
fa35e24a5e
|
Apps: add user_id index
|
2021-12-27 18:05:35 -06:00 |
|
Alex Gleason
|
f5c3d45120
|
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
|
2021-12-27 18:01:25 -06:00 |
|
Alex Gleason
|
b41631f62c
|
Merge remote-tracking branch 'pleroma/develop' into next
|
2021-12-25 21:24:21 -06: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
|
1ff9ffed83
|
Merge branch 'live-dashboard' into 'develop'
Add Phoenix LiveDashboard
See merge request pleroma/pleroma!3566
|
2021-12-19 17:35:14 +00:00 |
|
Alex Gleason
|
bd853199d9
|
Merge branch 'v2-suggestions' into 'develop'
V2 suggestions
See merge request pleroma/pleroma!3547
|
2021-12-19 17:31:17 +00:00 |
|
Alex Gleason
|
58577d89e0
|
Merge remote-tracking branch 'origin/develop' into live-dashboard
|
2021-12-15 19:06:10 -05:00 |
|
Alex Gleason
|
e1b89fe3aa
|
Merge remote-tracking branch 'origin/develop' into live-dashboard
|
2021-12-15 19:05:36 -05:00 |
|
Alex Gleason
|
29d80b39f2
|
Add Phoenix LiveDashboard
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
|
2021-12-15 19:05:27 -05:00 |
|
NEETzsche
|
182c563ed0
|
Force pinned_objects to be empty, not null
|
2021-11-29 18:08:09 +00:00 |
|
Alex Gleason
|
a43b8f8bb0
|
Merge remote-tracking branch 'origin/develop' into v2-suggestions
|
2021-11-26 22:47:05 -06:00 |
|
Alex Gleason
|
da06e1a17f
|
v2 Suggestions: add index on is_suggested column
|
2021-11-26 15:32:01 -06:00 |
|
Alex Gleason
|
b17360cd7c
|
v2 Suggestions: rudimentary API response
|
2021-11-26 14:34:10 -06:00 |
|
NEETzsche
|
929e60122f
|
Force pinned_objects to be empty, not null
|
2021-11-25 16:34:48 +00:00 |
|
|
|
8e040e098b
|
Lint
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-21 18:17:06 +01:00 |
|
|
|
40414bf177
|
MastoAPI: Add user notes on accounts
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-21 16:56:26 +01:00 |
|
