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

14530 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
marcin mikołajczak
d76bfd4e89 Location: user_location_length 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-14 22:52:06 +01:00
marcin mikołajczak
4c56e0fceb Support account location field 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-14 22:41:33 +01:00
Alex Gleason
6e0c349936 Merge branch 'status-store-content-type-' into 'develop' 
Store status content mime type in the object

See merge request soapbox-pub/soapbox-be!109
 2022-03-13 19:52:45 +00:00
marcin mikołajczak
212080c3e8 Store status content mime type in the object 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-13 20:20:39 +01:00
Alex Gleason
b56b0fb4e9
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-03-09 16:34:57 -06: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
Haelwenn
ee32e36b01 Merge branch 'copyright-bump-2022' into 'develop' 
Copyright bump for 2022

See merge request pleroma/pleroma!3593
 2022-03-06 18:29:37 +00:00
Alex Gleason
0bd9df7d03 Merge branch 'instance-rules-order' into 'develop' 
Correctly order rules by id/creation date

See merge request soapbox-pub/soapbox-be!107
 2022-03-05 21:12:08 +00:00
marcin mikołajczak
0250367bb5 Correctly order rules by id/creation date 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-05 21:45:38 +01:00
Alex Gleason
db9a31de58 Merge branch 'report-assign-account' into 'develop' 
Allow assigning users to reports

See merge request soapbox-pub/soapbox-be!100
 2022-03-02 18:29:34 +00:00
marcin mikołajczak
97d014552d Update assign_account_operation 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-02 17:21:21 +01:00
marcin mikołajczak
dcdb6a9f97 Merge remote-tracking branch 'soapbox/develop' into report-assign-account 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-02 16:34:13 +01:00
marcin mikołajczak
266ed48d93 add tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-02 15:25:00 +01:00
Alex Gleason
c34b232d80 Merge branch 'report-rules' into 'develop' 
Allow submitting an array of rule_ids to /api/v1/reports

See merge request soapbox-pub/soapbox-be!101
 2022-03-01 23:04:24 +00:00
marcin mikołajczak
4ab4903186 Add tests 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-03-01 23:50:09 +01:00
feld
0b686c6e54 Merge branch 'revert-ee05abe0' into 'develop' 
Revert "Merge branch 'revert/notice-routes' into 'develop'"

See merge request pleroma/pleroma!3639
 2022-03-01 19:02:48 +00:00
feld
9c52a496f7 Revert "Merge branch 'revert/notice-routes' into 'develop'" 
This reverts merge request !3576
 2022-03-01 19:02:28 +00:00
Alex Gleason
cfe4cfe89a Merge branch 'develop' into 'develop' 
use remote_ip repo under gitlab/soapbox/elixir_library in case git.pleroma.social is down

See merge request soapbox-pub/soapbox-be!106
 2022-03-01 04:55:25 +00:00
Kenneth Zhao
cff57ea23b use remote_ip repo under gitlab/soapbox/elixir_library in case git.pleroma.social is down 2022-02-28 20:25:14 -08:00
Alex Gleason
01a6b1aab9 Merge branch 'dont-stream-chatmessages' into 'develop' 
SideEffects: don't stream Create/ChatMessage in an 'update' event

See merge request soapbox-pub/soapbox-be!105
 2022-02-28 21:20:55 +00:00
Alex Gleason
1db95a1677
SideEffects: don't stream Create/ChatMessage in an 'update' event 2022-02-28 14:56:20 -06:00
HJ
ee05abe052 Merge branch 'revert/notice-routes' into 'develop' 
Revert notice compatibility routes merge request

See merge request pleroma/pleroma!3576
 2022-02-26 16:24:49 +00:00
Sean King
17aa3644be
Copyright bump for 2022 2022-02-25 23:11:42 -07:00
marcin mikołajczak
c8fc411b77 Add index for assigned_account 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
 2022-02-25 17:15:46 +01:00
Alex Gleason
4bdd365b6f Merge branch 'merge-upstream' into 'develop' 
Add unicode 14 support

See merge request soapbox-pub/soapbox-be!102
 2022-02-24 17:42:46 +00:00