mirror
/
soapbox
kopia lustrzana https://gitlab.com/soapbox-pub/soapbox
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
1 921 Commity
214 Gałęzie
14 Tagi
74 MiB
Wykres commitów

1921 Commity (abbe5d1d1f66aec4becd0b063b9f3b7d174778b2)

Autor SHA1 Wiadomość Data
Sean King ac3dbaab94
Add ability to opt-out or opt-in to emoji react notifications 2021-01-19 17:50:08 -07:00
Alex Gleason e84a2bd2d2 Merge branch 'drakz-develop-patch-17333' into 'develop' 
Update app/soapbox/locales/pt.json

See merge request soapbox-pub/soapbox-fe!429
 2021-01-19 13:09:29 +00:00
João Rodrigues 9fe3512a2f Update app/soapbox/locales/pt.json 2021-01-19 12:37:00 +00:00
Alex Gleason 5715479747 Merge branch 'feature/admin-posts-sensitive' into 'develop' 
Add moderator button for marking posts sensitive or not sensitive

See merge request soapbox-pub/soapbox-fe!428
 2021-01-19 03:48:22 +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 d5660c50ee Merge branch 'user-panel-overflow' into 'develop' 
Fix sharp corners on user panel

See merge request soapbox-pub/soapbox-fe!427
 2021-01-19 00:55:45 +00:00
Alex Gleason 7f9508f117
Fix sharp corners on user panel 2021-01-18 18:44:05 -06: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
Alex Gleason 0671712f2f Merge branch 'drakz-develop-patch-97045' into 'develop' 
Update app/soapbox/locales/pt.json

See merge request soapbox-pub/soapbox-fe!425
 2021-01-18 22:56:17 +00: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 361cdc662f
Reports: overflow fix for status content 2021-01-18 15:37:08 -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 4044b4b14f
Reports: fix overflow on mobile and link color 2021-01-18 14:23:11 -06:00
Alex Gleason 47ed1e42c9
Run rootReducer in tests 2021-01-18 14:14:08 -06:00
Alex Gleason f8fa7007e7 Merge branch 'normalize-pleroma-user-fields' into 'develop' 
Normalize Pleroma user fields, fixes #549

Closes #549

See merge request soapbox-pub/soapbox-fe!422
 2021-01-18 20:13:25 +00: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 43854c0dc1 Merge branch 'refactor/bot-badge' into 'develop' 
Refactor bot badge

See merge request soapbox-pub/soapbox-fe!420
 2021-01-18 19:37:13 +00: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
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