| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Update oc.json | Exilat | 2019-05-01 |
| | | |||
| * | Merge branch ↵ | HJ | 2019-04-30 |
| |\ | | | | | | | | | | | | | 'brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users' into 'develop' Show favoriting and repeating users in hilighted status See merge request pleroma/pleroma-fe!768 | ||
| | * | Merge branch 'develop' into ↵ | Shpuld Shpludson | 2019-04-30 |
| | |\ | |/ |/| | | | | | | | 'brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users' # Conflicts: # src/services/api/api.service.js | ||
| * | | Merge branch '437-user-profile-settings' into 'develop' | HJ | 2019-04-30 |
| |\ \ | | | | | | | | | | | | | | | | | | | Transition to MastoAPI: user profile settings Closes #437 See merge request pleroma/pleroma-fe!682 | ||
| | * | | use default_scope parameter | taehoon | 2019-04-27 |
| | | | | |||
| | * | | use json content type | taehoon | 2019-04-27 |
| | | | | |||
| | * | | clean up | taehoon | 2019-04-27 |
| | | | | |||
| | * | | Update avatar uploading | taehoon | 2019-04-27 |
| | | | | |||
| | * | | Switch to mastoapi for updating user profile | taehoon | 2019-04-27 |
| | | | | |||
| | * | | Switch to mastoapi for updating banner | taehoon | 2019-04-27 |
| | | | | |||
| | * | | Switch to mastoapi for updating avatar | taehoon | 2019-04-27 |
| | | | | | | | | | | | | | | | | # Conflicts: # src/services/api/api.service.js | ||
| * | | | Merge branch '220-import-export-blocks-mutes' into 'develop' | HJ | 2019-04-29 |
| |\ \ \ | | | | | | | | | | | | | | | | | Allow import/export of blocks See merge request pleroma/pleroma-fe!717 | ||
| | * | | | add a comment | taehoon | 2019-04-29 |
| | | | | | |||
| | * | | | refactoring | taehoon | 2019-04-27 |
| | | | | | |||
| | * | | | add “export blocks” feature | taehoon | 2019-04-27 |
| | | | | | |||
| | * | | | fix wrong function binding | taehoon | 2019-04-27 |
| | | | | | |||
| | * | | | make reusable Exporter component | taehoon | 2019-04-27 |
| | | | | | |||
| | * | | | add “block import” feature | taehoon | 2019-04-27 |
| | | | | | |||
| | * | | | change api function name | taehoon | 2019-04-27 |
| | | | | | |||
| | * | | | make Importer component reusable | taehoon | 2019-04-27 |
| | | | | | |||
| | * | | | add uploading icon css | taehoon | 2019-04-27 |
| | | | | | |||
| | * | | | move formData generating logic to api.service | taehoon | 2019-04-27 |
| | | | | | |||
| | * | | | split out follow’s importer as a separate component | taehoon | 2019-04-27 |
| | |/ / | |||
| * | | | Merge branch '509' into 'develop' | HJ | 2019-04-29 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | Show ellipsis for long user name and screen name Closes #509 See merge request pleroma/pleroma-fe!775 | ||
| | * | | remove & | taehoon | 2019-04-29 |
| | | | | |||
| | * | | show ellipsis for long user name and screen name | taehoon | 2019-04-29 |
| |/ / | |||
| * | | Merge branch 'bugfix/in-reply-to-account-acct' into 'develop' | HJ | 2019-04-27 |
| |\ \ | | | | | | | | | | | | | entity normalizer: hook up in_reply_to_account_acct See merge request pleroma/pleroma-fe!773 | ||
| | * | | entity normalizer: hook up in_reply_to_account_acct | William Pitcock | 2019-04-27 |
| |/ / | |||
| * | | Merge branch 'strings/bbcode' into 'develop' | kaniini | 2019-04-26 |
| |\ \ | | | | | | | | | | | | | add BBCode strings See merge request pleroma/pleroma-fe!772 | ||
| | * | | add BBCode strings | William Pitcock | 2019-04-26 |
| |/ / | |||
| * | | Merge branch '492' into 'develop' | HJ | 2019-04-25 |
| |\ \ | | | | | | | | | | | | | | | | | | | Fix Follow/Mute/Block not functional issue in the user search page Closes #492 See merge request pleroma/pleroma-fe!754 | ||
| | * | | fix follow button not updating bug in follow-card | taehoon | 2019-04-22 |
| | | | | |||
| | * | | refer searched user objects from the global user rep | taehoon | 2019-04-22 |
| |/ / | |||
| | * | filter outside of component | shpuld | 2019-04-29 |
| | | | |||
| | * | fix i18n | shpuld | 2019-04-22 |
| | | | |||
| | * | fix overflow behavior | shpuld | 2019-04-22 |
| | | | |||
| | * | Merge branch 'develop' into ↵ | shpuld | 2019-04-22 |
| | |\ | |/ |/| | | | brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users | ||
| * | | Merge branch '500' into 'develop' | Shpuld Shpludson | 2019-04-22 |
| |\ \ | | | | | | | | | | | | | | | | | | | Set max-width of textarea in settings page Closes #500 See merge request pleroma/pleroma-fe!761 | ||
| | * | | set max-width of textarea in settings page | taehoon | 2019-04-21 |
| | | | | |||
| * | | | Merge branch '487' into 'develop' | Shpuld Shpludson | 2019-04-22 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken Follow Export Closes #487 See merge request pleroma/pleroma-fe!762 | ||
| | * | | | fetch all friends using pagination | taehoon | 2019-04-19 |
| | |/ / | |||
| * | | | Merge branch 'develop' into 'develop' | Shpuld Shpludson | 2019-04-22 |
| |\ \ \ | | | | | | | | | | | | | | | | | [i18n] Update for Occitan language See merge request pleroma/pleroma-fe!765 | ||
| | * | | | Update oc.json | Exilat | 2019-04-20 |
| | | | | | |||
| | * | | | Update oc.json | Exilat | 2019-04-20 |
| | | | | | |||
| | * | | | Update oc.json | Exilat | 2019-04-20 |
| | | | | | |||
| | * | | | Update oc.json | Exilat | 2019-04-20 |
| | |/ / | |||
| * | | | Merge branch '501' into 'develop' | Shpuld Shpludson | 2019-04-22 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove space in the timeline setting copy Closes #501 See merge request pleroma/pleroma-fe!763 | ||
| | * | | | Remove space in the timeline setting copy | taehoon | 2019-04-21 |
| | |/ / | |||
| * | | | Merge branch 'change-pencil-to-wrentch' into 'develop' | Shpuld Shpludson | 2019-04-22 |
| |\ \ \ | | | | | | | | | | | | | | | | | Change pencil icon to wrentch See merge request pleroma/pleroma-fe!764 | ||
| | * | | | replace pencil with wrench icon | Brenden Bice | 2019-04-19 |
| | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/components/user_card/user_card.vue | ||
