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

15,284 commits

This branch
This branch
All branches
Author SHA1 Message Date
duponin
5086d6d5e9 add thread show in BBS frontend 2022-05-19 00:56:20 +02:00
Hélène
a74ce2d77a
 		StealEmojiPolicy: fix String rejected_shortcodes 
* rejected_shortcodes is defined as a list of strings in the
  configuration description. As such, database-based configuration was
  led to handle those settings as strings, and not as the actually
  expected type, Regex.
* This caused each message passing through this MRF, if a rejected
  shortcode was set and the emoji did not exist already on the instance,
  to fail federating, as an exception was raised, swiftly caught and
  mostly silenced.
* This commit fixes the issue by introducing new behavior: strings are
  now handled as perfect matches for an emoji shortcode (meaning that if
  the emoji-to-be-pulled's shortcode is in the blacklist, it will be
  rejected), while still supporting Regex types as before.
 2022-05-18 21:25:10 +02:00
duponin
39c47073a3 fix Ctrl-c catch on SSH BBS 2022-05-18 20:06:16 +02:00
duponin
e606b9ab3f add missing extra application to start the SSH BBS 2022-05-18 20:05:42 +02:00
lewdthewides
7977dd6ac7 Instruct users to run 'git pull' as the pleroma user 2022-05-12 16:02:58 +00:00
Tusooa Zhu
f1722a9f4a
 		Make lint happy 
Ref: fix-local-public
 2022-05-09 18:53:32 -04:00
Tusooa Zhu
6e5ef7f2eb
 		Test local-only in ap c2s outbox 
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
Haelwenn
4605efe272 Merge branch 'improve_anti_followbot_policy' into 'develop' 
Also use actor_type to determine if an account is a bot in antiFollowbotPolicy

Closes #2561

See merge request pleroma/pleroma!3498
 2022-05-08 18:10:40 +00:00
Ilja
a8093732bd Also use actor_type to determine if an account is a bot in antiFollowbotPolicy 2022-05-08 18:10:40 +00:00
Tusooa Zhu
221cb3fb81
 		Allow users to create backups without providing email address 
Ref: backup-without-email
 2022-05-07 00:23:55 -04:00
Pete
aa51fd068b Add index hotspots 
squash
 2022-05-06 18:48:08 -07:00
Tusooa Zhu
fe933b9bf2
 		Prevent remote access of local-only posts via /objects 
Ref: fix-local-public
 2022-05-06 13:54:21 -04:00
Tusooa Zhu
466568ae36
 		Lint 
Ref: fix-local-public
 2022-05-06 13:54:13 -04:00
Tusooa Zhu
826deb7375
 		Make local-only statuses searchable 
Ref: fix-local-public
 2022-05-06 13:54:13 -04:00
Tusooa Zhu
38af42968d
 		Test that anonymous users cannot see local-only posts 
Ref: fix-local-public
 2022-05-06 13:54:12 -04: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
Haelwenn
214ef7ff73 Merge branch 'security/2.4.3-develop' into 'develop' 
Merge back 2.4.3

See merge request pleroma/pleroma!3663
 2022-05-06 08:27:03 +00:00
Haelwenn (lanodan) Monnier
f9943b2065 mix: Bump to 2.4.52 for 2.4.3 mergeback 2022-05-06 10:23:43 +02:00
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