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
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
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
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
Ilja
6ba93c2cb3
Fix test get_user_apps/1
...
For some reason I had a test who suddenly failed, mix test test/pleroma/web/o_auth/app_test.exs:54. A user has a list of applications and this test adds them and then sees if the list it gets back is the same as the apps it added.
When I ran mix test a day before I didn't have this problem and when I pushed code today in a different MR, the pipeline succeeded (see https://git.pleroma.social/ilja/pleroma/-/jobs/205827 ), yet locally it failed. So it seems the test can sometimes succeed and sometimes fail, which makes it untrustworthy.
The failure I see is because the returned list is in reverse order. I assume that's not per sé wrong. You just want to know if the apps you added are actually there. I fixed the test by first ordering the lists before comparing.
AFAICT (and as far as that's relevant) the test got introduced in commit cb2a072e62
2022-02-22 18:56:26 +01: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
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
1f9317100e
Instance rules: Duplicate rule_controller_test, hope nobody notices
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2022-02-08 20:06:32 +01: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
1abc29bf3a
Merge branch 'default-hellthread' into 'develop'
...
Add HellthreadPolicy by default
See merge request soapbox-pub/soapbox!91
2022-02-07 05:48:32 +00:00
Alex Gleason
44723db71a
Merge branch 'develop' into 'default-hellthread'
...
# Conflicts:
# config/soapbox.exs
2022-02-07 05:33:38 +00:00
Alex Gleason
bdf3f19396
Merge branch 'merge-upstream' into 'develop'
...
Max media attachment count
See merge request soapbox-pub/soapbox!94
2022-02-06 18:56:50 +00:00
Alex Gleason
a3c77c4eaa
Soapbox: limit 20 media attachments by default
2022-02-06 12:42:29 -06:00
