aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵dave2019-03-28
|\ | | | | | | issue-433-status-reply-form
| * Merge branch 'fix/convos-masto' into 'develop'HJ2019-03-27
| |\ | | | | | | | | | | | | | | | | | | Apparently, MastoAPI gives status in ancestors if you try opening a repeat... Closes #460 See merge request pleroma/pleroma-fe!715
| | * Apparently, MastoAPI gives status in ancestors if you try opening a repeat...Henry Jameson2019-03-27
| | |
| * | 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
| | | | | * Merge branch 'mastoapi/friends-tl' into 'develop'HJ2019-03-27
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mastoapi/friends tl See merge request pleroma/pleroma-fe!711
| | | | | | * 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
| | | * | | | | | | errataHenry Jameson2019-03-27
| | | | | | | | | |
| | | * | | | | | | 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
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | #457 - update tag timeline endpoint to MastoAPIdave2019-03-26
| | | | | | | |
* | | | | | | | #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 'fix/add-await-to-login-request' into 'develop'Shpuld Shpludson2019-03-27
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | !701 Add await to login action in after_store See merge request pleroma/pleroma-fe!709
| | * | | | | | Add await to login action'jasper2019-03-26
| | | |_|_|/ / | | |/| | | |
| * | | | | | 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
| | | | |
* | | | | #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 '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
| | | | |_|/ | | | |/| |
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-11-18 01:53:53 +0000