Commit graph

1943 commits

Author SHA1 Message Date
Alex Gleason
fb99d36494
Support RGI emoji reacts conditionally 2021-01-18 13:31:16 -06:00
Sean King
fe8eecf925
Refactor bot badge 2021-01-18 11:55:38 -07:00
Alex Gleason
bebe50cc33 Merge branch 'drakz-develop-patch-97501' into 'develop'
Update app/soapbox/locales/pt.json

See merge request soapbox-pub/soapbox-fe!419
2021-01-18 17:01:54 +00:00
João Rodrigues
8c5f2e4a03 Update app/soapbox/locales/pt.json 2021-01-18 16:13:21 +00:00
Alex Gleason
0396f9afce Merge branch 'drakz-develop-patch-17499' into 'develop'
Update app/soapbox/locales/pt.json

See merge request soapbox-pub/soapbox-fe!418
2021-01-18 03:32:07 +00:00
João Rodrigues
3beb8c2a6f Update app/soapbox/locales/pt.json 2021-01-18 03:13:54 +00:00
Alex Gleason
d92f8ce00f Merge branch 'fix/bot-tag-display' into 'develop'
Make bot tag display properly, fixes #550

Closes #550

See merge request soapbox-pub/soapbox-fe!417
2021-01-17 06:12:05 +00:00
Sean King
5b4aaf79aa
Fix bot tag display 2021-01-16 22:59:38 -07:00
Alex Gleason
ca4c3a6fbd Merge branch 'demetricator-fixes' into 'develop'
Demetricator fixes, closes #543

Closes #543

See merge request soapbox-pub/soapbox-fe!416
2021-01-15 19:24:09 +00:00
Alex Gleason
b7bc013acc
Demetricator fixes, closes #543 2021-01-15 13:10:50 -06:00
Alex Gleason
7f390ba24e Merge branch 'import-mutes' into 'develop'
Allow importing mutes

See merge request soapbox-pub/soapbox-fe!414
2021-01-07 20:39:02 +00:00
Alex Gleason
b60ae75608 Merge branch 'backups' into 'develop'
Account backups

See merge request soapbox-pub/soapbox-fe!415
2021-01-07 20:38:29 +00:00
Alex Gleason
b5d0861bd1
Allow importing mutes 2021-01-07 14:26:05 -06:00
Alex Gleason
ddac13d308
Account backups 2021-01-07 14:17:06 -06:00
Alex Gleason
af50ad4639 Merge branch 'mkljczk-develop-patch-63334' into 'develop'
Polish translation for !412

See merge request soapbox-pub/soapbox-fe!413
2021-01-03 16:31:29 +00:00
marcin mikołajczak
60f0ef3fe7 Update pl.json 2021-01-03 16:10:28 +00:00
Alex Gleason
98084eac35 Merge branch 'registration-messages' into 'develop'
Registration modal

See merge request soapbox-pub/soapbox-fe!412
2021-01-03 03:10:26 +00:00
Alex Gleason
e261a13430
Display modal in registration window when confirmations and/or approval are required 2021-01-02 20:56:41 -06:00
Alex Gleason
a8fed12b63 Merge branch 'mkljczk-develop-patch-47976' into 'develop'
Update Polish translation

See merge request soapbox-pub/soapbox-fe!411
2021-01-02 14:53:47 +00:00
marcin mikołajczak
9509d1769d Update pl.json 2021-01-02 12:53:35 +00:00
marcin mikołajczak
00852093e3 Update pl.json 2021-01-01 23:22:15 +00:00
marcin mikołajczak
b507fc6318 Update pl.json 2021-01-01 23:07:47 +00:00
Alex Gleason
d8fe5c33d4 Merge branch 'modlog' into 'develop'
Moderation log

See merge request soapbox-pub/soapbox-fe!410
2021-01-01 20:38:47 +00:00
Alex Gleason
558fd1e3cc
Fix column header conditional rendering, oops again 2021-01-01 14:25:48 -06:00
Alex Gleason
82b41d2521
Fix breaking column bug lol whoops 2021-01-01 14:11:52 -06:00
Alex Gleason
c5641a566d
Admin: add link to moderation log within reports 2021-01-01 14:06:12 -06:00
Alex Gleason
acf0619790
Columns cleanup 2021-01-01 13:22:54 -06:00
Alex Gleason
39436bc07c
Admin: basic moderation log 2021-01-01 12:50:53 -06:00
Alex Gleason
ecd9e60a5d Merge branch 'reports' into 'develop'
Reports

See merge request soapbox-pub/soapbox-fe!409
2021-01-01 05:28:56 +00:00
Alex Gleason
0e4a5101db
Reports: display media 2020-12-31 23:16:50 -06:00
Alex Gleason
478581cb41
Reports: add links 2020-12-31 22:56:17 -06:00
Alex Gleason
7bd670728d
Reports: only show quote if length > 0 2020-12-31 22:46:21 -06:00
Alex Gleason
a8711f7b14
Reports: add "View post" button 2020-12-31 22:40:13 -06:00
Alex Gleason
142606d43a
Reports: refactor ReportStatus, allow deleting individual statuses 2020-12-31 22:20:31 -06:00
Alex Gleason
8c8615498b
Reports: parse HTML quotes 2020-12-31 21:34:07 -06:00
Alex Gleason
c0770c77f5
Reports: only display accordion when reported posts exist 2020-12-31 20:50:22 -06:00
Alex Gleason
2fd3c9441c
Reports: display reported posts 2020-12-31 20:47:15 -06:00
Alex Gleason
a1db330b14
Accordion: use children instead of content 2020-12-31 20:18:57 -06:00
Alex Gleason
a8893907d4
Reports: import statuses, add getReport selector 2020-12-31 20:11:08 -06:00
Alex Gleason
90414939a5
Reports: allow deleting a user 2020-12-31 18:59:10 -06:00
Alex Gleason
043bb1a00a
Reports: add modal prompt when deactivating user 2020-12-31 18:51:51 -06:00
Alex Gleason
48bca704cc
Reports: close report when deactivating user 2020-12-31 18:44:45 -06:00
Alex Gleason
dccc384f0d
Reports: fix admin reducer test 2020-12-31 18:33:45 -06:00
Alex Gleason
2c58396b00
Reports: tweak empty message text 2020-12-31 18:31:50 -06:00
Alex Gleason
35a148d9c9
Reports: allow closing a report 2020-12-31 18:24:52 -06:00
Alex Gleason
95c4ba4234
Reports: allow deactivating a user 2020-12-31 17:54:08 -06:00
Alex Gleason
a16e709ff4
Reports: break out separate Report component, basic styling 2020-12-31 17:25:21 -06:00
Alex Gleason
0837bd0495
Admin Reports: display basic information 2020-12-31 15:05:39 -06:00
Alex Gleason
f7d11ff36e
Admin: reports boilerplate 2020-12-31 14:41:43 -06:00
Alex Gleason
8b936036d0
Admin: improve awaiting-approval showLoading logic 2020-12-31 14:37:35 -06:00