Alex Gleason
|
e1d77a7012
|
Merge branch 'public-timelines' into 'develop'
Let public timelines be viewed
See merge request soapbox-pub/soapbox-fe!437
|
2021-01-28 02:54:23 +00:00 |
|
Alex Gleason
|
5d418d9269
|
Let public timelines be viewed
|
2021-01-27 20:40:30 -06:00 |
|
Alex Gleason
|
da7e6cc17e
|
Merge branch 'remote_follow' into 'develop'
Remote follow
See merge request soapbox-pub/soapbox-fe!436
|
2021-01-28 01:53:56 +00: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 |
|
Alex Gleason
|
100fbba536
|
Merge branch '1337god-develop-patch-07579' into 'develop'
Update pt.json
See merge request soapbox-pub/soapbox-fe!435
|
2021-01-27 17:05:01 +00:00 |
|
Bane
|
6c3585f45a
|
Update pt.json
|
2021-01-27 16:22:05 +00:00 |
|
Alex Gleason
|
76af310ab6
|
Merge branch 'mkljczk-develop-patch-87473' into 'develop'
Polish translation: Fix typo
See merge request soapbox-pub/soapbox-fe!434
|
2021-01-27 15:01:08 +00:00 |
|
|
|
5ba4453950
|
Polish translation: Fix typo
|
2021-01-27 11:03:40 +00:00 |
|
Alex Gleason
|
f8609378f6
|
Merge branch 'mkljczk-develop-patch-95952' into 'develop'
Update Polish translation
See merge request soapbox-pub/soapbox-fe!433
|
2021-01-24 16:24:19 +00:00 |
|
|
|
2e30f1cefc
|
Update Polish translation
|
2021-01-24 12:06:38 +00:00 |
|
Alex Gleason
|
77315ef9c5
|
Merge branch 'develop' into 'develop'
Updated Czech translation
See merge request soapbox-pub/soapbox-fe!432
|
2021-01-24 05:36:43 +00:00 |
|
matrix07012
|
e4b47ee2f7
|
Updated Czech translation
|
2021-01-23 22:23:06 +00:00 |
|
Alex Gleason
|
f3bcc375a4
|
Merge branch 'fix_rm_typo' into 'develop'
Use correct index.html location in README.md
See merge request soapbox-pub/soapbox-fe!431
|
2021-01-20 01:18:37 +00:00 |
|
Alex Gleason
|
bdccacea36
|
Merge branch 'feature/emoji-react-notifications' into 'develop'
Add ability to opt-out or opt-in to emoji react notifications, fixes #206
Closes #206
See merge request soapbox-pub/soapbox-fe!430
|
2021-01-20 01:04:06 +00:00 |
|
The Stranjer
|
aa2386f92a
|
Use correct index.html location in README.md
|
2021-01-19 18:00:28 -07:00 |
|
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 |
|
