aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* Merge branch '227-manage-blocks-mutes' into 'develop'HJ2019-03-24
|\ | | | | | | | | Transition to MastoAPI: Mute & Block and Add Mutes management tab See merge request pleroma/pleroma-fe!611
| * Revert changestaehoon2019-03-24
| |
| * No need to fetch mutes on load anymore 🙌taehoon2019-03-21
| |
| * switch to mastoapitaehoon2019-03-21
| |
| * switch to mastoapitaehoon2019-03-21
| |
| * masto api sends muted property nowtaehoon2019-03-21
| |
| * No need to fetch user data using old api anymore 🎉taehoon2019-03-21
| |
| * Switch to mastoapitaehoon2019-03-21
| |
| * Add commenttaehoon2019-03-21
| |
| * Reset statusnet_blocking of all fetched users first while refreshing block listtaehoon2019-03-21
| |
| * Add hideMutedPosts setting and wire up to post-returning endpointstaehoon2019-03-21
| |
| * Add todo commenttaehoon2019-03-21
| |
| * Minor code refactoringtaehoon2019-03-21
| |
| * Improve fetch error handling using a utiltaehoon2019-03-21
| |
| * Reset old mutes state after fetching new mutes datataehoon2019-03-21
| |
| * Remove old muting logictaehoon2019-03-21
| |
| * Update MuteCard uitaehoon2019-03-21
| |
| * Fetct full data of muted users after fetchMutes api calltaehoon2019-03-21
| |
| * Add mute/unmute mutationstaehoon2019-03-21
| |
| * Add mute/unmute featrue and mutes management tabtaehoon2019-03-21
| |
* | Merge branch 'issue-448-status-text-null' into 'develop'Shpuld Shpludson2019-03-23
|\ \ | | | | | | | | | | | | | | | | | | #448 - fix timeline fetch error when status text is null Closes #448 See merge request pleroma/pleroma-fe!700
| * | #448 - fix timeline fetch error when status text is nulldave2019-03-22
| |/
* | Merge branch 'issue-452-unfollow-button' into 'develop'Shpuld Shpludson2019-03-23
|\ \ | | | | | | | | | | | | | | | | | | #452 - unfollow button issue Closes #452 See merge request pleroma/pleroma-fe!698
| * | #452 - update button class namedave2019-03-21
| | |
| * | #452 - unfollow button issuedave2019-03-21
| |/
* | Merge branch 'issue-451-long-user-name' into 'develop'Shpuld Shpludson2019-03-23
|\ \ | | | | | | | | | | | | | | | | | | #451 - long username on follow/follower tabs Closes #451 See merge request pleroma/pleroma-fe!697
| * | #451 - add class to username spandave2019-03-22
| | |
| * | #451 - update stylingdave2019-03-21
| | |
| * | #451 - long username on follow/follower tabsdave2019-03-21
| | |
* | | Merge branch '438-mastoapi-user-search' into 'develop'lambda2019-03-22
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Transition to MastoAPI: user search Closes #438 See merge request pleroma/pleroma-fe!677
| * | Switch to mastoapi for user searchtaehoon2019-03-15
| | |
* | | Merge branch 'issue-449-auto-token-fetch' into 'develop'Shpuld Shpludson2019-03-21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | #449 - fix auth token fetch issue Closes #449 See merge request pleroma/pleroma-fe!696
| * | | #449 - fix auth token fetch issuedave2019-03-21
| | |/ | |/|
* | | Merge branch 'issue-444-remote-follow' into 'develop'Shpuld Shpludson2019-03-21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | #444 - show `remote follow` button when logged out Closes #444 See merge request pleroma/pleroma-fe!692
| * | | #444 - remote follow clean updave2019-03-19
| | | |
| * | | #444 - show `remote follow` button when logged outdave2019-03-19
| | | |
* | | | Merge branch 'feature/bypass-avatar-cropper' into 'develop'Shpuld Shpludson2019-03-21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #443 Add button to save without cropping Closes #443 See merge request pleroma/pleroma-fe!691
| * | | | Add button to save without croppingjasper2019-03-18
| |/ / /
* | | | Merge branch 'patch-2' into 'develop'Shpuld Shpludson2019-03-21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | [i18n] Update oc.json See merge request pleroma/pleroma-fe!684
| * | | | [i18n] Update oc.jsonExilat2019-03-15
| | |_|/ | |/| |
* | | | Merge branch 'develop' into 'develop'Shpuld Shpludson2019-03-21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixing typos and badly translated strings (Portuguese) See merge request pleroma/pleroma-fe!676
| * | | | fixing typos and badly translated stringsRond2019-03-11
| | | | |
* | | | | Merge branch 'feature/version-info' into 'develop'Shpuld Shpludson2019-03-21
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Added new tab to display versions of BE/FE Closes #397 See merge request pleroma/pleroma-fe!671
| * | | | Merge branch 'develop' into feature/version-infoEdijs2019-03-13
| |\ \ \ \
| * | | | | Code refactoringEdijs2019-03-10
| | | | | |
| * | | | | Version links to BE/FEEdijs2019-03-10
| | | | | |
| * | | | | Added new tab to display versions of BE/FEEdijs2019-03-10
| | | | | |
* | | | | | Make select tag use --inputText as text colorMarcin Mikołajczak2019-03-20
| |_|_|_|/ |/| | | |
* | | | | post-merge fixesHenry Jameson2019-03-17
| | | | |
* | | | | Merge remote-tracking branch 'upstream/develop' into mastoapi/emojisHenry Jameson2019-03-17
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (34 commits) after store: fix setting postFormats field fix user-card avatar falling into permament failed state fix flake id users not fetching correctly fix console error afterStoreSetup: Move log in and theme load to afterStoreSetup. afterStoreSetup: Handle 404 cases. afterStoreSetup: Emoji and nodeinfo refactor. afterStoreSetup: refactor TOS and panel fetching, handle 404s. afterStoreSetup: refactor. Load persistedStated with async/await. whoops レインせんぱいにサンキュー fix embedded relationship card parsing actually use embedded relationship if it's present instead of filtering nulls, let's just not have them in the first place #434 - fix plain text issue Add floating post-status button on mobile Update user settings icon to pencil I18n: Update Czech translation user_card.vue: Copy over .status-content img styling ...