aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* Merge branch 'develop' into fix/hashtag-openingEdijs2019-02-10
|\
| * Merge branch 'fix/subject-copying-composition-bug' into 'develop'Shpuld Shpludson2019-02-09
| |\ | | | | | | | | | | | | #326 Subject copying composition bug See merge request pleroma/pleroma-fe!550
| | * Switch into Lodashjasper2019-02-09
| | |
| | * Switch into Lodashjasper2019-02-09
| | |
| | * Subject copying composition bugjasper2019-02-08
| | |
| * | Add quick css fix for user profile bg img previewjo2019-02-09
| | |
| * | Merge branch 'patch-2' into 'develop'Shpuld Shpludson2019-02-09
| |\ \ | | | | | | | | | | | | | | | | Update spanish translate See merge request pleroma/pleroma-fe!549
| | * | Update spanish translatetarteka2019-02-08
| | | |
| * | | Merge branch 'fix/js-error-in-tag-page' into 'develop'Shpuld Shpludson2019-02-09
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Fixed JS error in tag page See merge request pleroma/pleroma-fe!543
| | * | | Code refactoringEdijs2019-02-07
| | | | |
| | * | | Fix issue while fetching timelines for tag pageEdijs2019-02-06
| | | | |
| | * | | TypoEdijs2019-02-06
| | | | |
| * | | | Merge branch 'fix/add-option-to-hide-filtered-statues' into 'develop'Shpuld Shpludson2019-02-09
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | #254 Add option to hide filtered statuses See merge request pleroma/pleroma-fe!539
| | * | | | Add option to hide filtered statusesjasper2019-02-08
| | | | | |
| | * | | | Add option to hide filtered statusesjasper2019-02-08
| | | | | |
| | * | | | Add german translation for option labeljasper2019-02-06
| | | | | |
| | * | | | Add option to hide filtered statusesjasper2019-02-06
| | | |_|/ | | |/| |
| * | | | fixing conflictsjasper2019-02-08
| | | | |
| * | | | fixing conflictsjasper2019-02-08
| | | | |
| * | | | Fxing conflictsjasper2019-02-08
| |\ \ \ \
| | * | | | #291 - fixed typodave2019-02-08
| | | | | |
| | * | | | #291 - remove whitespacedave2019-02-08
| | | | | |
| | * | | | #291 - enable media/favorite tabs with prefetched datadave2019-02-08
| | | | | |
| | * | | | #291 - disable empty tabs in user profile paneldave2019-02-08
| | | |_|/ | | |/| |
| | * | | Merge branch 'add-admin-and-moderator-fields-to-user-card-view' into 'develop'HJ2019-02-07
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add admin and moderator indicators to the user profile See merge request pleroma/pleroma-fe!519
| | | * | | Update user settings text: staff badges are only visible in user profileeugenijm2019-02-08
| | | | | | | | | | | | | | | | | | | | | | | | Use capitalized text in badges
| | | * | | Make role badge visible only on user profile pageeugenijm2019-02-06
| | | | | |
| | | * | | Add theming support for admin/moderator badgeseugenijm2019-02-06
| | | | | |
| | | * | | Refactor visibleRole for better readabilityeugenijm2019-02-06
| | | | | | | | | | | | | | | | | | | | | | | | Improve translation
| | | * | | Allow to configure visibility for admin and moderator badgeseugenijm2019-02-06
| | | | | |
| | | * | | Add admin and moderator indicators to the user cardeugenijm2019-02-06
| | | |/ /
| | * | | 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
| | | |\