aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* Merge branch '287-following-followers-tabs' into 'develop'Shpuld Shpludson2019-02-07
|\ | | | | | | | | | | | | Hide Following/Followers tabs if user has them disabled Closes #287 See merge request pleroma/pleroma-fe!515
| * Fix namingtaehoon2019-02-07
| |
| * Show back followees/followers countstaehoon2019-02-07
| |
| * Always show my own followees/followerstaehoon2019-02-07
| |
| * Hide followers and followees tabs when they are disabledtaehoon2019-02-07
| |
* | Merge branch 'feature/add-an-option-for-a-default-formatting' into 'develop'Shpuld Shpludson2019-02-07
|\ \ | |/ |/| | | | | #301 - add an option for a default formatting See merge request pleroma/pleroma-fe!541
| * Merge branch 'develop' into feature/add-an-option-for-a-default-formattingXiaofeng An2019-02-06
| |\
| * | #301 - add an option for default formattingXiaofeng An2019-02-06
| | |
* | | Merge branch 'issue-315-csv-export' into 'develop'Shpuld Shpludson2019-02-07
|\ \ \ | | | | | | | | | | | | | | | | #315 - export all follows as CSV See merge request pleroma/pleroma-fe!538
| * | | #315 - revert changesdave2019-02-07
| | | |
| * | | #315 - separate export and fetch follows logicdave2019-02-07
| | | |
| * | | #315 - clean up the requestdave2019-02-06
| | | |
| * | | #315 - export all follows as CSVdave2019-02-06
| |/ /
* | | 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
| | | |
* | | | 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 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
| | |
| * | #312 - media uploader not working with same file in adjacent orderdave2019-02-04
| | |