Shpuld Shpuldson
74caf42ed7
Merge branch 'develop' into feat/focus-input-with-emoji-pickers
2021-02-25 17:31:36 +02:00
Shpuld Shpuldson
34d18ac0c4
focus input in emoji picker and react picker
2021-02-25 17:27:29 +02:00
Shpuld Shpuldson
59aaade7fc
fix vue warnings
2021-02-25 14:32:21 +02:00
Shpuld Shpuldson
e14b9ddc02
changelog conflict fix
2021-02-22 18:00:02 +02:00
Shpuld Shpludson
3d013630ae
Merge branch 'fix/scroll-lock-jumpiness' into 'develop'
...
Fix some UI jumpiness on scroll lock
See merge request pleroma/pleroma-fe!1343
2021-02-22 15:14:23 +00:00
Shpuld Shpludson
589ab6510c
Merge branch 'feat/keep-chat-perf-up' into 'develop'
...
Optimize chat perf in long run
See merge request pleroma/pleroma-fe!1350
2021-02-22 15:01:05 +00:00
Shpuld Shpuldson
2f60c6a821
fix redline again
2021-02-22 16:44:12 +02:00
Shpuld Shpludson
a89710452a
Merge branch 'feat/reason-in-registration' into 'develop'
...
Close #1047 - add reason field for registration when needed
Closes #1047
See merge request pleroma/pleroma-fe!1347
2021-02-20 20:37:12 +00:00
Shpuld Shpuldson
67f3532ac9
add additional check with timeout
2021-02-18 10:14:45 +02:00
Shpuld Shpuldson
47770ed715
get rid of older messages when scrolling down in chat to keep it from bloating dom
2021-02-17 10:16:58 +02:00
Shpuld Shpuldson
a636e53404
add reason field when approval is required
2021-02-15 11:10:09 +02:00
Shpuld Shpuldson
c3b267f2b9
add padding to poll type to not have arrow icon overlap text
2021-02-15 08:30:41 +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
Shpuld Shpuldson
398aac6558
remove redundant opacity2
2021-02-12 18:47:10 +02: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
Shpuld Shpuldson
4859e63a89
Remove body scrollbar in chat layout, keep nav bar still on scroll lock, add tiny fade for media modal
2021-02-12 18:14:54 +02: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
Eugenij
13ff99881b
Apply 1 suggestion(s) to 1 file(s)
2021-02-10 12:28:39 +00:00
eugenijm
1506b97e35
Display 'people voted' instead of 'votes' for multi-choice polls
2021-02-09 16:36:45 +03:00
HJ
647d75f27c
Merge branch 'reactbutton-consistency' into 'develop'
...
Some fixes for reactbutton/extrabuttons
See merge request pleroma/pleroma-fe!1340
2021-02-09 13:12:42 +00:00
Henry Jameson
213c5637d4
Cleanup ReactButton's CSS, fix hitboxes of reactbutton and extrabuttons
2021-02-03 09:18:44 +02:00
HJ
6f3acb3c1b
Merge branch 'fix-otp-login-kbd' into 'develop'
...
Fix #1033 as well as other (potential) similar issues
Closes #1033
See merge request pleroma/pleroma-fe!1338
2021-02-03 06:23:35 +00:00
Henry Jameson
78f8147aa6
change react button classnames for consistency
2021-02-01 21:07:40 +02:00
Henry Jameson
982c799b6f
fix a bunch of <button>s acting as submit buttons breaking enter key
2021-02-01 21:07:09 +02:00
Henry Jameson
66f3e72b54
update branch with recent develop changes (FA, added settings)
2021-02-01 20:08:36 +02: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
Shpuld Shpludson
de66267a07
Merge branch 'fix/use-current-app-locale' into 'develop'
...
Use app locale with toLocaleString/toLocaleDateString
See merge request pleroma/pleroma-fe!1301
2021-01-29 08:38:15 +00:00
Shpuld Shpuldson
9cf487497e
fix wrong route in side drawer shoutbox link
2021-01-25 18:49:03 +02:00
Shpuld Shpuldson
27a537d307
give delete field its own class
2021-01-22 12:06:39 +02:00
Shpuld Shpuldson
daa9f211a6
Merge branch 'develop' into fix/convert-more-hyperlinks-to-buttons
2021-01-22 12:04:58 +02:00
rinpatch
60a8a89f5b
Use app locale with toLocaleString/toLocaleDateString
...
Fixes inconsistent date formatting when browser language is different
from PleromaFE language.
2021-01-21 20:31:54 +03:00
Shpuld Shpludson
0358284ebf
Merge branch 'feat/language-picker-native-names' into 'develop'
...
Use native language names in the language picker
See merge request pleroma/pleroma-fe!1302
2021-01-21 13:41:36 +00:00
rinpatch
11c7355749
Use native language names in the language picker
...
This seems more intuitive to me and is what I've seen in most other
language pickers.
2021-01-21 14:24:16 +03:00
Shpuld Shpuldson
02ab803725
change a few more buttons to real buttons
2021-01-20 17:36:40 +02:00
Shpuld Shpuldson
dcba920f92
fix profile field buttons, remove attachment button
2021-01-20 17:01: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
Shpuld Shpludson
fe78ed78fd
Merge branch 'feat/dont-filter-own-posts' into 'develop'
...
Don't filter own posts
See merge request pleroma/pleroma-fe!1323
2021-01-18 13:09:25 +00:00
Shpuld Shpuldson
0ee0551a47
fix changing reported status on same user
2021-01-12 14:55:31 +02:00
Shpuld Shpuldson
65dbf7b85d
Add report button to status ellipsis menu
2021-01-12 14:43:21 +02:00
Shpuld Shpuldson
5ab96ae0d2
don't filter own posts
2021-01-11 19:40:35 +02:00
Kana
9bfc3c275c
Added Traditional Chinese to language swithcer
2021-01-01 02:53:16 +00: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
a2f1ad93f5
Merge branch 'develop' into 'fix/timeline-bar-clickables-offset'
...
# Conflicts:
# CHANGELOG.md
2020-12-16 17:49:11 +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