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 Shpludson
fb183adc74
Merge branch 'fix/shoutbox-fixes' into 'develop'
...
Remove vue-chat-scroll, fix up shoutbox header
See merge request pleroma/pleroma-fe!1368
2021-03-03 15:07:10 +00:00
Shpuld Shpuldson
becacf0643
remove shoutbox test hacks
2021-03-03 16:47:59 +02: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 Shpludson
30057a4944
Merge branch 'chore/update-changelog' into 'develop'
...
update changelog with 2.3.0
See merge request pleroma/pleroma-fe!1367
2021-03-02 08:03:59 +00:00
Shpuld Shpuldson
d1ab424ebc
update changelog with 2.3.0
2021-03-02 09:53:17 +02:00
Shpuld Shpludson
6d7b5b157b
Merge branch 'feat/timeline-quick-settings' into 'develop'
...
close #1050 - add a quick settings menu to timeline header
Closes #1050
See merge request pleroma/pleroma-fe!1355
2021-03-01 12:12:12 +00:00
Shpuld Shpuldson
fc5483f764
change icons around
2021-03-01 10:14:17 +02:00
HJ
a90910be8f
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma-fe!1363
2021-03-01 00:10:45 +00:00
Ryo Ueno
846e58c3d2
Translated using Weblate (Japanese)
...
Currently translated at 100.0% (686 of 686 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
2021-03-01 00:00:58 +00: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 Shpludson
aa5cb3d1d2
Merge branch 'fix/punycode-buggy' into 'develop'
...
Fix punycode handling to be less stupid
Closes #1064
See merge request pleroma/pleroma-fe!1361
2021-02-27 18:12:52 +00:00
Shpuld Shpludson
237f272d15
Merge branch 'develop' into 'fix/punycode-buggy'
...
# Conflicts:
# CHANGELOG.md
2021-02-27 18:03:49 +00:00
Shpuld Shpludson
a83fdbbd59
Merge branch 'fix/dont-crash-on-invalid-notificaiton' into 'develop'
...
close #1043 - add basic validation for statusless status notifications
Closes #1043
See merge request pleroma/pleroma-fe!1360
2021-02-27 16:57:46 +00:00
Shpuld Shpuldson
49aa10e1c0
add screen_name_ui to tests
2021-02-26 16:37:46 +02:00
Shpuld Shpuldson
09fe160e8b
separate screen_name and screen_name_ui with decoded punycode
2021-02-26 16:23:11 +02:00
Shpuld Shpludson
7c37f495f6
Update CHANGELOG.md
2021-02-26 12:36:58 +00:00
Shpuld Shpuldson
cd2f5ced31
add basic validation for statusless status notifications
2021-02-26 14:27:25 +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
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
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
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