Commit graph

896 commits

Author SHA1 Message Date
Alex Gleason
ebef1ece7a
Conservative rich media parsing 2021-03-06 23:38:26 -06:00
Alex Gleason
811ccdce20 Merge branch 'develop' into 'develop'
Update ja.json

See merge request soapbox-pub/soapbox-fe!439
2021-01-29 02:36:31 +00:00
ruine
954145763c Update ja.json 2021-01-29 11:13:34 +09:00
Alex Gleason
6c18050636
Fix jumpy follow relationship in Pleroma 2021-01-28 16:34:52 -06:00
Alex Gleason
36f6f12856
Stream following relationships 2021-01-28 16:22:31 -06:00
Alex Gleason
5d418d9269
Let public timelines be viewed 2021-01-27 20:40:30 -06:00
Alex Gleason
d0600aef02
Refactor Follow button and remote follow 2021-01-27 19:38:05 -06:00
Alex Gleason
a5ed1998d7
Merge remote-tracking branch 'origin/develop' into remote_follow 2021-01-27 19:14:22 -06:00
Bane
6c3585f45a Update pt.json 2021-01-27 16:22:05 +00:00
marcin mikołajczak
5ba4453950 Polish translation: Fix typo 2021-01-27 11:03:40 +00:00
marcin mikołajczak
2e30f1cefc Update Polish translation 2021-01-24 12:06:38 +00:00
matrix07012
e4b47ee2f7 Updated Czech translation 2021-01-23 22:23:06 +00:00
Sean King
ac3dbaab94
Add ability to opt-out or opt-in to emoji react notifications 2021-01-19 17:50:08 -07:00
João Rodrigues
9fe3512a2f Update app/soapbox/locales/pt.json 2021-01-19 12:37:00 +00:00
Sean King
89785fa84c
Change to new convention for acct 2021-01-18 20:16:00 -07:00
Sean King
9309ef4893
Fix merge conflicts 2021-01-18 20:09:35 -07:00
Sean King
39b50e8fe1
Add moderator button for marking posts sensitive or not sensitive 2021-01-18 19:59:07 -07:00
Alex Gleason
2c49bdb577 Merge branch 'admin-short-names' into 'develop'
Use short names for admin quick actions

See merge request soapbox-pub/soapbox-fe!426
2021-01-19 00:39:19 +00:00
Alex Gleason
498471958b
Use short names for admin quick actions 2021-01-18 18:25:36 -06:00
João Rodrigues
9539654d7f Update app/soapbox/locales/pt.json 2021-01-18 22:45:02 +00:00
Alex Gleason
5b5397312b Merge branch 'admin-improvements' into 'develop'
Admin improvements

See merge request soapbox-pub/soapbox-fe!424
2021-01-18 22:16:28 +00:00
Alex Gleason
c80797ccf8
Admin: delete status directly from menu 2021-01-18 15:57:20 -06:00
Alex Gleason
926335b268
Add "deactivate" and "delete" user modals to every status and account profile 2021-01-18 15:27:35 -06:00
Alex Gleason
bdf0d3618d
Refactor mod report modals 2021-01-18 14:59:02 -06:00
Alex Gleason
af92caa6e2
Import users from reports 2021-01-18 14:58:30 -06:00
Alex Gleason
acdb884d70 Merge branch 'drakz-develop-patch-16517' into 'develop'
Updated pt.json

See merge request soapbox-pub/soapbox-fe!423
2021-01-18 20:34:20 +00:00
Alex Gleason
d97f9d7472 Merge branch 'rgi-reacts' into 'develop'
Support RGI emoji reacts conditionally

See merge request soapbox-pub/soapbox-fe!421
2021-01-18 20:27:35 +00:00
João Rodrigues
d396a0fb20 Update app/soapbox/locales/pt.json 2021-01-18 20:23:39 +00:00
Alex Gleason
47ed1e42c9
Run rootReducer in tests 2021-01-18 14:14:08 -06:00
João Rodrigues
ea680903fe Update app/soapbox/locales/pt.json 2021-01-18 20:12:12 +00:00
Alex Gleason
f24e1c9929
Normalize Pleroma user fields, fixes #549 2021-01-18 13:59:24 -06:00
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
João Rodrigues
8c5f2e4a03 Update app/soapbox/locales/pt.json 2021-01-18 16:13:21 +00:00
João Rodrigues
3beb8c2a6f Update app/soapbox/locales/pt.json 2021-01-18 03:13:54 +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
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
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
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
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