aboutsummaryrefslogtreecommitdiff
path: root/src/components
Commit message (Collapse)AuthorAge
* Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵dave2019-03-28
|\ | | | | | | issue-433-status-reply-form
| * Apparently, MastoAPI gives status in ancestors if you try opening a repeat...Henry Jameson2019-03-27
| |
* | #433 - sort conversation for retweets and clean updave2019-03-27
| |
* | Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵dave2019-03-27
|\| | | | | | | issue-433-status-reply-form
| * Merge branch 'issue-442-placeholder-fix' into 'develop'HJ2019-03-25
| |\ | | | | | | | | | | | | | | | | | | #442 - clean up Bio placeholder text Closes #442 See merge request pleroma/pleroma-fe!689
| | * #442 - update placeholder linebreakdave2019-03-18
| | |
* | | #433 - fix retweet abnormal behaviordave2019-03-25
| | |
* | | #433 - consider page on focuseddave2019-03-25
| | |
* | | #433 - remove needless nesting/bloatingdave2019-03-25
| | |
* | | #433 - Fix conversation page highlight, fetch conversation on converation pagedave2019-03-25
| | |
* | | Resolve merge conflict,dave2019-03-25
|\| | | | | | | | | | | Fix few issues (conversation page highlight, fetch conversation, ...)
| * | reviewHenry Jameson2019-03-25
| | |
| * | Merge remote-tracking branch 'upstream/develop' into mastoapi/convosHenry Jameson2019-03-25
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (34 commits) Update attachment normalizer Add fallback for attachments uploaded via the other platforms Get correct mimetype through entity_normalizer Set default parameter Switch to mastoapi for posting status and uploading media Revert changes prevent text pasting if image is pasted remove border radius of suggested emojis #450 - dispatch login after saved state is loaded #448 - fix timeline fetch error when status text is null #451 - add class to username span No need to fetch mutes on load anymore 🙌 switch to mastoapi switch to mastoapi masto api sends muted property now No need to fetch user data using old api anymore 🎉 Switch to mastoapi Add comment Reset statusnet_blocking of all fetched users first while refreshing block list Add hideMutedPosts setting and wire up to post-returning endpoints ...
| | * \ Merge branch 'file-paste' into 'develop'Shpuld Shpludson2019-03-25
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #455 - prevent text pasting if image is pasted Closes #455 See merge request pleroma/pleroma-fe!705
| | | * | prevent text pasting if image is pastednik2019-03-23
| | | | |
| | * | | Merge branch 'develop' into 'develop'Shpuld Shpludson2019-03-25
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove border radius of suggested emojis See merge request pleroma/pleroma-fe!704
| | | * | | remove border radius of suggested emojisnik2019-03-23
| | | |/ /
| | * | | Get correct mimetype through entity_normalizertaehoon2019-03-24
| | | | |
| | * | | Switch to mastoapi for posting status and uploading mediataehoon2019-03-24
| | | | |
| * | | | less hackery, more direct usage of mastoapiHenry Jameson2019-03-21
| | | | |
| * | | | minor UI improvements - keep current behavior of showing originating post ↵Henry Jameson2019-03-21
| | | | | | | | | | | | | | | | | | | | initially
| * | | | why did i do thatHenry Jameson2019-03-21
| | | | |
| * | | | Merge remote-tracking branch 'upstream/develop' into mastoapi/convosHenry Jameson2019-03-21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (47 commits) #449 - fix auth token fetch issue Make select tag use --inputText as text color #444 - remote follow clean up #444 - show `remote follow` button when logged out Add button to save without cropping post-merge fixes [i18n] Update oc.json 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 ...
| * | | | | Fetching convos via MastoAPI. Had to change conversation component a bit forHenry Jameson2019-03-09
| | | | | | | | | | | | | | | | | | | | | | | | better support, since MastoAPI doesn't have coversation ids
* | | | | | #433 - fix broken conversation pagedave2019-03-25
| | | | | |
* | | | | | Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵dave2019-03-25
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | issue-433-status-reply-form
| * | | | | 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
| | * | | | Add hideMutedPosts setting and wire up to post-returning endpointstaehoon2019-03-21
| | | | | |
| | * | | | Remove old muting logictaehoon2019-03-21
| | | | | |
| | * | | | Update MuteCard uitaehoon2019-03-21
| | | | | |
| | * | | | Add mute/unmute featrue and mutes management tabtaehoon2019-03-21
| | | |/ / | | |/| |
| * | | | 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 '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 '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
| | | | |
| * | | | Merge branch 'mastoapi/user-stuff' into 'develop'HJ2019-03-15
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Transition to MastoAPI: user data See merge request pleroma/pleroma-fe!655
| | * | | fix user-card avatar falling into permament failed stateHenry Jameson2019-03-14
| | | | |