aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'fix_BE_1586_provide_index_md' into 'develop'lain2020-07-03
|\ | | | | | | | | FE part of BE issue 1586 provide index md See merge request pleroma/pleroma-fe!1154
| * FE part of BE issue 1586 provide index mdIlja2020-07-03
|/ | | | | | * I added an index.md which will be the landing page for the docs. It has an explanation of Pleroma-FE from the user point of view * See also BE MR: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2669 * And issue: https://git.pleroma.social/pleroma/pleroma/-/issues/1586
* Merge branch 'fix/follow-requests-usercard-crash' into 'develop'Shpuld Shpludson2020-07-02
|\ | | | | | | | | | | | | Fix #877 Follow request user card crash Closes #877 See merge request pleroma/pleroma-fe!1167
| * add follow request users to storeShpuld Shpuldson2020-07-02
|/
* Merge branch 'fix/use-backend-reply-filtering' into 'develop'lain2020-07-01
|\ | | | | | | | | Make use of backend reply filtering See merge request pleroma/pleroma-fe!1163
| * change Show New text to Reload when flushingShpuld Shpuldson2020-06-30
| |
| * Make use of backend reply filteringShpuld Shpuldson2020-06-30
|/
* Merge branch '812-subject-separation' into 'develop'lain2020-06-29
|\ | | | | | | | | | | | | StatusContent: Better separate subject from status content. Closes #812 See merge request pleroma/pleroma-fe!1150
| * Change the show/hide strings about, remove subjected status toggle when ↵Shpuld Shpuldson2020-06-26
| | | | | | | | 'collapse' option not used
| * rip restyle subject, fix some issues with long subjectShpuld Shpuldson2020-06-26
| |
| * StatusContent: Fix greentext.lain2020-06-19
| |
| * StatusContent: Better separate subject from status content.lain2020-06-19
| |
* | Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'lain2020-06-28
|\ \ | | | | | | | | | | | | Translations update from Weblate See merge request pleroma/pleroma-fe!1158
| * | Translated using Weblate (Dutch)Fristi2020-06-28
|/ / | | | | | | | | | | | | Currently translated at 100.0% (626 of 626 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nl/
* | Merge branch 'feat/preload-data-from-html' into 'develop'lain2020-06-27
|\ \ | | | | | | | | | | | | Add basic preloading for nodeinfo/config See merge request pleroma/pleroma-fe!1155
| * | rename variable requestJson when it's not actually jsonShpuld Shpuldson2020-06-27
| | |
| * | don't block ui with stickers or tosShpuld Shpuldson2020-06-27
| | |
| * | make use of api/v1/instanceShpuld Shpuldson2020-06-27
| |\ \ | |/ / |/| |
* | | Merge branch 'remove-twitterapi-config' into 'develop'Shpuld Shpludson2020-06-27
|\ \ \ | | | | | | | | | | | | | | | | Remove StatusNet config endpoint usage See merge request pleroma/pleroma-fe!1084
| * \ \ fix conflict in after_storeShpuld Shpuldson2020-06-27
| |\ \ \ | |/ / / |/| | |
* | | | update changelog with profile fieldsShpuld Shpuldson2020-06-27
| | | |
* | | | Merge branch 'iss-149/profile-fields-setting' into 'develop'Shpuld Shpludson2020-06-27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Profile fields setting See merge request pleroma/pleroma-fe!997
| * \ \ \ Merge branch 'develop' into 'iss-149/profile-fields-setting'Shpuld Shpludson2020-06-27
| |\ \ \ \ | | | | | | | | | | | | | | | | | | # Conflicts: # src/components/settings_modal/tabs/profile_tab.vue
| * | | | | implement user suggestor for profile fieldskPherox2020-06-19
| | | | | |
| * | | | | Fix emoji input errorkPherox2020-06-19
| | | | | |
| * | | | | Fix merging array field for userskPherox2020-06-10
| | | | | |
| * | | | | Add i18n enkPherox2020-06-10
| | | | | |
| * | | | | Add profile fields formkPherox2020-06-10
| | | | | |
* | | | | | Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'Shpuld Shpludson2020-06-27
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Translations update from Weblate See merge request pleroma/pleroma-fe!1152
| * | | | | Translated using Weblate (Italian)translate2020-06-27
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently translated at 72.7% (452 of 621 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
| | * | | After Store: Remove last statusnet vestiges.lain2020-06-24
| | | | |
| | * | | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into ↵lain2020-06-24
| | |\ \ \ | |_|/ / / |/| | | | | | | | | remove-twitterapi-config
| | * | | after_store: Remove most of StatusNet config usagerinpatch2020-03-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Information under `pleromafe` key is equivalent to the one under `pleroma_fe` key in `/api/pleroma/frontend_configurations`. All other information had equivalents in `/nodeinfo/2.0.json`, except `textlimit` and `vapidPublicKey`.
| | | * | add basic preloading for nodeinfo/configShpuld Shpuldson2020-06-26
| |_|/ / |/| | |
* | | | Merge branch 'feature/bot-flag' into 'develop'lain2020-06-22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'Bot' settings option and badge Closes #832 See merge request pleroma/pleroma-fe!1153
| * | | | Use more correct class name for user badgesSergey Suprunenko2020-06-21
| | | | |
| * | | | Show a 'bot' badge on the service account pageSergey Suprunenko2020-06-21
| | | | |
| * | | | Add 'bot' flag to Profile settingsSergey Suprunenko2020-06-21
|/ / / /
* | | | Merge branch 'notification-unification-experiments' into 'develop'lain2020-06-19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Notification unification / WebPush i18n. See merge request pleroma/pleroma-fe!1142
| * | | | Changelog: Add info about push notifications.lain2020-06-19
| | | | |
| * | | | ServiceWorker: Use clearer variable nameslain2020-06-19
| | | | |
| * | | | Service Worker: Extract messages to own module.lain2020-06-16
| | | | |
| * | | | Linting + docslain2020-06-13
| | | | |
| * | | | ServiceWorker: Use loader to only notification messages.lain2020-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This keeps the translation size very small and makes it easy to integrate all the languages, as dynamically loading them isn't easy in the service worker.
| * | | | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into ↵lain2020-06-12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | notification-unification-experiments
| * | | | | NotificationUtils: Add tag to notifications.lain2020-06-11
| | | | | |
| * | | | | ServiceWorker: Don't show message via sw if a client is active.lain2020-06-11
| | | | | |
| * | | | | ServiceWorker: Grab the notification and display it with i18n.lain2020-06-11
| | | | | |
| * | | | | NotificationUtils: Extract preparation of notification object.lain2020-06-11
| | | | | |
* | | | | | Merge branch 'fix-username-emoji' into 'develop'HJ2020-06-19
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | fix huge emoji in usernames See merge request pleroma/pleroma-fe!1151