aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'chore/remote-unused-option' into 'develop'Shpuld Shpludson2020-05-20
|\ | | | | | | | | Remove unused noAttachmentLinks option See merge request pleroma/pleroma-fe!1109
| * Merge branch 'develop' into chore/remote-unused-optionMark Felder2020-05-14
| |\
| * | Also remove from docsMark Felder2020-05-13
| | |
| * | Remove unused noAttachmentLinks optionMark Felder2020-05-13
| | |
* | | Merge branch 'feat/add-embed-relationships' into 'develop'lain2020-05-17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add `with_relationships` query param Closes #838 See merge request pleroma/pleroma-fe!1107
| * | | remove search1 with_relationshipsShpuld Shpuldson2020-05-13
| | | |
| * | | don't send undefinedShpuld Shpuldson2020-05-13
| | | |
| * | | add with_relationships where necessaryShpuld Shpuldson2020-05-13
| |/ /
* | | Merge branch 'resolve-weblate-merge-conflicts' into 'develop'rinpatch2020-05-15
|\ \ \ | | | | | | | | | | | | | | | | Resolve weblate merge conflicts See merge request pleroma/pleroma-fe!1114
| * | | Merge remote-tracking branch 'weblate/develop' into ↵rinpatch2020-05-14
|/| | | | | | | | | | | | | | | resolve-weblate-merge-conflicts
| * | | Translated using Weblate (English)Anonymous2020-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (613 of 613 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/en/
| * | | Translated using Weblate (Italian)Ben Is2020-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 35.0% (215 of 613 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
| * | | Translated using Weblate (Dutch)Fristi2020-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 77.8% (477 of 613 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nl/
| * | | Translated using Weblate (Dutch)Fristi2020-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 77.8% (477 of 613 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nl/
| * | | Translated using Weblate (Dutch)Fristi2020-05-14
| | |/ | |/| | | | | | | | | | | | | | | | Currently translated at 77.6% (476 of 613 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nl/
* | | Merge branch 'i18n/update-delete-description' into 'develop'HJ2020-05-14
|\ \ \ | |/ / |/| | | | | | | | Clarify that we only delete data, not the account See merge request pleroma/pleroma-fe!1102
| * | Clarify that we only delete data, not the accountMark Felder2020-05-08
| |/
* | 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