aboutsummaryrefslogtreecommitdiff
path: root/src/services
Commit message (Collapse)AuthorAge
* merge develop and resolve conflictdave2019-03-27
|\
| * Merge remote-tracking branch 'upstream/develop' into mastoapi/actionsHenry Jameson2019-03-27
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: errata review Revert "Merge branch 'revert-987b5162' into 'develop'" Revert "Merge branch 'mastoapi/friends-tl' into 'develop'" Add await to login action' correctly paginate on MastoAPI #442 - update placeholder linebreak #442 - clean up Bio placeholder text wip support for follower/following, a bit broken and with regression switch direct messages to mastoapi switch public and TWKN to MastoAPI undo this change since BE returns empty object for relationship, add in a separate MR updates normalizer for proper user handling and adds support for friends tl via mastoapi
| | * Merge remote-tracking branch 'upstream/develop' into mastoapi/followersHenry Jameson2019-03-27
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: Revert "Merge branch 'revert-987b5162' into 'develop'" Revert "Merge branch 'mastoapi/friends-tl' into 'develop'" Add await to login action' switch direct messages to mastoapi switch public and TWKN to MastoAPI
| | | * Merge branch 'develop' into 'masto-api/direct'HJ2019-03-27
| | | |\ | | | | | | | | | | | | | | | # Conflicts: # src/services/api/api.service.js
| | | | * Revert "Merge branch 'revert-987b5162' into 'develop'"Henry Jameson2019-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 96753e6a5febff60e0c2cb6fac13d5e7865f0a94, reversing changes made to 987b5162a7530979e9fa887a24311eb1cd480fc5.
| | | * | Merge remote-tracking branch 'upstream/develop' into masto-api/directHenry Jameson2019-03-25
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (40 commits) review 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 reactivity fixes less hackery, more direct usage of mastoapi ...
| | | * \ \ Merge remote-tracking branch 'upstream/develop' into masto-api/directHenry 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 ...
| | | * | | | switch direct messages to mastoapiHenry Jameson2019-03-07
| | | | | | |
| | * | | | | Merge remote-tracking branch 'upstream/develop' into mastoapi/followersHenry Jameson2019-03-27
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: #442 - update placeholder linebreak #442 - clean up Bio placeholder text undo this change since BE returns empty object for relationship, add in a separate MR updates normalizer for proper user handling and adds support for friends tl via mastoapi
| | | * \ \ \ \ 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
| | * | | | | reviewHenry Jameson2019-03-27
| | | | | | |
| | * | | | | correctly paginate on MastoAPIHenry Jameson2019-03-25
| | | | | | |
| | * | | | | Merge remote-tracking branch 'upstream/develop' into mastoapi/followersHenry Jameson2019-03-25
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (87 commits) review 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 reactivity fixes less hackery, more direct usage of mastoapi ...
| | * | | | | wip support for follower/following, a bit broken and with regressionHenry Jameson2019-03-10
| | | |/ / / | | |/| | |
| * | | | | review/remove error hidingHenry Jameson2019-03-27
| | | | | |
| * | | | | correctly update relationship on follow/unfollowHenry Jameson2019-03-25
| | | | | |
| * | | | | fixup! Merge remote-tracking branch 'upstream/develop' into mastoapi/actionsHenry Jameson2019-03-25
| | | | | |
| * | | | | Merge remote-tracking branch 'upstream/develop' into mastoapi/actionsHenry Jameson2019-03-25
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (87 commits) review 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 reactivity fixes less hackery, more direct usage of mastoapi ...
| * | | | | basic user and status actions implementedHenry Jameson2019-03-10
| | |/ / / | |/| | |
* | | | | #457 - merge develop and resolve conflictdave2019-03-27
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | 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
| | |/ / | |/| |
* | | | #457 - update tag timeline endpoint to MastoAPIdave2019-03-26
| |/ / |/| |
* | | 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 ...
| * | | 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
| | * | | switch to mastoapitaehoon2019-03-21
| | | | |
| | * | | switch to mastoapitaehoon2019-03-21
| | | | |
| | * | | Switch to mastoapitaehoon2019-03-21
| | | | |
| | * | | Add hideMutedPosts setting and wire up to post-returning endpointstaehoon2019-03-21
| | | | |
| | * | | Minor code refactoringtaehoon2019-03-21
| | | | |
| | * | | Improve fetch error handling using a utiltaehoon2019-03-21
| | | | |
| | * | | Remove old muting logictaehoon2019-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 '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
| | | |
* | | | less hackery, more direct usage of mastoapiHenry 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 ...
| * | | 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 '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
generated by cgit v1.2.3-70-g09d2 (git 2.52.0) at 2025-12-07 18:22:53 +0000