bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
14585 commits 1 branch 0 tags 292 MiB
Commit graph

14585 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alex Gleason
e13f64bd8e
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-05-17 11:19:29 -05:00
marcin mikołajczak
90b31ccfe4 Merge branch 'mastodon-admin-api' into 'develop' 
MastodonAPI.Admin.AccountView: show registration reason

See merge request soapbox-pub/soapbox-be!129
 2022-05-15 21:12:28 +00:00
marcin mikołajczak
7cbca9d18d MastodonAPI.Admin.AccountView: show registration reason 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-05-15 22:52:08 +02:00
marcin mikołajczak
745e1663ac i'm bad at copy-paste 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-05-15 19:15:36 +02: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
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
Alex Gleason
5ae5072c2e Merge branch 'rules-strings' into 'develop' 
Represent rule IDs as strings

See merge request soapbox-pub/soapbox-be!127
 2022-05-02 19:36:45 +00:00
Alex Gleason
5b97fcb566
Represent rule IDs as strings 2022-05-02 14:16:03 -05:00
Alex Gleason
225973e7f3 Merge branch 'soapbox-ui' into 'develop' 
restyle static pages

See merge request soapbox-pub/soapbox-be!126
 2022-04-30 21:28:23 +00:00
marcin mikołajczak
50d3590137 restyle static pages 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-04-30 23:24:25 +02:00
Alex Gleason
5e4d87541c Merge branch 'semver' into 'develop' 
Fix MIX_ENV=prod mix compile

See merge request soapbox-pub/soapbox-be!125
 2022-04-27 18:43:59 +00:00
Alex Gleason
f3e77415cc
Fix MIX_ENV=prod mix compile 2022-04-27 13:42:39 -05:00
Alex Gleason
a94460bb2b Merge branch 'semver' into 'develop' 
Fix semver parsing, add "+soapbox" to instance version

See merge request soapbox-pub/soapbox-be!124
 2022-04-27 18:24:28 +00:00
Alex Gleason
b8dd4c7e3e
Fix semver parsing, add "+soapbox" to instance version 2022-04-27 12:47:21 -05:00
Alex Gleason
9e66daf60a Merge branch 'remove_logger_from_block_notification_policy' into 'develop' 
Remove logger from block notification policy

See merge request soapbox-pub/soapbox-be!123
 2022-04-24 19:47:58 +00:00
NEETzsche
32b096e7ce Remove superfluous invocation of Logger 2022-04-24 13:41:00 -06: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
marcin mikołajczak
23aebb85c9 Merge branch 'status-notification-type' into 'develop' 
Add "status" notification type

See merge request soapbox-pub/soapbox-be!117
 2022-04-14 20:23:21 +00:00
marcin mikołajczak
a0eb48b785 Merge remote-tracking branch 'soapbox/develop' into status-notification-type 2022-04-14 20:15:21 +02: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
Alex Gleason
30ea5e927c Merge branch 'short_description' into 'develop' 
Add short_description field

See merge request soapbox-pub/soapbox-be!121
 2022-03-29 13:19:45 +00:00
marcin mikołajczak
6500965fb3 Add short_description field 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-29 14:01:03 +02:00
Alex Gleason
9cbd2406cc Merge branch 'feed-routes' into 'develop' 
Add /@:nickname route, redirect /users/:nickname.rss to /users/:nickname/feed.rss instead of .atom

See merge request soapbox-pub/soapbox-be!120
 2022-03-28 21:58:48 +00:00
marcin mikołajczak
ae2646453b Add /@:nickname route, redirect /users/:nickname.rss to /users/:nickname/feed.rss instead of .atom 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-28 22:26:55 +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
marcin mikołajczak
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
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
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
Alex Gleason
d7cbaedc86 Merge branch 'fix-attachments' into 'develop' 
StatusController: deleting a status returns the original media IDs

See merge request soapbox-pub/soapbox-be!114
 2022-03-17 18:58:19 +00:00
Alex Gleason
552525e954 Merge branch 'notification-types' into 'develop' 
MastoAPI: Use `types` for filtering notifications

See merge request soapbox-pub/soapbox-be!113
 2022-03-17 18:57:49 +00:00
Alex Gleason
2a73047406 Merge branch 'remove-from-followers' into 'develop' 
MastoAPI: POST /api/v1/accounts/:id/remove_from_followers

See merge request soapbox-pub/soapbox-be!112
 2022-03-17 18:57:07 +00:00
Alex Gleason
1dad6fa107 Merge branch 'landing-fe' into 'develop' 
Landing FE

See merge request soapbox-pub/soapbox-be!115
 2022-03-17 18:29:38 +00:00
Alex Gleason
fc7d39fc0c
Fix tests 2022-03-17 13:15:23 -05:00
Alex Gleason
3e6cf43ec8
Add landing-fe, remove Soapbox FE build 2022-03-17 13:03:41 -05:00
Alex Gleason
a6598128ca
StatusController: deleting a status returns the original media IDs 2022-03-16 18:13:35 -05:00
marcin mikołajczak
f572a416e7 Use types for filtering notifications 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-16 21:16:03 +01:00
marcin mikołajczak
eb35a54ab8 Use reject_follow_request 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-16 19:15:58 +01:00
marcin mikołajczak
8157013f0b POST /api/v1/accounts/:id/remove_from_followers 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-16 16:52:09 +01:00
Alex Gleason
66b13c1dba Merge branch 'FIX-cheatsheet-typo' into 'develop' 
fixing a typo for user_location_length

See merge request soapbox-pub/soapbox-be!111
 2022-03-15 17:22:14 +00:00
Kenneth Zhao
2eaf054ef1 fixing a typo for user_location_length 2022-03-15 08:40:40 -07:00
Alex Gleason
b0b8c89b9a Merge branch 'profile-location' into 'develop' 
Support account "location" field

Closes #67

See merge request soapbox-pub/soapbox-be!110
 2022-03-15 13:22:31 +00:00