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 |
|
|
|
50d3590137
|
restyle static pages
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-04-30 23:24:25 +02:00 |
|
NEETzsche
|
32b096e7ce
|
Remove superfluous invocation of Logger
|
2022-04-24 13:41:00 -06:00 |
|
|
|
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 |
|
|
|
6500965fb3
|
Add short_description field
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-03-29 14:01:03 +02:00 |
|
|
|
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 |
|
|
|
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
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
Alex Gleason
|
1db95a1677
|
SideEffects: don't stream Create/ChatMessage in an 'update' event
|
2022-02-28 14:56:20 -06:00 |
|
Sean King
|
17aa3644be
|
Copyright bump for 2022
|
2022-02-25 23:11:42 -07: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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
ca5ee8f0bf
|
MastoAPI: /api/v1/admin/reports
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-12 21:52:21 +01:00 |
|
|
|
48e87be7de
|
Merge remote-tracking branch 'soapbox/develop' into mastodon-admin-api
|
2022-02-11 22:53:22 +01:00 |
|
|
|
6836361398
|
MastoAPI: /api/v1/admin/accounts
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-11 22:36:00 +01:00 |
|
marcin mikołajczak
|
a80852ba05
|
Merge branch 'instance-rules' into 'develop'
Instance rules
See merge request soapbox-pub/soapbox!93
|
2022-02-08 19:20:44 +00:00 |
|
|
|
1ffed59ae9
|
Instance rules: Use render_many
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-07 23:41:41 +01:00 |
|
Alex Gleason
|
502b63d8ea
|
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
|
2022-02-06 12:31:53 -06:00 |
|
|
|
e473bcf7a0
|
Max media attachment count
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-06 17:41:15 +01:00 |
|
|
|
d8a817ae8e
|
Add GET /api/v1/instance/rules
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-05 19:13:30 +01:00 |
|
|
|
6d18e6595c
|
Instance rules
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2022-02-05 18:07:04 +01:00 |
|
Alex Gleason
|
a87b7b3046
|
Merge remote-tracking branch 'pleroma/develop' into merge-upstream
|
2022-02-01 09:31:58 -06:00 |
|
