aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* Merge branch '471-timeline-since-id' into 'develop'Shpuld Shpludson2019-04-01
|\ | | | | | | | | | | | | #471 - fix timeline fetch with since_id Closes #471 See merge request pleroma/pleroma-fe!722
| * #471 - fix timeline fetch with since_idjared2019-04-01
| |
* | Merge branch 'minimal-scopes-mode' into 'develop'HJ2019-04-01
|\ \ | | | | | | | | | | | | Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode See merge request pleroma/pleroma-fe!633
| * | final touchesHenry Jameson2019-03-30
| | |
| * | aaaaggghhHenry Jameson2019-03-30
| | |
| * | fix lintHenry Jameson2019-03-30
| | |
| * | Merge remote-tracking branch 'upstream/develop' into minimal-scopes-modeHenry Jameson2019-03-30
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (173 commits) Fix: Change condition fix typo update store according to retweeted status #433 - update sort by for conversation display replies_count right after reply icon expose replies_count from mastodon api Apparently, MastoAPI gives status in ancestors if you try opening a repeat... make side drawer use gesture service and fix its animations review/remove error hiding errata review #433 - sort conversation for retweets and clean up Revert "Merge branch 'revert-987b5162' into 'develop'" Revert "Merge branch 'mastoapi/friends-tl' into 'develop'" Add await to login action' Remove console log Fix warnings in user profile routing Add tests for gesture service, fix bug with perpendicular directions #255 - clean up autocomplete form #255 - clean up user settings page with self-closing html tags ...
| * | | ReviewHenry Jameson2019-03-30
| | | |
| * | | Initial work on deprecating scopeModesEnabled in favor of minimalScopeModeHenry Jameson2019-03-03
| | | |
* | | | #470 - update button text capitalizationjared2019-04-01
| | | |
* | | | #470 - handle cases without subjectjared2019-04-01
| | | |
* | | | #470 - update i18njared2019-04-01
| | | |
* | | | #470 - fix subject and content toggle issuejared2019-04-01
| |_|/ |/| |
* | | Remove useless commajasper2019-04-01
| | |
* | | Fix user card in notificationjasper2019-04-01
| |/ |/|
* | Merge branch 'issues/#465' into 'develop'Shpuld Shpludson2019-03-29
|\ \ | | | | | | | | | | | | | | | | | | update store according to retweeted status Closes #465 See merge request pleroma/pleroma-fe!713
| * | update store according to retweeted statusBrenden Bice2019-03-28
| | |
* | | Merge branch 'fix/warnings-in-user-profile' into 'develop'Shpuld Shpludson2019-03-29
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | #461 Fix warnings about user-profile Closes #461 See merge request pleroma/pleroma-fe!708
| * | | Fix: Change conditionjasper2019-03-28
| | | |
| * | | Remove console logjasper2019-03-26
| | | |
| * | | Fix warnings in user profile routingjasper2019-03-26
| | | |
* | | | Merge branch '255-emoji-input' into 'develop'Shpuld Shpludson2019-03-28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #255 - add emoji input component Closes #255 See merge request pleroma/pleroma-fe!706
| * \ \ \ Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵jared2019-03-27
| |\ \ \ \ | | | | | | | | | | | | | | | | | | 255-emoji-input
| * | | | | #255 - clean up autocomplete formjared2019-03-26
| | | | | |
| * | | | | #255 - clean up user settings page with self-closing html tagsjared2019-03-26
| | | | | |
| * | | | | #255 - support textarea and update user settings pagejared2019-03-26
| | | | | |
| * | | | | Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into ↵jared2019-03-26
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 255-emoji-input
| * | | | | | #255 - add emoji input componentjared2019-03-25
| | | | | | |
* | | | | | | Merge branch 'feat/gesture-service' into 'develop'Shpuld Shpludson2019-03-28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a gesture service for easier touch gestures See merge request pleroma/pleroma-fe!714
| * | | | | | | fix typoshpuld2019-03-28
| | | | | | | |
| * | | | | | | make side drawer use gesture service and fix its animationsshpuld2019-03-27
| | | | | | | |
| * | | | | | | Add tests for gesture service, fix bug with perpendicular directionsshpuld2019-03-26
| | | | | | | |
| * | | | | | | somewhat functioning gesture serviceshpuld2019-03-25
| | | | | | | |
| * | | | | | | start creating gesture serviceshpuld2019-03-25
| | | | | | | |
* | | | | | | | Merge branch 'issues/#466' into 'develop'Shpuld Shpludson2019-03-28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show replies count right after reply icon Closes #466 See merge request pleroma/pleroma-fe!716
| * | | | | | | | display replies_count right after reply iconBrenden Bice2019-03-28
| | | | | | | | |
| * | | | | | | | expose replies_count from mastodon apiBrenden Bice2019-03-28
| | | | | | | | |
* | | | | | | | | #433 - update sort by for conversationdave2019-03-28
| | | | | | | | |
* | | | | | | | | 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
| | | | | | | | | | | | |
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-11-28 16:32:44 +0000