Commit graph

14508 commits

Author SHA1 Message Date
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
f572a416e7 Use types for filtering notifications
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-16 21:16:03 +01:00
eb35a54ab8 Use reject_follow_request
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-16 19:15:58 +01:00
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
d76bfd4e89 Location: user_location_length
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-14 22:52:06 +01: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
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
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
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
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
97d014552d Update assign_account_operation
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-02 17:21:21 +01:00
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
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
4ab4903186 Add tests
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-03-01 23:50:09 +01: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
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
Alex Gleason
16745b8e91
Merge remote-tracking branch 'pleroma/develop' into merge-upstream 2022-02-24 12:28:23 -05:00
lain
d91e9cee04 Merge branch 'unicode-14.0-backend' into 'develop'
Unicode 14 Support

See merge request pleroma/pleroma!3633
2022-02-21 19:38:52 +00:00
Sam Therapy
061cb749cd
Add unicode 14 support
and add a test with a unicode 14 emoji
2022-02-21 12:28:33 -06:00
644b7e614e Allow submitting an array of rule_ids to /api/v1/reports
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-21 13:37:13 +01:00
9747233375 Add mastodon admin API routes for report assigning
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-18 18:06:24 +01:00
db77571319 Merge remote-tracking branch 'soapbox/develop' into report-assign-account 2022-02-18 17:25:52 +01:00
05fb8229b9 Allow assigning users to reports
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-18 17:23:57 +01:00
marcin mikołajczak
1cbe512d4e Merge branch 'mastodon-admin-api' into 'develop'
MastoAPI: /api/v1/admin/accounts, /api/v1/admin/reports

See merge request soapbox-pub/soapbox-be!95
2022-02-17 15:02:19 +00:00
e4677e212c Merge remote-tracking branch 'soapbox/develop' into mastodon-admin-api
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-17 15:28:25 +01:00
Alex Gleason
0a6c52fecb Merge branch 'configuration' into 'develop'
Add `configuration` field to /api/v1/instance

See merge request soapbox-pub/soapbox-be!98
2022-02-16 20:24:48 +00:00
892f75e9d7 InstanceControllerTest: Add configuration test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-16 20:41:36 +01:00
Alex Gleason
391539d7a2 Merge branch 'readme' into 'develop'
Update README for soapbox-be

See merge request soapbox-pub/soapbox-be!99
2022-02-16 15:41:25 +00:00
Alex Gleason
dcb65ab1af
Update README for soapbox-be 2022-02-16 09:26:53 -06:00
02f02cb6df Add configuration field to /api/v1/instance
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-15 22:03:49 +01:00
Alex Gleason
759338ac09 Fix screenshot in README 2022-02-15 19:25:53 +00:00
Alex Gleason
c73404ade8 Merge branch 'emit-move' into 'develop'
Implement moving account

See merge request soapbox-pub/soapbox-be!97
2022-02-14 20:49:10 +00:00
fbb159dd47 Merge remote-tracking branch 'tusooa/from/develop/tusooa/emit-move' into emit-move
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-13 23:18:55 +01:00
5a4a7e775b some cleanup, reports
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-13 17:58:24 +01:00