aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'origin/develop' into websocket-fixesHenry Jameson2021-03-08
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * Merge branch 'feat/user-highlight-localizable' into 'develop'Shpuld Shpludson2021-03-04
| |\ | | | | | | | | | | | | Make it possible to localize user highlight options See merge request pleroma/pleroma-fe!1369
| | * Apply 1 suggestion(s) to 1 file(s)rinpatch2021-03-04
| | |
| | * Make it possible to localize user highlight optionsrinpatch2021-03-04
| | |
| * | Merge branch 'fix/shoutbox-fixes' into 'develop'Shpuld Shpludson2021-03-03
| |\ \ | | | | | | | | | | | | | | | | Remove vue-chat-scroll, fix up shoutbox header See merge request pleroma/pleroma-fe!1368
| | * | remove shoutbox test hacksShpuld Shpuldson2021-03-03
| | | |
| | * | fix shoutbox header, use custom scroll-to-bottom system, remove ↵Shpuld Shpuldson2021-03-03
| |/ / | | | | | | | | | vue-chat-scroll, temporarily add chat test hack
| * | Merge branch 'chore/update-changelog' into 'develop'Shpuld Shpludson2021-03-02
| |\ \ | | |/ | |/| | | | | | | update changelog with 2.3.0 See merge request pleroma/pleroma-fe!1367
| | * update changelog with 2.3.0Shpuld Shpuldson2021-03-02
| |/
| * Merge branch 'feat/timeline-quick-settings' into 'develop'Shpuld Shpludson2021-03-01
| |\ | | | | | | | | | | | | | | | | | | close #1050 - add a quick settings menu to timeline header Closes #1050 See merge request pleroma/pleroma-fe!1355
| | * change icons aroundShpuld Shpuldson2021-03-01
| | |
| | * Merge branch 'develop' into 'feat/timeline-quick-settings'Shpuld Shpludson2021-02-28
| | |\ | | | | | | | | | | | | # Conflicts: # CHANGELOG.md
| | * | Update timeline_quick_settings.jsShpuld Shpludson2021-02-28
| | | |
| | * | add only to wordingShpuld Shpuldson2021-02-25
| | | |
| | * | basic loggedin check for reply filteringShpuld Shpuldson2021-02-25
| | | |
| | * | add a quick settings menu for timeline headersShpuld Shpuldson2021-02-25
| | | |
| * | | Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ2021-03-01
| |\ \ \ | | |_|/ | |/| | | | | | | | | | Translations update from Weblate See merge request pleroma/pleroma-fe!1363
| | * | Translated using Weblate (Japanese)Ryo Ueno2021-03-01
| |/ / | | | | | | | | | | | | | | | | | | 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/
| * | Merge branch 'feat/sensitive-by-default' into 'develop'Shpuld Shpludson2021-02-27
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | close #1054 add sensitive by default option Closes #1054 See merge request pleroma/pleroma-fe!1354
| | * | change config comment to be consistentShpuld Shpuldson2021-02-23
| | | |
| | * | update changelogShpuld Shpuldson2021-02-23
| | | |
| | * | add sensitive by default optionShpuld Shpuldson2021-02-23
| | |/
| * | Merge branch 'fix/punycode-buggy' into 'develop'Shpuld Shpludson2021-02-27
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix punycode handling to be less stupid Closes #1064 See merge request pleroma/pleroma-fe!1361
| | * \ Merge branch 'develop' into 'fix/punycode-buggy'Shpuld Shpludson2021-02-27
| | |\ \ | | |/ / | |/| | | | | | # Conflicts: # CHANGELOG.md
| * | | Merge branch 'fix/dont-crash-on-invalid-notificaiton' into 'develop'Shpuld Shpludson2021-02-27
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | close #1043 - add basic validation for statusless status notifications Closes #1043 See merge request pleroma/pleroma-fe!1360
| | * | | Update CHANGELOG.mdShpuld Shpludson2021-02-26
| | | | |
| | * | | add basic validation for statusless status notificationsShpuld Shpuldson2021-02-26
| |/ / /
| | * | add screen_name_ui to testsShpuld Shpuldson2021-02-26
| | | |
| | * | separate screen_name and screen_name_ui with decoded punycodeShpuld Shpuldson2021-02-26
| |/ /
| * | Merge branch 'feat/focus-input-with-emoji-pickers' into 'develop'Shpuld Shpludson2021-02-26
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | close #1048: Focus input in emoji picker and react picker Closes #1048 See merge request pleroma/pleroma-fe!1357
| | * | save a few charactersShpuld Shpuldson2021-02-25
| | | |
| | * | Merge branch 'develop' into feat/focus-input-with-emoji-pickersShpuld Shpuldson2021-02-25
| | |\ \
| | * | | focus input in emoji picker and react pickerShpuld Shpuldson2021-02-25
| | | |/ | | |/|
| * | | Merge branch 'fix-build-warnings' into 'develop'HJ2021-02-26
| |\ \ \ | | | | | | | | | | | | | | | | | | | | update shelljs to get rid of warnings on build See merge request pleroma/pleroma-fe!1358
| | * | | update shelljs to get rid of warnings on buildShpuld Shpuldson2021-02-26
| | | |/ | | |/|
| * | | Merge branch 'fix/chat-unread-badge' into 'develop'HJ2021-02-26
| |\ \ \ | | |/ / | |/| | | | | | | | | | fix chat unread badge See merge request pleroma/pleroma-fe!1359
| | * | changelog mentionShpuld Shpuldson2021-02-26
| | | |
| | * | fix chat unread badgeShpuld Shpuldson2021-02-26
| |/ /
| * | Merge branch 'fix-vue-warnings-again' into 'develop'Shpuld Shpludson2021-02-25
| |\ \ | | |/ | |/| | | | | | | fix vue warnings See merge request pleroma/pleroma-fe!1356
| | * fix vue warningsShpuld Shpuldson2021-02-25
| |/
| * Merge branch 'fix/redline-final-v2' into 'develop'HJ2021-02-22
| |\ | | | | | | | | | | | | fix redline again See merge request pleroma/pleroma-fe!1353
| | * changelog conflict fixShpuld Shpuldson2021-02-22
| | |\ | | |/ | |/|
| * | Merge branch 'fix/scroll-lock-jumpiness' into 'develop'Shpuld Shpludson2021-02-22
| |\ \ | | | | | | | | | | | | | | | | Fix some UI jumpiness on scroll lock See merge request pleroma/pleroma-fe!1343
| | * | changelogShpuld Shpuldson2021-02-12
| | | |
| | * | remove redundant opacity2Shpuld Shpuldson2021-02-12
| | | |
| | * | Remove body scrollbar in chat layout, keep nav bar still on scroll lock, add ↵Shpuld Shpuldson2021-02-12
| | | | | | | | | | | | | | | | tiny fade for media modal
| * | | Merge branch 'feat/keep-chat-perf-up' into 'develop'Shpuld Shpludson2021-02-22
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Optimize chat perf in long run See merge request pleroma/pleroma-fe!1350
| | * | | add additional check with timeoutShpuld Shpuldson2021-02-18
| | | | |
| | * | | update changelogShpuld Shpuldson2021-02-17
| | | | |
| | * | | add testShpuld Shpuldson2021-02-17
| | | | |