aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Show "it's you" label and hide follow btn for current userSergey Suprunenko2020-05-14
|
* Merge branch 'chore/update-config-docs' into 'develop'HJ2020-05-13
|\ | | | | | | | | Update settings documentation and sample static/config.json See merge request pleroma/pleroma-fe!1110
| * name setting should be with apiConfig sectionMark Felder2020-05-13
| |
| * registrationOpen is not an FE settingMark Felder2020-05-13
| |
| * Really alpha sort thisMark Felder2020-05-13
| |
| * Merge branch 'develop' into chore/update-config-docsMark Felder2020-05-13
| |\ | |/ |/|
* | Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'Shpuld Shpludson2020-05-13
|\ \ | | | | | | | | | | | | Translations update from Weblate See merge request pleroma/pleroma-fe!1108
| * | Translated using Weblate (Russian)rinpatch2020-05-13
| | | | | | | | | | | | | | | | | | | | | Currently translated at 61.0% (374 of 613 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
| * | Translated using Weblate (Italian)Ben Is2020-05-13
| | | | | | | | | | | | | | | | | | | | | Currently translated at 28.3% (174 of 613 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
| * | Translated using Weblate (Finnish)Shpuld Shpuldson2020-05-13
| | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (613 of 613 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/fi/
| * | Translated using Weblate (Polish)Michał Sidor2020-05-13
| | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (613 of 613 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pl/
| * | Translated using Weblate (Russian)rinpatch2020-05-13
| | | | | | | | | | | | | | | | | | | | | Currently translated at 59.3% (364 of 613 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
| * | Translated using Weblate (Italian)Ben Is2020-05-13
| | | | | | | | | | | | | | | | | | | | | Currently translated at 28.3% (174 of 613 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
| * | Translated using Weblate (German)Toro Mino2020-05-13
| | | | | | | | | | | | | | | | | | | | | Currently translated at 66.7% (409 of 613 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
| * | Translated using Weblate (Finnish)Shpuld Shpuldson2020-05-13
| | | | | | | | | | | | | | | | | | | | | Currently translated at 78.7% (483 of 613 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/fi/
| * | Translated using Weblate (Italian)Anonymous2020-05-13
| | | | | | | | | | | | | | | | | | | | | Currently translated at 27.5% (169 of 613 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
| * | Translated using Weblate (Russian)rinpatch2020-05-13
| | | | | | | | | | | | | | | | | | | | | Currently translated at 54.4% (334 of 613 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
| * | Translated using Weblate (Russian)hj2020-05-13
| | | | | | | | | | | | | | | | | | | | | Currently translated at 54.4% (334 of 613 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
| * | Translated using Weblate (Russian)Alibek Omarov2020-05-13
| | | | | | | | | | | | | | | | | | | | | Currently translated at 54.4% (334 of 613 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
| * | Translated using Weblate (Russian)Egor2020-05-12
| | | | | | | | | | | | | | | | | | | | | Currently translated at 53.8% (330 of 613 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
| * | Translated using Weblate (French)Haelwenn (lanodan) Monnier2020-05-12
|/ / | | | | | | | | | | | | Currently translated at 97.3% (597 of 613 strings) Translation: Pleroma/Pleroma-FE Translate-URL: http://translate.pleroma.social/projects/pleroma/pleroma-fe/fr/
| * Split apiConfig options from static/config.json options;Mark Felder2020-05-13
| | | | | | | | Move safeDM to nasty section, alpha sort things
| * Config setting is actually called disableChatMark Felder2020-05-13
| |
| * SafeDM is enabled by default and won't take effect if BE not enabled anyway.Mark Felder2020-05-13
| |
| * Alpha sort indirect sectionMark Felder2020-05-13
| |
| * Alpha sort docs, add missing optionsMark Felder2020-05-13
| |
| * Add missing settings: disableChat, greentext, hideFilteredStatuses, ↵Mark Felder2020-05-13
| | | | | | | | hideMutedPosts, hidePostStats, hideSitename
| * alpha sortMark Felder2020-05-13
| |
| * loginMethod was missingMark Felder2020-05-13
| |
| * Separate the user configurable sectionMark Felder2020-05-13
| |
| * alpha sortMark Felder2020-05-13
|/
* update changelogShpuld Shpuldson2020-05-08
|
* Merge branch 'feat/relationship-refactor' into 'develop'Shpuld Shpludson2020-05-08
|\ | | | | | | | | | | | | Refactor: make relationships separate from users Closes #819 See merge request pleroma/pleroma-fe!1091
| * Merge branch 'develop' into 'feat/relationship-refactor'Shpuld Shpludson2020-05-08
| |\ | |/ |/| | | # Conflicts: # src/components/notification/notification.js
* | Merge branch 'feat/status-content-separation' into 'develop'Shpuld Shpludson2020-05-08
|\ \ | | | | | | | | | | | | Refactor: Separate status content from status See merge request pleroma/pleroma-fe!1092
| * | Separate status content from status like in direct conversations mrShpuld Shpuldson2020-04-27
| | |
* | | Merge branch 'feature/copy-link' into 'develop'Shpuld Shpludson2020-05-08
|\ \ \ | | | | | | | | | | | | | | | | Copy status link to clipboard See merge request pleroma/pleroma-fe!1085
| * \ \ Merge branch 'develop' into 'feature/copy-link'Shpuld Shpludson2020-05-08
| |\ \ \ | |/ / / |/| | | | | | | # Conflicts: # static/fontello.json
* | | | Merge branch 'fix/signup-without-email' into 'develop'Shpuld Shpludson2020-05-07
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Permit signup without email See merge request pleroma/pleroma-fe!1072
| * | | | make email validation conditional workShpuld Shpuldson2020-05-04
| | | | |
| * | | | Merge branch 'develop' into fix/signup-without-emailShpuld Shpuldson2020-05-04
| |\ \ \ \
| * | | | | Remove unneccessary nestedMark Felder2020-02-24
| | | | | |
| * | | | | First attempt at not requiring email address for registrationMark Felder2020-02-24
| | | | | |
* | | | | | Merge branch 'feat/notification-privacy' into 'develop'Shpuld Shpludson2020-05-07
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Add notification privacy option to user settings See merge request pleroma/pleroma-fe!1100
| * | | | | Add notification privacy option to user settingsMark Felder2020-05-06
|/ / / / /
* | | | | Merge branch 'rc/2.0.3' into 'develop'Shpuld Shpludson2020-05-02
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | update MASTER for 2.0.3 See merge request pleroma/pleroma-fe!1098
| * | | | | Update CHANGELOG.mdShpuld Shpludson2020-05-02
| | | | | |
| * | | | | don't dismiss a rejected follow request on serverShpuld Shpuldson2020-05-02
| | | | | |
| * | | | | mark single notifs as seen properly on serverShpuld Shpuldson2020-05-02
| | | | | |
| * | | | | follow request bugfixes, wrong text, notifs not being marked as read, ↵Shpuld Shpuldson2020-05-02
| | | | | | | | | | | | | | | | | | | | | | | | approving from follow request view