Shpuld Shpludson
d57ee274de
Merge branch 'feat/notification-quick-filters' into 'develop'
...
Add quick filters for notifications
See merge request pleroma/pleroma-fe!1364
2021-03-17 08:17:23 +00:00
Shpuld Shpuldson
8163c7b55b
v-slot
2021-03-16 08:35:29 +02:00
rinpatch
47719571e4
Use more specific button titles instead of general.submit
...
- "Post" for post submission (we already had the button title be "Posting"
when the post was being sent, so there was a weird inconsistency)
- "Register" for registration submission
- "Save changes" for usages in settings
2021-03-15 13:28:33 +03:00
Shpuld Shpludson
a00212a3bb
Merge branch 'websocket-fixes' into 'develop'
...
Various websocket fixes
See merge request pleroma/pleroma-fe!1326
2021-03-15 09:45:38 +00:00
Shpuld Shpuldson
19fc7dda9e
merge conflict, use v-slot:trigger, fix popover svg dimensions bug
2021-03-15 11:02:16 +02:00
Shpuld Shpludson
184364c7e0
Merge branch 'feat/timeline-menu-in-navpanel' into 'develop'
...
Add timeline menu toggle to nav panel
See merge request pleroma/pleroma-fe!1352
2021-03-15 07:03:22 +00:00
Henry Jameson
2e7bd99444
Merge remote-tracking branch 'origin/develop' into websocket-fixes
...
* origin/develop: (119 commits)
Apply 1 suggestion(s) to 1 file(s)
Make it possible to localize user highlight options
remove shoutbox test hacks
fix shoutbox header, use custom scroll-to-bottom system, remove vue-chat-scroll, temporarily add chat test hack
update changelog with 2.3.0
change icons around
Translated using Weblate (Japanese)
Update timeline_quick_settings.js
add screen_name_ui to tests
separate screen_name and screen_name_ui with decoded punycode
Update CHANGELOG.md
add basic validation for statusless status notifications
changelog mention
fix chat unread badge
update shelljs to get rid of warnings on build
save a few characters
focus input in emoji picker and react picker
fix vue warnings
add only to wording
basic loggedin check for reply filtering
...
2021-03-08 22:01:28 +02:00
Shpuld Shpludson
6281241b92
Merge branch 'feat/user-highlight-localizable' into 'develop'
...
Make it possible to localize user highlight options
See merge request pleroma/pleroma-fe!1369
2021-03-04 20:02:57 +00:00
rinpatch
c14c144cc8
Apply 1 suggestion(s) to 1 file(s)
2021-03-04 19:46:03 +00:00
rinpatch
b4f5df9ce5
Make it possible to localize user highlight options
2021-03-04 22:24:17 +03:00
Shpuld Shpuldson
0673511fc2
fix shoutbox header, use custom scroll-to-bottom system, remove vue-chat-scroll, temporarily add chat test hack
2021-03-03 16:46:53 +02:00
Shpuld Shpuldson
f6af4c43f6
add quick filters for notifications2
2021-03-01 16:21:35 +02:00
Shpuld Shpuldson
fc5483f764
change icons around
2021-03-01 10:14:17 +02:00
Shpuld Shpludson
91f93d4a55
Merge branch 'develop' into 'feat/timeline-quick-settings'
...
# Conflicts:
# CHANGELOG.md
2021-02-28 15:37:39 +00:00
Shpuld Shpludson
670abd633f
Update timeline_quick_settings.js
2021-02-28 15:36:51 +00:00
Shpuld Shpludson
b4782ad159
Merge branch 'feat/sensitive-by-default' into 'develop'
...
close #1054 add sensitive by default option
Closes #1054
See merge request pleroma/pleroma-fe!1354
2021-02-27 18:31:13 +00:00
Shpuld Shpuldson
09fe160e8b
separate screen_name and screen_name_ui with decoded punycode
2021-02-26 16:23:11 +02:00
Shpuld Shpludson
59db4582b0
Merge branch 'feat/focus-input-with-emoji-pickers' into 'develop'
...
close #1048 : Focus input in emoji picker and react picker
Closes #1048
See merge request pleroma/pleroma-fe!1357
2021-02-26 11:13:33 +00:00
Shpuld Shpuldson
6fefa5a9c5
fix chat unread badge
2021-02-26 11:00:21 +02:00
Shpuld Shpuldson
acc08932cd
save a few characters
2021-02-25 17:32:54 +02:00
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
93785634a7
basic loggedin check for reply filtering
2021-02-25 11:01:11 +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
485f4b899c
changelog conflict
2021-02-22 18:11:27 +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 Shpuldson
98cb9abac7
Add timeline menu toggle to nav panel
2021-02-22 16:24:04 +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
