hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
15,365 commits 1 branch 0 tags 221 MiB
Commit graph

15,365 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tusooa Zhu
57c030a0a7 Skip cache when /objects or /activities is authenticated 
Ref: fix-local-public
 2022-05-06 10:23:26 +02:00
Tusooa Zhu
e2d24eda57 Allow to skip cache in Cache plug 
Ref: fix-local-public
 2022-05-06 10:23:26 +02:00
Ilja
c3b2b71ea2 update sweet_xml [Security] 2022-05-06 10:23:25 +02:00
Haelwenn
b22843a982 Merge branch 'security/2.4.3' into 'stable' 
Release: 2.4.3

See merge request pleroma/pleroma!3662
 2022-05-06 08:19:03 +00:00
Haelwenn (lanodan) Monnier
57c486014c Release 2.4.3 2022-05-06 09:01:33 +02:00
Tusooa Zhu
fa3157df96 Skip cache when /objects or /activities is authenticated 
Ref: fix-local-public
 2022-05-06 08:44:03 +02:00
Tusooa Zhu
4d482b765f Allow to skip cache in Cache plug 
Ref: fix-local-public
 2022-05-06 08:39:42 +02:00
Ilja
85cbf773f0 update sweet_xml [Security] 2022-05-06 08:36:58 +02:00
Henry Jameson
46c4d3b80f huuups 2022-04-19 18:17:41 +03:00
Henry Jameson
d08362cb30 hups 2022-04-19 18:17:25 +03:00
Henry Jameson
aa38f1da41 resolve deprecation warnings in conf 2022-04-19 18:16:30 +03:00
Henry Jameson
0613478bdb engage db congfiguration 2022-04-19 17:56:26 +03:00
Henry Jameson
31115e24c0 Merge remote-tracking branch 'origin/develop' into shigusegubu 
* origin/develop: (294 commits)
  Fix incorrect fallback when English is set to first language
  Fix eratic test for POST /api/pleroma/admin/reports/:id/notes
  After code review
  Support fallbacking to other languages
  Delete report notifs when demoting from superuser
  Update Caddyfile to Caddy v2
  Lint
  Support multiple locales from userLanguage cookie
  Support multiple locales formally
  Make lint happy
  Add test for fallbacking to a general language
  Fallback to a variant if the language in general is not supported
  Add changelog
  Document API addition
  Allow user to register with custom language
  Allow update_credentials to update User.language
  Send emails i18n'd using backend-stored user language
  Make all emails translatable
  Fix digest test
  Make mail and mailer translatable
  ...
 2022-04-19 14:27:21 +03:00
Haelwenn
8517bc18aa Merge branch 'from/upstream-develop/tusooa/fix-en-fallback' into 'develop' 
Fix incorrect fallback when English is set to first language

See merge request pleroma/pleroma!3656
 2022-04-18 03:31:44 +00:00
Tusooa Zhu
be08d9305b
 		Fix incorrect fallback when English is set to first language 2022-04-17 22:39:52 -04:00
Tusooa Zhu
6599607226
 		Translate static_pages.po (Simplified Chinese) 2022-04-07 17:42:19 -04:00
Henry Jameson
d860aa32f7 revert to default CSP for testing 2022-04-06 11:16:53 +03:00
Haelwenn
a5d7e98de0 Merge branch 'fix_eratic_test_for_report_notes' into 'develop' 
Fix eratic test for POST /api/pleroma/admin/reports/:id/notes

See merge request pleroma/pleroma!3653
 2022-04-05 12:11:53 +00:00
Ilja
5f37db330f Fix eratic test for POST /api/pleroma/admin/reports/:id/notes 
It retrieved two ReportNotes and then checked one of them. But the order isn't guaranteed, while the test tested on the content of the first ReportNote.

I made the test on the content more generic
 2022-04-05 13:21:09 +02: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
Sean King
4194559ea6
 		Fix lint errors 2022-03-20 17:26:07 -06: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
Haelwenn
e63d49d238 Merge branch 'caddyfile-v2' into 'develop' 
Update Caddyfile to Caddy v2

Closes #2764

See merge request pleroma/pleroma!3641
 2022-03-20 18:14:00 +00:00
Haelwenn
b76340511d Merge branch 'delete_report_notifs_when_demoting_from_superuser' into 'develop' 
Delete report notifs when demoting from superuser

Closes #2840

See merge request pleroma/pleroma!3642
 2022-03-20 18:13:19 +00:00
Sean King
d0c1997d48
 		Rewrite integration-test websocket client with Mint.WebSocket 2022-03-19 23:33:37 -06:00
Tusooa Zhu
0c78ab4a88
 		Use utc_datetime in db schema 2022-03-18 11:17:22 -04:00
Haelwenn (lanodan) Monnier
83338c25a5 Transmogrifier: Use validating regex for "mediaType" 2022-03-17 22:37:26 +01:00
Haelwenn (lanodan) Monnier
030183b35f AttachmentValidator: Use custom ecto type and regex for "mediaType" 2022-03-17 22:37:26 +01:00
Haelwenn (lanodan) Monnier
4ea9886faa EctoType: Add MIME validator 2022-03-17 22:37:26 +01:00
Haelwenn
2db640632b Merge branch 'bugfix/mix-dotgit' into 'develop' 
mix: Check `.git` presence

See merge request pleroma/pleroma!3638
 2022-03-17 21:21:59 +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
marcin mikołajczak
ffe081bf44 Use reject_follow_request 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-16 19:18:15 +01:00
marcin mikołajczak
6754d1f272 POST /api/v1/accounts/:id/remove_from_followers 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-16 16:52:33 +01:00
Tusooa Zhu
ebcda5265b
 		Format announcements into html 2022-03-08 23:00:51 -05:00
Tusooa Zhu
0e0a1758f7
 		Add doc for Admin Announcement APIs 2022-03-08 21:48:41 -05:00
Tusooa Zhu
eb1a29640f
 		Add pagination to AdminAPI.AnnouncementController.index 2022-03-08 21:26:05 -05:00
Tusooa Zhu
11a1996bf5
 		Implement update announcement admin api 2022-03-08 20:55:41 -05: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
cf8334dbc1
 		Add starts_at, ends_at and all_day parameters 2022-03-08 19:12:01 -05:00
Tusooa Zhu
fcf3c9057e
 		Implement visibility filtering for announcements 2022-03-08 18:21:20 -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
c867d23250
 		Fill properties of announcements from Mastodon API spec 2022-03-08 09:35:35 -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
Ilja
cdc5bbe836 After code review 
Use patern matching to see if someone was superuser before
 2022-03-07 14:00:42 +01:00
Haelwenn
4458db3201 Merge branch 'fix_test_get_user_apps' into 'develop' 
Fix test get_user_apps/1

See merge request pleroma/pleroma!3636
 2022-03-06 18:40:49 +00:00