|
|
55c62d19a8
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-08-03 23:42:48 +02:00 |
|
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 |
|
|
|
cca794e5fe
|
Merge remote-tracking branch 'soapbox/develop' into webhooks
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-07-26 19:12:52 +02:00 |
|
|
|
a8540c3797
|
Merge Pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-07-25 23:51:14 +02: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 |
|
marcin mikołajczak
|
8c537f7b99
|
Merge branch 'quotes-count' into 'develop'
Count and display post quotes
See merge request soapbox-pub/soapbox-be!133
|
2022-07-19 20:02:15 +00:00 |
|
|
|
abe13622e6
|
Merge remote-tracking branch 'pleroma/develop' into merge-pleroma
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-07-17 16:08:26 +02:00 |
|
|
|
597f56b4c4
|
Use :utc_datetime
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-07-16 16:28:22 +02:00 |
|
Haelwenn
|
29f4ab640b
|
Merge branch 'from/upstream-develop/tusooa/report-too-long' into 'develop'
Fix long report notes giving errors on creation
See merge request pleroma/pleroma!3679
|
2022-07-04 05:21:20 +00:00 |
|
Haelwenn
|
eefa981e0a
|
Merge branch 'indexing-hotspots' into 'develop'
Add index hotspots
See merge request pleroma/pleroma!3664
|
2022-07-03 22:01:37 +00:00 |
|
Haelwenn
|
de37583c49
|
Merge branch 'image_description_from_exif_data' into 'develop'
Use EXIF data of image for image description
See merge request pleroma/pleroma!3535
|
2022-07-03 21:14:25 +00: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 |
|
Ilja
|
75ea766824
|
Migration failed when no value for Pleroma.Upload was set
|
2022-07-01 12:15:02 +02:00 |
|
Ilja
|
cc5686bbd6
|
Migration for exiftool filter
Rename to Exiftool.StripLocation
|
2022-07-01 12:15:02 +02:00 |
|
|
|
4a57a65695
|
Mastodon-compatible webhooks
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-06-25 23:26:42 +02:00 |
|
|
|
b0f83aea29
|
Store mutes expiration date
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-06-16 20:38:37 +02:00 |
|
Tusooa Zhu
|
b096fbba1a
|
Fix long report notes giving errors on creation
|
2022-06-02 01:28:39 -04:00 |
|
|
|
cd13b92a3b
|
Add index for quoteUrl
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-05-27 13:52:28 +02:00 |
|
Alex Gleason
|
e13f64bd8e
|
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
|
2022-05-17 11:19:29 -05:00 |
|
Tusooa Zhu
|
f1722a9f4a
|
Make lint happy
Ref: fix-local-public
|
2022-05-09 18:53:32 -04:00 |
|
Tusooa Zhu
|
38444aa92a
|
Allow authenticated users to access local-only posts in MastoAPI
Ref: fix-local-public
|
2022-05-09 18:53:18 -04:00 |
|
Pete
|
aa51fd068b
|
Add index hotspots
squash
|
2022-05-06 18:48:08 -07:00 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
Tusooa Zhu
|
ebcda5265b
|
Format announcements into html
|
2022-03-08 23:00:51 -05:00 |
|
Tusooa Zhu
|
fcf3c9057e
|
Implement visibility filtering for announcements
|
2022-03-08 18:21:20 -05:00 |
|
Tusooa Zhu
|
d7af67012f
|
Implement first pass of announcement admin api
CCBUG: https://git.pleroma.social/pleroma/pleroma/-/issues/2836
CCBUG: https://git.pleroma.social/pleroma/pleroma/-/issues/1470
|
2022-03-08 01:01:27 -05:00 |
|
Tusooa Zhu
|
0149ea4538
|
Send emails i18n'd using backend-stored user language
|
2022-03-01 22:19:13 -05: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
|
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 |
|
|
|
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
|
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 |
|
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
|
bd853199d9
|
Merge branch 'v2-suggestions' into 'develop'
V2 suggestions
See merge request pleroma/pleroma!3547
|
2021-12-19 17:31:17 +00:00 |
|
