aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'fix/timeline-bar-clickables-offset' into 'develop'Shpuld Shpludson2020-12-16
|\ | | | | | | | | | | | | Fix #923 block clicks in blank area of timeline menu, fix 'up-to-date' align Closes #923 See merge request pleroma/pleroma-fe!1300
| * Merge branch 'develop' into 'fix/timeline-bar-clickables-offset'Shpuld Shpludson2020-12-16
| |\ | |/ |/| | | # Conflicts: # CHANGELOG.md
* | Merge branch 'feat/move-external-source-button-to-extra-buttons' into 'develop'Shpuld Shpludson2020-12-16
|\ \ | | | | | | | | | | | | Move external source link to extra buttons, expand the expand button See merge request pleroma/pleroma-fe!1303
| * \ Merge branch 'develop' into 'feat/move-external-source-button-to-extra-buttons'Shpuld Shpludson2020-12-15
| |\ \ | | | | | | | | | | | | # Conflicts: # CHANGELOG.md
| * | | update changelogShpuld Shpuldson2020-12-03
| | | |
| * | | move external source button to extra buttons, make expand button easier to ↵Shpuld Shpuldson2020-12-03
| | | | | | | | | | | | | | | | click and highlight on hover
* | | | Merge branch 'fix/fix-error-handling-in-profile-tab' into 'develop'Shpuld Shpludson2020-12-16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix #1020 fix error handling in profile tab Closes #1020 See merge request pleroma/pleroma-fe!1299
| * \ \ \ Merge branch 'develop' into 'fix/fix-error-handling-in-profile-tab'Shpuld Shpludson2020-12-03
| |\ \ \ \ | | | | | | | | | | | | | | | | | | # Conflicts: # CHANGELOG.md
| * | | | | remove vertical align, update changelogShpuld Shpuldson2020-12-02
| | | | | |
| * | | | | fix the close button on global noticesShpuld Shpuldson2020-12-02
| | | | | |
| * | | | | Merge branch 'develop' into fix/fix-error-handling-in-profile-tabShpuld Shpuldson2020-12-02
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | refactor error handling in profile tabShpuld Shpuldson2020-12-02
| | | | | |
* | | | | | Merge branch 'fix/remote-follow-button-style' into 'develop'Shpuld Shpludson2020-12-16
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | fix remote follow button style See merge request pleroma/pleroma-fe!1313
| * | | | | fix remote follow button styleShpuld Shpuldson2020-12-16
|/ / / / /
| | | | * Merge branch 'develop' into 'fix/timeline-bar-clickables-offset'Shpuld Shpludson2020-12-15
| | | | |\ | |_|_|_|/ |/| | | | | | | | | # Conflicts: # CHANGELOG.md
* | | | | Merge branch 'fix/no-emoji-in-poll-when-voting' into 'develop'Shpuld Shpludson2020-12-15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix #1026 use title html for poll options before vote Closes #1026 See merge request pleroma/pleroma-fe!1307
| * | | | | use title html for poll options before voteShpuld Shpuldson2020-12-07
| | |_|/ / | |/| | |
* | | | | Merge branch 'prevent-textarea-resize-in-bio' into 'develop'HJ2020-12-15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable horizontal textarea resize Closes #741 See merge request pleroma/pleroma-fe!1312
| * | | | | Disable horizontal textarea resizeeugenijm2020-12-15
|/ / / / /
* | | | | Merge branch 'patch-1' into 'develop'HJ2020-12-14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add uk.json in messages.js See merge request pleroma/pleroma-fe!1311
| * | | | | Add uk.json in messages.jsW. W2020-12-14
|/ / / / /
* | | | | Merge branch 'file-limit-info' into 'develop'Shpuld Shpludson2020-12-12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display the upload limit on the Features panel Closes #785 See merge request pleroma/pleroma-fe!1308
| * | | | | Display upload limit on the Features paneleugenijm2020-12-11
|/ / / / /
* | | | | Merge branch 'fix/react-button-whoops' into 'develop'Shpuld Shpludson2020-12-06
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix #1025 recent mistakes in react button Closes #1025 See merge request pleroma/pleroma-fe!1306
| * | | | | fix recent mistakes in react buttonShpuld Shpuldson2020-12-06
| |/ / / /
* | | | | Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ2020-12-04
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Translations update from Weblate See merge request pleroma/pleroma-fe!1298
| * | | | Translated using Weblate (Ukrainian)ZEN2020-12-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 94.6% (635 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
| * | | | Translated using Weblate (Russian)rinpatch2020-12-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 76.9% (516 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
| * | | | Translated using Weblate (Ukrainian)Митець2020-12-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 94.1% (632 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
| * | | | Translated using Weblate (Ukrainian)Anonymous2020-12-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 93.8% (630 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
| * | | | Translated using Weblate (Ukrainian)ZEN2020-12-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 93.8% (630 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
| * | | | Translated using Weblate (Russian)rinpatch2020-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 76.1% (511 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
| * | | | Translated using Weblate (Ukrainian)ZEN2020-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 90.4% (607 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
| * | | | Translated using Weblate (Ukrainian)Митець2020-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 90.4% (607 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
| * | | | Translated using Weblate (Ukrainian)Митець2020-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 90.1% (605 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
| * | | | Translated using Weblate (Ukrainian)Митець2020-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 85.6% (575 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
| * | | | Translated using Weblate (Ukrainian)ZEN2020-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 85.6% (575 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
| * | | | Translated using Weblate (Ukrainian)ZEN2020-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 85.5% (574 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
| * | | | Translated using Weblate (Ukrainian)Anonymous2020-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 85.5% (574 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
| * | | | Translated using Weblate (Ukrainian)ZEN2020-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 85.5% (574 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
| * | | | Translated using Weblate (Ukrainian)Anonymous2020-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 84.6% (568 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
| * | | | Translated using Weblate (Ukrainian)Митець2020-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 84.5% (567 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
| * | | | Translated using Weblate (Ukrainian)ZEN2020-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 84.5% (567 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
| * | | | Translated using Weblate (Ukrainian)Митець2020-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 81.3% (546 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
| * | | | Translated using Weblate (Ukrainian)Anonymous2020-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 81.0% (544 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
| * | | | Translated using Weblate (Ukrainian)ZEN2020-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 81.0% (544 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
| * | | | Translated using Weblate (Russian)rinpatch2020-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 72.1% (484 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
| * | | | Translated using Weblate (Ukrainian)Anonymous2020-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 80.7% (542 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
| * | | | Translated using Weblate (Ukrainian)Митець2020-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 80.7% (542 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
| * | | | Translated using Weblate (Ukrainian)Anonymous2020-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 80.1% (538 of 671 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/