aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into developMaksim Pechnikov2020-02-10
|\
| * Merge branch 'move-type-notification' into 'develop'Shpuld Shpludson2020-02-10
| |\ | | | | | | | | | | | | | | | | | | Add setting for allow following move Closes #732 See merge request pleroma/pleroma-fe!1054
| | * Add option textkPherox2020-02-04
| | |
| | * Add `with_move` param for fetching notificationkPherox2020-02-04
| | |
| | * Change to hide User migrates tab when allow following movekPherox2020-02-04
| | |
| | * Add setting for allow_following_movekPherox2020-02-04
| | |
| * | Merge branch 'feature-collapsed-media-indicator' into 'develop'Shpuld Shpludson2020-02-10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Indicate whether collapsed statuses contain gallery media or link preview cards Closes #767 See merge request pleroma/pleroma-fe!1056
| | * | Include non-gallery attachments and distinguish between images and videosxenofem2020-02-08
| | | |
| | * | Indicate whether collapsed statuses contain gallery media or link preview cardsxenofem2020-02-08
| | | |
| * | | Merge branch 'feature/mrf-keyword-policy-disclosure' into 'develop'Shpuld Shpludson2020-02-10
| |\ \ \ | | |/ / | |/| | | | | | | | | | MRF Keyword Policy Disclosure See merge request pleroma/pleroma-fe!1055
| | * | MRF Keyword Policy DisclosureHakaba Hitoyo2020-02-10
| |/ /
| * | Merge branch 'fix/escape-html' into 'develop'feld2020-02-06
| |\ \ | | |/ | |/| | | | | | | | | | | | | Escape HTML from display name and subject fields Closes #724 See merge request pleroma/pleroma-fe!1052
| | * Escape HTML from display name and subject fieldsrinpatch2020-01-30
| | | | | | | | | | | | Closes #724
* | | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into developMaksim Pechnikov2020-02-04
|\| |
| * | Merge branch 'fix/one-click-nsfw-videos' into 'develop'HJ2020-01-31
| |\ \ | | |/ | |/| | | | | | | Fix one click nsfw unhide on videos See merge request pleroma/pleroma-fe!1053
| | * Fix one click nsfw unhide on videosShpuld Shpludson2020-01-31
| |/
| * add emoji reactions to changelogShpuld Shpuldson2020-01-28
| |
| * fix emoji reaction classes broken in developShpuld Shpuldson2020-01-28
| |
| * Merge branch 'feat/emoji-reactions' into 'develop'lain2020-01-28
| |\ | | | | | | | | | | | | Emoji reactions See merge request pleroma/pleroma-fe!1049
| | * review changesShpuld Shpuldson2020-01-28
| | |
| | * Merge branch 'feat/emoji-reactions' of git.pleroma.social:pleroma/pleroma-fe ↵Shpuld Shpuldson2020-01-27
| | |\ | | | | | | | | | | | | into feat/emoji-reactions
| | | * Apply suggestion to src/services/api/api.service.jslain2020-01-27
| | | |
| | * | remove unnecessary anonymous functionShpuld Shpuldson2020-01-27
| | |/
| | * remove logs/commented codeShpuld Shpuldson2020-01-27
| | |
| | * remove favs count from react buttonShpuld Shpuldson2020-01-26
| | |
| | * Merge branch 'develop' into feat/emoji-reactionsShpuld Shpuldson2020-01-26
| | |\
| | * | remove mock dataShpuld Shpuldson2020-01-26
| | | |
| | * | change emoji reactions to use new formatShpuld Shpuldson2020-01-26
| | | |
| | * | clean up code, fix prediction bugShpuld Shpuldson2020-01-14
| | | |
| | * | fix merge conflictsShpuld Shpuldson2020-01-13
| | |\ \
| | * | | usable-but-buggy: picker, adding/removing reaction on click, search, stylesShpuld Shpuldson2020-01-13
| | | | |
| | * | | wip commit, add basic popover for emoji reaction selectShpuld Shpuldson2019-11-15
| | | | |
| | * | | add fetching for emoji reactions, draft designShpuld Shpuldson2019-11-15
| | | | |
| * | | | Merge branch 'fix-password-and-email-update' into 'develop'HJ2020-01-28
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Fix email and password forms in user settings See merge request pleroma/pleroma-fe!1050
| | * | | Fix password and email updateeugenijm2020-01-28
| |/ / /
| * | | Merge branch 'event-target-fix' into 'develop'HJ2020-01-24
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Polyfills for EventTarget and CustomEvent Closes #756 See merge request pleroma/pleroma-fe!1048
| | * | | Added polyfills for EventTarget (needed for Safari) and CustomEvent (needed ↵eugenijm2020-01-24
| |/ / / | | | | | | | | | | | | for IE)
| * | | Merge branch 'fix/federated-timeline-when-private-mode' into 'develop'HJ2020-01-23
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing TWKN when logged in, but server is set to private mode. Closes #759 See merge request pleroma/pleroma-fe!1047
| | * | | Fix missing TWKN when logged in, but server is set to private mode.Mark Felder2020-01-23
| |/ / /
| * | | Merge branch 'fix-follow-requests' into 'develop'Shpuld Shpludson2020-01-21
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix follower request fetching Closes pleroma#1523 and #757 See merge request pleroma/pleroma-fe!1046
| | * | | Fix follower request fetchinglain2020-01-21
| |/ / /
| * | | Add domain mutes to changelogShpuld Shpuldson2020-01-15
| | | |
| * | | Merge branch 'tae/pleroma-fe-663' into 'develop'Shpuld Shpludson2020-01-15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Implement domain mutes v2 See merge request pleroma/pleroma-fe!1045
| | * | | Implement domain mutes v2Shpuld Shpludson2020-01-15
| |/ / /
| * | | Merge branch '736' into 'develop'Shpuld Shpludson2020-01-15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "Follow button is out of sync in the about page" Closes #736 See merge request pleroma/pleroma-fe!1035
| | * | | wire up staff accounts with correct store datataehoon2019-12-15
| | | | |
* | | | | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into developMaksim Pechnikov2020-01-14
|\| | | |
| * | | | change changelog to reflect actual release history of frontendShpuld Shpuldson2020-01-14
| | | | |
| * | | | Merge branch 'fix/registration-backend-interactor-fix' into 'develop'Shpuld Shpludson2020-01-14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #750 , fix error messages and captcha resetting Closes #750 See merge request pleroma/pleroma-fe!1042
| | * | | | Fix #750 , fix error messages and captcha resettingShpuld Shpludson2020-01-14
| |/ / / /