HJ
20b755d57e
Merge branch 'fix-build-warnings' into 'develop'
...
update shelljs to get rid of warnings on build
See merge request pleroma/pleroma-fe!1358
2021-02-26 10:16:21 +00:00
HJ
a7a69d08a7
Merge branch 'fix/chat-unread-badge' into 'develop'
...
fix chat unread badge
See merge request pleroma/pleroma-fe!1359
2021-02-26 10:15:09 +00:00
Shpuld Shpuldson
2e7529cf50
changelog mention
2021-02-26 11:03:26 +02:00
Shpuld Shpuldson
6fefa5a9c5
fix chat unread badge
2021-02-26 11:00:21 +02:00
Shpuld Shpuldson
cef6ecb916
update shelljs to get rid of warnings on build
2021-02-26 10:30:30 +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 Shpludson
dd9e18fd34
Merge branch 'fix-vue-warnings-again' into 'develop'
...
fix vue warnings
See merge request pleroma/pleroma-fe!1356
2021-02-25 12:43:22 +00:00
Shpuld Shpuldson
59aaade7fc
fix vue warnings
2021-02-25 14:32:21 +02:00
Shpuld Shpuldson
096747a5dc
add only to wording
2021-02-25 11:12:51 +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
ecb211606c
change config comment to be consistent
2021-02-23 10:06:45 +02:00
Shpuld Shpuldson
29dae3c12e
update changelog
2021-02-23 10:03:29 +02:00
Shpuld Shpuldson
3f23aecd10
add sensitive by default option
2021-02-23 10:00:23 +02:00
HJ
5faca01261
Merge branch 'fix/redline-final-v2' into 'develop'
...
fix redline again
See merge request pleroma/pleroma-fe!1353
2021-02-22 18:53:26 +00: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 Shpludson
e8b8c3cc49
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma-fe!1351
2021-02-22 15:00:47 +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
Kana
5ddfc787ed
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 99.8% (684 of 685 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
2021-02-22 03:28:44 +00:00
Ryo Ueno
226ec1c5be
Translated using Weblate (Korean)
...
Currently translated at 66.8% (458 of 685 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
2021-02-21 03:00:16 +00:00
Ryo Ueno
3983ea79cd
Translated using Weblate (Korean)
...
Currently translated at 66.7% (457 of 685 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
2021-02-21 02:51:00 +00:00
Ryo Ueno
20997d6cfc
Translated using Weblate (Japanese)
...
Currently translated at 100.0% (685 of 685 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
2021-02-21 02:50:57 +00:00
Ben Is
d5f191db38
Translated using Weblate (Italian)
...
Currently translated at 100.0% (685 of 685 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2021-02-21 02:50:55 +00:00
Tirifto
d0b1a68f86
Translated using Weblate (Esperanto)
...
Currently translated at 100.0% (683 of 683 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
2021-02-20 20:37:20 +00: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
HJ
663362db56
Merge branch 'fix/poll-type-text-overflow' into 'develop'
...
add padding to poll type to not have arrow icon overlap text
See merge request pleroma/pleroma-fe!1345
2021-02-20 19:29:02 +00:00
HJ
a7f055a875
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma-fe!1348
2021-02-20 19:27:51 +00:00
Henry Jameson
94e93935bd
Merge remote-tracking branch 'origin/develop' into shigusegubu
...
* origin/develop: (77 commits)
Add myself to .mailmap
Translated using Weblate (Japanese)
Translated using Weblate (Italian)
Translated using Weblate (Russian)
User card: use general.role instead of card-specific roles
Translated using Weblate (Italian)
Translated using Weblate (Korean)
Translated using Weblate (Japanese)
Translated using Weblate (Japanese)
Translated using Weblate (Japanese)
Translated using Weblate (Japanese)
Translated using Weblate (Spanish)
Translated using Weblate (Italian)
Translated using Weblate (Chinese (Traditional))
Translated using Weblate (Chinese (Traditional))
Translated using Weblate (Chinese (Traditional))
Translated using Weblate (French)
Translated using Weblate (Norwegian Bokmål)
Ensure poll.voters_count doesn't fallback to poll.votes when it's 0
Make bot label localizable
...
2021-02-20 20:47:50 +02:00
Shpuld Shpuldson
67f3532ac9
add additional check with timeout
2021-02-18 10:14:45 +02:00
Shpuld Shpuldson
ee1cf36d52
update changelog
2021-02-17 10:54:14 +02:00
Shpuld Shpuldson
7834ff52b1
add test
2021-02-17 10:53:38 +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
Kana
e720d4dd8a
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 99.8% (682 of 683 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
2021-02-15 10:26:04 +00:00
rinpatch
aa240f935f
Merge branch 'chore/mailmap' into 'develop'
...
Add myself to .mailmap
See merge request pleroma/pleroma-fe!1349
2021-02-15 10:25:57 +00:00
rinpatch
265bb2cd41
Add myself to .mailmap
...
I changed my email to rin@patch.cx
2021-02-15 13:17:52 +03:00
Shpuld Shpuldson
23a5c601a7
changelog
2021-02-15 11:35:14 +02:00
Shpuld Shpuldson
b4580d086f
Merge branch 'develop' into feat/reason-in-registration
2021-02-15 11:10:38 +02:00
Shpuld Shpuldson
a636e53404
add reason field when approval is required
2021-02-15 11:10:09 +02:00
HJ
2f8d4c7406
Merge branch 'fix/weblate-conflicts' into 'develop'
...
Merge Weblate updates
See merge request pleroma/pleroma-fe!1346
2021-02-15 08:33:58 +00:00
rinpatch
3d25946bbf
Merge Weblate updates
...
There was a merge conflict so it had to be done manually.
2021-02-15 11:25:03 +03:00
Shpuld Shpuldson
c3b267f2b9
add padding to poll type to not have arrow icon overlap text
2021-02-15 08:30:41 +02:00
Shpuld Shpludson
44bddf6cd2
Merge branch 'fix/usercard-use-general-roles' into 'develop'
...
User card: use general.role instead of card-specific roles
See merge request pleroma/pleroma-fe!1344
2021-02-15 06:20:55 +00:00
Ryo Ueno
7e11093fcd
Translated using Weblate (Japanese)
...
Currently translated at 100.0% (685 of 685 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
2021-02-14 09:49:18 +00:00
Ben Is
cba48476ad
Translated using Weblate (Italian)
...
Currently translated at 100.0% (685 of 685 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2021-02-14 09:49:16 +00:00