aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* Merge branch '227-manage-blocks-mutes' into 'develop'Shpuld Shpludson2019-02-22
|\ | | | | | | | | Add Blocks / Mutes management tabs under user settings page See merge request pleroma/pleroma-fe!578
| * Remove needless codetaehoon2019-02-21
| |
| * Use Object.entries instead of Object.keystaehoon2019-02-20
| |
| * Comment out the mutes tabtaehoon2019-02-20
| |
| * Remove needless csstaehoon2019-02-20
| |
| * Fix indenttaehoon2019-02-20
| |
| * Add missing translation stringstaehoon2019-02-20
| |
| * Remove pagination logic in fetchBlocks apitaehoon2019-02-20
| |
| * Add new strings to i18ntaehoon2019-02-20
| |
| * Add note for empty state to the lists using slottaehoon2019-02-20
| |
| * Minor css improvements of hocstaehoon2019-02-20
| |
| * Pass down slots into wrapped componentstaehoon2019-02-20
| |
| * Rename some options and add comments to HOCstaehoon2019-02-20
| |
| * Improve chaining hocs using vue-composetaehoon2019-02-20
| |
| * Use hoc definitions to be factor of factorytaehoon2019-02-20
| |
| * Just save blocks/mutes instead of addingtaehoon2019-02-20
| |
| * Set blockIds and muteIds to the currentUser state onlytaehoon2019-02-20
| |
| * Add mutes tabtaehoon2019-02-20
| |
| * Add a prop to force-refresh data to withSubscription hoctaehoon2019-02-20
| |
| * Remove pagination support from block-listtaehoon2019-02-20
| |
| * Add withSubscription hoctaehoon2019-02-20
| |
| * Update hocs to pass parent-scope bindings to the wrapped componenttaehoon2019-02-20
| |
| * Complete functionality of BlockCardtaehoon2019-02-20
| |
| * Finally, added BlockCardtaehoon2019-02-20
| |
| * Update BasicUserCard template and add a slot for customizationtaehoon2019-02-20
| |
| * Add withList hoc and remove UserList componenttaehoon2019-02-20
| |
| * Wire up ui to real blocks api datataehoon2019-02-20
| |
| * Add blocks tab with test data to user settings pagetaehoon2019-02-20
| |
| * Add reusable BasicUserCard and UserList componentstaehoon2019-02-20
| |
| * Add withLoadMore hoctaehoon2019-02-20
| |
* | bad defaultsHenry Jameson2019-02-21
| |
* | Merge branch 'issue-376-no-statuses' into 'develop'Shpuld Shpludson2019-02-21
|\ \ | | | | | | | | | | | | | | | | | | #376: update status timeline when it's empty Closes #376 See merge request pleroma/pleroma-fe!601
| * | #376: update status timeline when it's emptydave2019-02-20
| |/
* / #383: content type errordave2019-02-21
|/
* Merge branch 'issue-371-user-setting-notification' into 'develop'Shpuld Shpludson2019-02-20
|\ | | | | | | | | | | | | #371: show notification when user setting's saved Closes #371 See merge request pleroma/pleroma-fe!598
| * #371: show notification when user setting's saveddave2019-02-19
| |
* | Merge branch 'fix/follow-list' into 'develop'Shpuld Shpludson2019-02-20
|\ \ | | | | | | | | | | | | | | | | | | Watch user change in follow-list Closes #360 See merge request pleroma/pleroma-fe!584
| * | watch only userEdijs2019-02-14
| | |
| * | Watch user change in follow-listEdijs2019-02-14
| | |
* | | #377: no exteral profile link for local usersdave2019-02-19
| | |
* | | Merge branch 'issue-364-register-freeze' into 'develop'Shpuld Shpludson2019-02-19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | #364: update ap_id error with username Closes #364 See merge request pleroma/pleroma-fe!597
| * | | #364: update ap_id error with usernamedave2019-02-19
| | | |
* | | | Merge branch 'issue-344-css-refactor' into 'develop'Shpuld Shpludson2019-02-19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | #344 - replace float: with flexbox, clean up See merge request pleroma/pleroma-fe!566
| * | | | #344 - replace float: with flexbox, clean updave2019-02-11
| | | | |
* | | | | Merge branch 'follow-requests-for-locked-accounts' into 'develop'Shpuld Shpludson2019-02-19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Follow Request notification count for restricted accounts See merge request pleroma/pleroma-fe!561
| * | | | | Added follow requests counter to nav bar to make it visible behorehandeugenijm2019-02-15
| | | | | |
* | | | | | Merge branch 'tae-hoon/pleroma-fe-323-improve-image-lightbox' into developshpuld2019-02-19
|\ \ \ \ \ \
| * | | | | | Clean up CSS a bitshpuld2019-02-19
| | | | | | |
| * | | | | | Use correct syntax for pseudoelementtaehoon2019-02-11
| | | | | | |
| * | | | | | Add translation stringstaehoon2019-02-10
| | | | | | |