aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Always open tag in same instanceEdijs2019-02-06
|
* Hashtag opens in same tabEdijs2019-02-06
|
* 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
| | |
| * | Use a correct avatar placeholder imagetaehoon2019-02-02
| | |
| * | Show placeholder image if avatar image url is brokentaehoon2019-02-02
| | |
* | | Merge branch 'fix/conversation-arrow-smushed-in-notifications-panel' into ↵Shpuld Shpludson2019-02-03
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'develop' #306 - fix conversation arrow smushed in notifications panel See merge request pleroma/pleroma-fe!513
| * | | #306 - fix conversation arrow smushed in notifications panelXiaofeng An2019-02-03
| | | |
| * | | Revert "#306 - fix conversation arrow smushed in notifications panel"Xiaofeng An2019-02-03
| | | | | | | | | | | | | | | | This reverts commit 1e40e70efc64071581adff4bce3c8bf78da82acb.
| * | | #306 - fix conversation arrow smushed in notifications panelXiaofeng An2019-02-02
| | | |
* | | | Merge branch 'revert-886aa35e' into 'develop'Shpuld Shpludson2019-02-03
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'feature/split-hide-network' into 'develop'" See merge request pleroma/pleroma-fe!514
| * | | | Revert "Merge branch 'feature/split-hide-network' into 'develop'"Shpuld Shpludson2019-02-03
|/ / / / | | | | | | | | This reverts merge request !497
| | | * Combine friends/followersshpuld2019-02-03
| | | |
| | | * merge develop inshpuld2019-02-03
| | | |\ | |_|_|/ |/| | |
* | | | Merge branch '238-add-avatar-size-suggestion' into 'develop'Shpuld Shpludson2019-02-03
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add avatar size instruction notice Closes #238 See merge request pleroma/pleroma-fe!512
| * | | | Add avatar size instruction noticetaehoon2019-02-02
| | |/ / | |/| |
* | | | Merge branch 'fix/default-inlined-videos' into 'develop'Shpuld Shpludson2019-02-03
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Change video playing default without bothering making it an instance configurable See merge request pleroma/pleroma-fe!505
| * | | Change video playing default without bothering making it an instance ↵shpuld2019-01-31
| | | | | | | | | | | | | | | | configurable
* | | | Merge branch 'fix-max-id-for-notifications' into 'develop'HJ2019-02-02
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix incorrect latest_id value in notifications_read request See merge request pleroma/pleroma-fe!509
| * | | | Use integer type of notitication ids (avoid redundant casting for getting ↵eugenijm2019-02-02
| | | | | | | | | | | | | | | | | | | | maxId in addNewNotifications)
| * | | | Explicitly cast notification ids to integers when using them for setting maxIdeugenijm2019-02-02
| |/ / / | | | | | | | | | | | | | | | | This fixes the bug where BE receives incorrect `since_id` when marking notifications as read.
* | | | Merge branch 'fix/repeats-dont-show-any-name-if-display-name-is-empty' into ↵Shpuld Shpludson2019-02-02
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 'develop' fix #157 show screen_name when name is empty in retweet Closes #157 See merge request pleroma/pleroma-fe!508