aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* Revert "Merge branch 'revert-987b5162' into 'develop'"Henry Jameson2019-03-27
| | | | | This reverts commit 96753e6a5febff60e0c2cb6fac13d5e7865f0a94, reversing changes made to 987b5162a7530979e9fa887a24311eb1cd480fc5.
* Merge branch 'mastoapi/public-tl' into 'develop'HJ2019-03-27
|\ | | | | | | | | switch public and TWKN to MastoAPI See merge request pleroma/pleroma-fe!650
| * Merge branch 'develop' into 'mastoapi/public-tl'HJ2019-03-25
| |\ | | | | | | | | | # Conflicts: # src/services/api/api.service.js
| * | switch public and TWKN to MastoAPIHenry Jameson2019-03-07
| | |
* | | Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"HJ2019-03-27
| | | | | | | | | This reverts merge request !647
* | | Merge branch 'mastoapi/friends-tl' into 'develop'Shpuld Shpludson2019-03-26
|\ \ \ | | | | | | | | | | | | | | | | Switch friends TL to MastoAPI See merge request pleroma/pleroma-fe!647
| * \ \ Merge branch 'develop' into 'mastoapi/friends-tl'HJ2019-03-25
| |\ \ \ | | | |/ | | |/| | | | | # Conflicts: # src/services/api/api.service.js
| * | | Merge remote-tracking branch 'upstream/develop' into mastoapi/friends-tlHenry 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 ...
| * | | | undo this change since BE returns empty object for relationship, add in aHenry Jameson2019-03-07
| | | | | | | | | | | | | | | | | | | | separate MR
| * | | | updates normalizer for proper user handling and adds support for friends tl ↵Henry Jameson2019-03-07
| | |_|/ | |/| | | | | | | | | | via mastoapi
* | | | 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
| | | |
| * | | #442 - clean up Bio placeholder textdave2019-03-17
| | | |
* | | | 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 'issue-450-user-data-populate' into 'develop'Shpuld Shpludson2019-03-25
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #450 - dispatch login after saved state is loaded Closes #450 See merge request pleroma/pleroma-fe!701
| | * | | | #450 - dispatch login after saved state is loadeddave2019-03-22
| | | |_|/ | | |/| |
| * | | | 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
| | |/ / / /
| * | | | | Update attachment normalizertaehoon2019-03-25
| | | | | |
| * | | | | Add fallback for attachments uploaded via the other platformstaehoon2019-03-24
| | | | | |
| * | | | | Get correct mimetype through entity_normalizertaehoon2019-03-24
| | | | | |
| * | | | | Set default parametertaehoon2019-03-24
| | | | | |
| * | | | | Switch to mastoapi for posting status and uploading mediataehoon2019-03-24
| | | | | |
| * | | | | 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
| | | | | |
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-11-24 17:07:38 +0000