aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* Merge branch 'master' into 'rc/2.3.0'Shpuld Shpludson2021-03-01
|\ | | | | | | # Conflicts: # CHANGELOG.md
| * Merge branch 'master' into 'rc/2.2.3'Shpuld Shpludson2021-01-18
| |\ | | | | | | | | | # Conflicts: # CHANGELOG.md
| | * Merge branch 'master' into 'rc/2.2.2'Shpuld Shpludson2020-12-22
| | |\ | | | | | | | | | | | | # Conflicts: # CHANGELOG.md
| | | * Update MASTER with develop for 2.2.1Shpuld Shpuldson2020-11-09
| | | |\
| | | * \ Merge branch 'develop' into 'master'Shpuld Shpludson2020-11-06
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge develop into master for 2.2.0 See merge request pleroma/pleroma-fe!1278
| | | * \ \ Merge branch 'master' into 'rc/2.1.2'Shpuld Shpludson2020-09-17
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # CHANGELOG.md
| | | | * \ \ Merge branch 'master' into 'rc/2.1.1'Shpuld Shpludson2020-09-08
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # CHANGELOG.md
| | | | | * \ \ Merge branch 'master' into '2.1.0-rc0'Shpuld Shpludson2020-08-27
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # CHANGELOG.md # src/services/api/api.service.js
| | | | | | * | | Revert "remove with_move param"Shpuld Shpuldson2020-05-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 02c8a9e3143f2b12f44d24f307e2718dec22987b.
* | | | | | | | | 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
| | | | | | | | | | |
* | | | | | | | | | | fix chat unread badgeShpuld Shpuldson2021-02-26
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | fix vue warningsShpuld Shpuldson2021-02-25
|/ / / / / / / / /
* | | | | | | | | 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
| | * | | | | | | | | 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
| | | | | | | | | | | |
| | * | | | | | | | | | get rid of older messages when scrolling down in chat to keep it from ↵Shpuld Shpuldson2021-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bloating dom
| * | | | | | | | | | | Translated using Weblate (Chinese (Simplified))Kana2021-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/
| * | | | | | | | | | | Translated using Weblate (Korean)Ryo Ueno2021-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 66.8% (458 of 685 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
| * | | | | | | | | | | Translated using Weblate (Korean)Ryo Ueno2021-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 66.7% (457 of 685 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
| * | | | | | | | | | | Translated using Weblate (Japanese)Ryo Ueno2021-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/
| * | | | | | | | | | | Translated using Weblate (Italian)Ben Is2021-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (685 of 685 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
| * | | | | | | | | | | Translated using Weblate (Esperanto)Tirifto2021-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (683 of 683 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
| * | | | | | | | | | | Merge branch 'feat/reason-in-registration' into 'develop'Shpuld Shpludson2021-02-20
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Close #1047 - add reason field for registration when needed Closes #1047 See merge request pleroma/pleroma-fe!1347
| | * | | | | | | | | | | Merge branch 'develop' into feat/reason-in-registrationShpuld Shpuldson2021-02-15
| | |\| | | | | | | | | |
| | * | | | | | | | | | | add reason field when approval is requiredShpuld Shpuldson2021-02-15
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'fix/poll-type-text-overflow' into 'develop'HJ2021-02-20
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add padding to poll type to not have arrow icon overlap text See merge request pleroma/pleroma-fe!1345
| | * | | | | | | | | | | | add padding to poll type to not have arrow icon overlap textShpuld Shpuldson2021-02-15
| | |/ / / / / / / / / / /
| * | / / / / / / / / / / Translated using Weblate (Chinese (Simplified))Kana2021-02-15
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/
* / | | | | | | | | | | fix redline againShpuld Shpuldson2021-02-22
|/ / / / / / / / / / /
* | | | | | | | | | | Merge Weblate updatesrinpatch2021-02-15
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | There was a merge conflict so it had to be done manually.
| * | | | | | | | | | Translated using Weblate (Japanese)Ryo Ueno2021-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/
| * | | | | | | | | | Translated using Weblate (Italian)Ben Is2021-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (685 of 685 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
| * | | | | | | | | | Translated using Weblate (Russian)rinpatch2021-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 83.6% (573 of 685 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
| * | | | | | | | | | Translated using Weblate (Italian)Ben Is2021-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (682 of 682 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
| * | | | | | | | | | Translated using Weblate (Korean)Ryo Ueno2021-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 57.3% (390 of 680 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
| * | | | | | | | | | Translated using Weblate (Japanese)Anonymous2021-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 98.8% (672 of 680 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
| * | | | | | | | | | Translated using Weblate (Japanese)Ryo Ueno2021-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 98.8% (672 of 680 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
| * | | | | | | | | | Translated using Weblate (Japanese)Anonymous2021-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 98.0% (667 of 680 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
| * | | | | | | | | | Translated using Weblate (Japanese)Ryo Ueno2021-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 98.0% (667 of 680 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
| * | | | | | | | | | Translated using Weblate (Spanish)tarteka2021-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (680 of 680 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
| * | | | | | | | | | Translated using Weblate (Italian)Ben Is2021-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (680 of 680 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
| * | | | | | | | | | Translated using Weblate (Chinese (Traditional))Snow2021-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (679 of 679 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hant/
| * | | | | | | | | | Translated using Weblate (Chinese (Traditional))Snow2021-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (679 of 679 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hant/