Shpuld Shpuldson
cac1418aff
fix merge conflicts
2020-07-14 11:44:06 +03:00
Mark Felder
8fcd37a3b9
Remove i18n entries that are deprecated or need to be retranslated
2020-07-13 13:29:44 -05:00
Mark Felder
da94935aaa
Merge branch 'develop' into refactor/notification_settings
2020-07-13 13:25:23 -05:00
eugenijm
54dea24bb8
Do not display desktop chat notification when the chat is focused
2020-07-13 15:48:19 +03:00
eugenijm
2c35afeebf
Add desktop chat notifications
2020-07-13 06:27:51 +03:00
Henry Jameson
40e3595ad3
fix chrome69
2020-07-12 16:21:43 +03:00
HJ
3e09a708f6
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma-fe!1182
2020-07-12 10:56:37 +00:00
Ben Is
cf0ee51821
Translated using Weblate (Italian)
...
Currently translated at 100.0% (667 of 667 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2020-07-12 10:47:02 +00:00
HJ
4cdfe4235d
Merge branch 'feat/add-you-to-last-message' into 'develop'
...
fix #894 add simple You: to chat list last message
Closes #894
See merge request pleroma/pleroma-fe!1181
2020-07-12 10:46:52 +00:00
Shpuld Shpuldson
4a6300bbee
add simple You: to chat list last message
2020-07-12 11:11:12 +03:00
HJ
0c5e4f89e3
Merge branch 'develop' into 'develop'
...
fixed checkbox using emoji instead of dingbat
See merge request pleroma/pleroma-fe!1180
2020-07-11 11:48:05 +00:00
Dym Sohin
a754e89eed
fixed checkbox using emoji instead of dingbat
2020-07-11 06:39:44 +00:00
Shpuld Shpludson
7d5d3e4d7b
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma-fe!1174
2020-07-10 11:07:02 +00:00
Ben Is
b32394c2ef
Translated using Weblate (Italian)
...
Currently translated at 100.0% (645 of 645 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2020-07-10 10:56:44 +00:00
Shpuld Shpuldson
dca13d9a3b
Translated using Weblate (Finnish)
...
Currently translated at 100.0% (645 of 645 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/fi/
2020-07-10 10:56:44 +00:00
Ben Is
053af7b385
Translated using Weblate (Italian)
...
Currently translated at 100.0% (641 of 641 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2020-07-10 10:56:44 +00:00
Ben Is
8606cedfb5
Translated using Weblate (Italian)
...
Currently translated at 93.9% (602 of 641 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2020-07-10 10:56:44 +00:00
lain
4c59a17499
Merge branch 'fix/ctrl-enter-before-chat-loading-breaks' into 'develop'
...
fix #891 Fix early send killing the chat
Closes #891
See merge request pleroma/pleroma-fe!1178
2020-07-10 10:56:39 +00:00
lain
fd37957abd
Merge branch 'feat/add-chat-notification-dot-mobilenav' into 'develop'
...
add simple red dot for chat notifs on mobile
See merge request pleroma/pleroma-fe!1177
2020-07-10 10:55:39 +00:00
Shpuld Shpuldson
5734dd05a0
change misnamed member field check to actually disable sending
2020-07-10 13:48:37 +03:00
Shpuld Shpuldson
0038a9794b
add simple red dot for chat notifs
2020-07-10 13:21:42 +03:00
HJ
c1a20079be
Merge branch 'direct-conversations' into 'develop'
...
Chats
Closes #201
See merge request pleroma/pleroma-fe!1019
2020-07-10 09:04:45 +00:00
Shpuld Shpuldson
78ec84477e
fix pixel offset hack in panel heading
2020-07-09 12:49:16 +03:00
Shpuld Shpludson
d2f0e4e7d5
Merge branch '888-fix-utf8-base64-decoding' into 'develop'
...
After Store: Correctly decode UTF-8 encoded base64 strings.
Closes #888
See merge request pleroma/pleroma-fe!1176
2020-07-09 09:29:20 +00:00
lain
905de12980
After Store: Correctly decode UTF-8 encoded base64 strings.
2020-07-09 11:20:07 +02:00
HJ
2b3c4ccfae
Merge branch 'fix/notifications-jumping-based-on-time' into 'develop'
...
Fix notifications (favs and rts) jumping based on timeago width
See merge request pleroma/pleroma-fe!1175
2020-07-08 12:57:31 +00:00
Eugenij
b756c83e8d
Apply suggestion to src/components/chat_list/chat_list.vue
2020-07-08 15:21:31 +03:00
eugenijm
3b2dfcaf5c
Add the single-line prop to StatusContent and use it for chat list items
2020-07-08 15:21:31 +03:00
eugenijm
fc865d3a12
Remove direct style manipulations in favor of classes
2020-07-08 15:21:31 +03:00
eugenijm
ed7310c04b
Undo the promise rejection on the json parser error in promisedRequest
...
to keep the existing behavior in case some parts of the code rely on it
and to limit the overall scope of the changes.
2020-07-08 15:21:31 +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
45901c8da6
Disable status preview in the chat posting form
2020-07-08 15:21:31 +03:00
eugenijm
f05f832bff
Address feedback
...
Use more specific css rules for the emoji dimensions in the chat list status preview.
Use more round em value for chat list item height.
Add global html overflow and height for smoother chat navigation in
the desktop Safari.
Use offsetHeight instad of a computed style when setting the window height on resize.
Remove margin-bottom from the last message to avoid occasional layout shift in the desktop Safari
Use break-word to prevent chat message text overflow
Resize and scroll the textarea when inserting a new line on ctrl+enter
Remove fade transition on route change
Ensure proper border radius at the bottom of the chat, remove unused border-radius
Prevent the chat header "jumping" on the avatar load.
2020-07-08 15:21:31 +03:00
eugenijm
aa2cf51c05
Add Chats
2020-07-08 15:21:31 +03:00
Shpuld Shpuldson
60921be5a0
give notification timeago a min width
2020-07-08 14:11:42 +03:00
Shpuld Shpludson
a0ddcbdf5b
Merge branch 'patch-1' into 'develop'
...
corrected tos.html location
See merge request pleroma/pleroma-fe!1173
2020-07-08 10:18:28 +00:00
lain
4f96418143
Merge branch 'wyatt777/pleroma-fe-issue-353' into 'develop'
...
Allow remove of banner, avatar images issue #353 v2
See merge request pleroma/pleroma-fe!1156
2020-07-08 10:11:17 +00: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
Shpuld Shpuldson
5186929efa
add hack to not overlap menu with timeline header
2020-07-08 10:42:40 +03:00
Dym Sohin
1767ee01d0
corrected tos.html location
2020-07-07 19:34:45 +00:00
Shpuld Shpuldson
cde6acdbbd
update navigation, rename timeline link in nav panel to timelines
2020-07-07 18:20:37 +03:00
Shpuld Shpuldson
ddde05771f
update with bookmarks, clean up some code
2020-07-07 17:34:35 +03:00
Shpuld Shpludson
7206fee437
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma-fe!1169
2020-07-07 13:03:12 +00:00
Ben Is
0ab6d92ab8
Translated using Weblate (Italian)
...
Currently translated at 85.2% (545 of 639 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2020-07-07 12:53:55 +00:00
Ben Is
a6606df01a
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 88.2% (564 of 639 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
2020-07-07 12:53:55 +00:00
Ben Is
5b48954644
Translated using Weblate (Italian)
...
Currently translated at 75.1% (480 of 639 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2020-07-07 12:53:55 +00:00
Ben Is
e9be206a65
Translated using Weblate (Finnish)
...
Currently translated at 95.4% (610 of 639 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/fi/
2020-07-07 12:53:55 +00:00
Shpuld Shpludson
8f87a36a5a
Merge branch '884-about-panel-optimizations' into 'develop'
...
StaffPanel: Move staff loading to panel creation.
Closes #884
See merge request pleroma/pleroma-fe!1171
2020-07-07 12:53:49 +00:00
Shpuld Shpludson
7d881d97fe
Apply suggestion to src/components/staff_panel/staff_panel.js
2020-07-07 12:44:29 +00:00
lain
431b3f527d
StaffPanel: Move staff loading to panel creation.
2020-07-07 14:39:43 +02:00