aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* #137 - add red heart emojidave2019-02-07
|
* Merge branch 'english-login' into 'develop'Shpuld Shpludson2019-02-07
|\ | | | | | | | | Grammar See merge request pleroma/pleroma-fe!542
| * GrammarMark Felder2019-02-06
|/
* Fix repeater html not showing properlyshpuld2019-02-06
|
* Merge branch 'fix/create-a-login-hint-on-mobile' into 'develop'Shpuld Shpludson2019-02-06
|\ | | | | | | | | | | | | create a login hint on mobile Closes #308 See merge request pleroma/pleroma-fe!530
| * remove unnecessary divXiaofeng An2019-02-06
| |
| * move login hint into the main contentXiaofeng An2019-02-06
| |
| * Merge branch 'develop' into fix/create-a-login-hint-on-mobileXiaofeng An2019-02-06
| |\
| * | move hint inside Timeline componentXiaofeng An2019-02-05
| | |
| * | fix #308 - hide login hint on desktopXiaofeng An2019-02-05
| | |
| * | fix #308 - show login hint above timeline when user is not logged inXiaofeng An2019-02-05
| | |
* | | Merge branch 'feature/split-hide-network-fixed' into 'develop'Shpuld Shpludson2019-02-06
|\ \ \ | |_|/ |/| | | | | | | | Split hide_network into hide_followers & hide_followings See merge request pleroma/pleroma-fe!536
| * | Rename "hide_following" to "hide_follows"Maxim Filippov2019-02-06
| | |
| * | Split hide_network into hide_followers & hide_followingsMaxim Filippov2019-02-06
| | |
* | | Merge branch 'patch-1' into 'develop'Shpuld Shpludson2019-02-06
|\ \ \ | | | | | | | | | | | | | | | | Update es.json See merge request pleroma/pleroma-fe!535
| * | | Update es.jsontarteka2019-02-05
| | | |
* | | | Merge branch 'fix/add-option-to-hide-features-panel' into 'develop'Shpuld Shpludson2019-02-06
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Add option to hide features panel See merge request pleroma/pleroma-fe!529
| * | | Add option to hide features panel (About page)dev923412019-02-05
| | | |
| * | | Add option to hide features paneldev923412019-02-05
| | | |
| * | | Add option to hide features paneldev923412019-02-05
| | | |
* | | | Merge branch 'fix/avatar-link' into 'develop'HJ2019-02-05
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Fix avatar link in search result See merge request pleroma/pleroma-fe!534
| * | | Fix avatar link in search resultEdijs2019-02-05
|/ / /
* | | Merge branch 'issue-316-empty-username' into 'develop'Shpuld Shpludson2019-02-05
|\ \ \ | |_|/ |/| | | | | | | | #316 - fix empty username issue See merge request pleroma/pleroma-fe!531
| * | #316 - fix empty username issuedave2019-02-05
| | |
* | | Merge branch 'issue-138-html-escaping' into 'develop'Shpuld Shpludson2019-02-05
|\ \ \ | |/ / |/| | | | | | | | #138 - escape html entities in BIO text See merge request pleroma/pleroma-fe!522
| * | #138 - fix lint errordave2019-02-04
| | |
| * | #138 - unescape user biodave2019-02-04
| | |
| * | #138 - escape html entities in BIO textdave2019-02-04
| |/
* / Fix mishandled @error in stillImageshpuld2019-02-05
|/
* Merge branch '309-add-logo-to-hamburger-menu' into 'develop'Shpuld Shpludson2019-02-04
|\ | | | | | | | | | | | | Add logo and sitename to the side drawer area Closes #309 See merge request pleroma/pleroma-fe!517
| * Do not use BEMtaehoon2019-02-04
| |
| * Improve readability using v-if and v-elsetaehoon2019-02-04
| |
| * Show logo/sitename in the side drawer only if logged outtaehoon2019-02-04
| |
| * Add logo and sitename to the side drawer areataehoon2019-02-04
| |
* | Merge branch 'feat/follows-following-pagination' into 'develop'Shpuld Shpludson2019-02-04
|\ \ | |/ |/| | | | | Follows + followers pagination #285 See merge request pleroma/pleroma-fe!510
| * merge develop and fix conflicts AGAINshpuld2019-02-04
| |\ | |/ |/|
* | Merge branch 'issue-154-shorten-cw-subject' into 'develop'Shpuld Shpludson2019-02-04
|\ \ | | | | | | | | | | | | | | | | | | Issue #154 shorten subject Closes #154 See merge request pleroma/pleroma-fe!520
| * | #154 - update long subject determine logic, meaningful variable namesdave2019-02-04
| | |
| * | handle poster attachment with tall subjectsdave2019-02-04
| | |
| * | shorten incredibly long content warning or subjectdave2019-02-03
| | |
* | | Merge branch 'issue-312-media-upload' into 'develop'Shpuld Shpludson2019-02-04
|\ \ \ | | | | | | | | | | | | | | | | #312 - media uploader not working with same file in adjacent order See merge request pleroma/pleroma-fe!521
| * | | #312 - media uploader not working with same file in adjacent orderdave2019-02-04
|/ / /
* | | Merge branch 'fix/user-links-not-replaced-with-router-links-in-repeats' into ↵Shpuld Shpludson2019-02-04
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'develop' #307 - replace user links with router links in repeats See merge request pleroma/pleroma-fe!516
| * | | #307 - replace user links with router links in repeatsXiaofeng An2019-02-03
| |/ /
* | | Merge branch '275-avatar-placeholder' into 'develop'Shpuld Shpludson2019-02-04
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Support avatar placeholder Closes #275 See merge request pleroma/pleroma-fe!511
| * | Use an existing image served by backend insteadtaehoon2019-02-03
| | |
| * | Fix class ordering issues related to avatartaehoon2019-02-02
| | |
| * | Improve reusability of UserAvatar componenttaehoon2019-02-02
| | |
| * | Move avatar css into a correct placetaehoon2019-02-02
| | |
| * | Migrate StillImage to UserAvatar for avatarstaehoon2019-02-02
| | |