Shpuld Shpludson
91f93d4a55
Merge branch 'develop' into 'feat/timeline-quick-settings'
...
# Conflicts:
# CHANGELOG.md
2021-02-28 15:37:39 +00:00
Shpuld Shpuldson
096747a5dc
add only to wording
2021-02-25 11:12:51 +02:00
Shpuld Shpuldson
51a78e8b8a
add a quick settings menu for timeline headers
2021-02-25 10:56:16 +02:00
Shpuld Shpuldson
3f23aecd10
add sensitive by default option
2021-02-23 10:00:23 +02:00
Shpuld Shpuldson
a636e53404
add reason field when approval is required
2021-02-15 11:10:09 +02:00
rinpatch
6acf812101
User card: use general.role instead of card-specific roles
...
Also removes admin_menu.roles from some localizations since it is not
used anywhere
2021-02-13 16:34:43 +03:00
Shpuld Shpludson
7f3fd9ca21
Merge branch 'multi-choice-poll-wording' into 'develop'
...
Display 'people voted' instead of 'votes' for multi-answers polls
Closes #993
See merge request pleroma/pleroma-fe!1341
2021-02-12 19:15:42 +00:00
eugenijm
01275fbac0
Ensure poll.voters_count doesn't fallback to poll.votes when it's 0
2021-02-12 19:43:57 +03:00
rinpatch
da807a12fb
Make bot label localizable
2021-02-12 13:48:39 +03:00
Shpuld Shpludson
8b7c367b04
Merge branch 'staff-grouping' into 'develop'
...
Group staff by role in the About page
Closes #737
See merge request pleroma/pleroma-fe!1309
2021-02-12 08:05:55 +00:00
eugenijm
1506b97e35
Display 'people voted' instead of 'votes' for multi-choice polls
2021-02-09 16:36:45 +03:00
Henry Jameson
8958f386be
Merge remote-tracking branch 'origin/develop' into settings-changed
...
* origin/develop: (306 commits)
fallback if shadows aren't defined
Translated using Weblate (Chinese (Traditional))
Translated using Weblate (Ukrainian)
Translated using Weblate (Italian)
Translated using Weblate (Ukrainian)
Translated using Weblate (Portuguese)
Translated using Weblate (Italian)
Translated using Weblate (Russian)
Translated using Weblate (Portuguese)
Translated using Weblate (Russian)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
Translated using Weblate (Portuguese)
...
2021-02-01 19:39:57 +02:00
rinpatch
b76a68e622
UserCard: Make user roles translateable
...
I did not add a translation for my native language in this patch because
I am not sure how weblate would react, but I did add it locally and it
seems to work.
2021-01-20 14:04:00 +03:00
eugenijm
481c71517e
Group staff members by role in the About page
2020-12-18 13:41:37 +03:00
HJ
8d9bf3efc8
Merge branch 'plain-bg' into 'develop'
...
Solid color wallpaper support
See merge request pleroma/pleroma-fe!1314
2020-12-18 08:37:01 +00:00
Shpuld Shpludson
10399c193a
Merge branch 'feat/move-external-source-button-to-extra-buttons' into 'develop'
...
Move external source link to extra buttons, expand the expand button
See merge request pleroma/pleroma-fe!1303
2020-12-16 17:46:15 +00:00
Shpuld Shpludson
466fc84e82
Merge branch 'fix/fix-error-handling-in-profile-tab' into 'develop'
...
fix #1020 fix error handling in profile tab
Closes #1020
See merge request pleroma/pleroma-fe!1299
2020-12-16 16:51:03 +00:00
Henry Jameson
0cf06cb9ec
Merge remote-tracking branch 'origin/develop' into plain-bg
...
* origin/develop:
fix remote follow button style
Disable horizontal textarea resize
Add uk.json in messages.js
Display upload limit on the Features panel
use title html for poll options before vote
fix recent mistakes in react button
2020-12-16 18:43:38 +02:00
Henry Jameson
5cb41c7175
theme ui
2020-12-16 18:28:10 +02:00
Henry Jameson
c197756767
Basic no-wallpaper support
2020-12-16 18:25:07 +02:00
Shpuld Shpludson
22546ea813
Merge branch 'develop' into 'feat/move-external-source-button-to-extra-buttons'
...
# Conflicts:
# CHANGELOG.md
2020-12-15 19:50:59 +00:00
eugenijm
51e6f5e255
Display upload limit on the Features panel
2020-12-11 17:16:59 +03:00
Shpuld Shpuldson
46320090e3
move external source button to extra buttons, make expand button easier to click and highlight on hover
2020-12-03 11:57:17 +02:00
Shpuld Shpuldson
4dde9c4d52
refactor error handling in profile tab
2020-12-02 12:46:31 +02:00
Shpuld Shpludson
838cbd8715
Merge branch 'nsfw-link-preview' into 'develop'
...
Click-to-reveal cover for link previews in NSFW posts
Closes #973
See merge request pleroma/pleroma-fe!1287
2020-11-20 07:54:26 +00:00
eugenijm
45180d4069
Added the NSFW alert to the link preview.
2020-11-19 20:08:56 +03:00
Shpuld Shpuldson
1d2ba946b6
make notifications also use the popup errors, remove all error from status/notif state
2020-11-10 14:28:10 +02:00
Shpuld Shpuldson
d150dae5d1
fixes to timeline error handling
2020-11-10 12:52:54 +02:00
Henry Jameson
e695506c51
proper modified icon + popup
2020-10-17 22:28:49 +03:00
Shpuld Shpludson
8a34ff2957
Merge branch 'develop' into 'feat/masto-ws-deletes'
...
# Conflicts:
# CHANGELOG.md
# src/components/status/status.js
# src/components/status/status.scss
2020-10-01 12:54:54 +00:00
Shpuld Shpludson
91778a0276
Merge branch 'feat/custom-virtual-scrolling' into 'develop'
...
Timeline virtual scrolling
See merge request pleroma/pleroma-fe!1043
2020-09-29 10:18:37 +00:00
Shpuld Shpludson
f174f289a9
Timeline virtual scrolling
2020-09-29 10:18:37 +00:00
Maksim Pechnikov
3dbc1bedbf
Merge branch 'develop' into feature/import_export_mutes
2020-09-18 22:04:01 +03:00
Shpuld Shpuldson
1b811d8b93
change side drawer to use shoutbox name
2020-09-16 11:29:10 +03:00
Maksim Pechnikov
947d7cd6f2
added import/export mutes
2020-09-08 09:41:42 +03:00
Shpuld Shpuldson
0758569625
change i18n phrasing
2020-09-07 10:39:30 +03:00
Shpuld Shpuldson
40ca0b394e
add basic deletes support that works with masto WS
2020-09-06 15:28:09 +03:00
Mark Felder
5809f33c86
Password reset no longer informs user of errors or account existence
2020-09-01 16:48:51 -05:00
lain
3e6e6096bf
Merge branch 'feat/separate-timeline-navigation-from-navpanel' into 'develop'
...
Separate timeline navigation from navpanel
See merge request pleroma/pleroma-fe!1172
2020-08-06 10:17:44 +00:00
Lain Soykaf
96929d9930
ChatPanel: Rename chat
to shoutbox
.
...
To remove confusion with the new ChatMessages.
2020-07-23 17:31:35 +02:00
Mark Felder
149941828f
Improve layout of the Notifications Filters section
2020-07-15 09:56:46 -05:00
Mark Felder
49aaf9dc57
Merge branch 'develop' into refactor/notification_settings
2020-07-15 09:01:40 -05:00
Shpuld Shpuldson
89d1fb5cf4
remove remaining autoload i18n
2020-07-14 15:15:02 +03:00
Shpuld Shpuldson
b8c1b25397
remove most of reply preview and autoload related stuff
2020-07-14 15:08:04 +03:00
Shpuld Shpuldson
cac1418aff
fix merge conflicts
2020-07-14 11:44:06 +03:00
Mark Felder
da94935aaa
Merge branch 'develop' into refactor/notification_settings
2020-07-13 13:25:23 -05:00
Shpuld Shpuldson
4a6300bbee
add simple You: to chat list last message
2020-07-12 11:11:12 +03:00
eugenijm
18a1f5d62a
Add the empty chat list placeholder.
...
Do not use full height when displaying the chat list.
Remove an unsued chat action.
2020-07-08 15:21:31 +03:00
eugenijm
aa2cf51c05
Add Chats
2020-07-08 15:21:31 +03:00
Shpuld Shpludson
eea002e6f5
streamline profile image api, update reset ui for all profile images to match avatar, remove unnecessary stuff
2020-07-08 10:11:17 +00:00