aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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 ...
| * 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 '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 'patch-2' into 'develop'Shpuld Shpludson2019-03-21
| |\ \ \ | | | | | | | | | | | | | | | | | | | | [i18n] Update oc.json See merge request pleroma/pleroma-fe!684
| | * | | [i18n] Update oc.jsonExilat2019-03-15
| | | | |
| * | | | Merge branch 'develop' into 'develop'Shpuld Shpludson2019-03-21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixing typos and badly translated strings (Portuguese) See merge request pleroma/pleroma-fe!676
| | * | | | fixing typos and badly translated stringsRond2019-03-11
| | | | | |
| * | | | | 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 'patch-1' into 'develop'HJ2019-03-20
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Make select tag use --inputText as text color See merge request pleroma/pleroma-fe!693
| | * | | | | Make select tag use --inputText as text colorMarcin Mikołajczak2019-03-20
| |/ / / / /
| * | | | | Merge branch 'mastoapi/emojis' into 'develop'HJ2019-03-17
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | MastoAPI: emoji support See merge request pleroma/pleroma-fe!659
| | * | | | post-merge fixesHenry Jameson2019-03-17
| | | | | |
| | * | | | Merge remote-tracking branch 'upstream/develop' into mastoapi/emojisHenry Jameson2019-03-17
| | |\ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (34 commits) 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 actually use embedded relationship if it's present instead of filtering nulls, let's just not have them in the first place #434 - fix plain text issue Add floating post-status button on mobile Update user settings icon to pencil I18n: Update Czech translation user_card.vue: Copy over .status-content img styling ...
| * | | | | 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
| | | | | | |
| | * | | | | fix flake id users not fetching correctlyHenry Jameson2019-03-14
| | | | | | |
| | * | | | | fix console errorHenry Jameson2019-03-14
| | | | | | |
| | * | | | | whoopsHenry Jameson2019-03-12
| | | | | | |
| | * | | | | レインせんぱいにサンキューHenry Jameson2019-03-12
| | | | | | |
| | * | | | | fix embedded relationship card parsingHenry Jameson2019-03-12
| | | | | | |
| | * | | | | actually use embedded relationship if it's presentHenry Jameson2019-03-11
| | | | | | |
| | * | | | | instead of filtering nulls, let's just not have them in the first placeHenry Jameson2019-03-11
| | | | | | |
| | * | | | | fixed tests, review fixes, now storing local users with downcase screen name forHenry Jameson2019-03-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | better compatibility
| | * | | | | fix errorHenry Jameson2019-03-09
| | | | | | |
| | * | | | | some test fixes, disabled one test for now since logic now is even more ↵Henry Jameson2019-03-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | async in general
| | * | | | | attempt at fixing switching to user TLHenry Jameson2019-03-09
| | | | | | |
| | * | | | | fix reply-to marker, also whoops console logHenry Jameson2019-03-09
| | | | | | |
| | * | | | | revert some stuff, turns out it's actually breaking. Fixed some local user ↵Henry Jameson2019-03-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | things
| | * | | | | Since BE doesn't support fetching user by screen name over MastoAPI we'll gonnaHenry Jameson2019-03-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | just fetching it over QvitterAPI real quick :DDDDDDDDD
| | * | | | | switch to mastoapi for user timelineHenry Jameson2019-03-08
| | | | | | |
| | * | | | | Partially transitioned user data to MastoAPI. Added support for fetchingHenry Jameson2019-03-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | relationship data. Upgraded code to be more resilient to nulls caused by missing data in either APIs
| * | | | | | Merge branch 'bugfix/nodeinfo-post-formats' into 'develop'lambda2019-03-15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after store: fix setting postFormats field See merge request pleroma/pleroma-fe!683
| | * | | | | | after store: fix setting postFormats fieldWilliam Pitcock2019-03-14
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'afterstore-refactor' into 'develop'lambda2019-03-15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afterStoreSetup: Move log in and theme load to afterStoreSetup. See merge request pleroma/pleroma-fe!680
| | * | | | | | afterStoreSetup: Move log in and theme load to afterStoreSetup.lain2019-03-13
| | | | | | | |
| * | | | | | | Merge branch 'issue-434-plain-text' into 'develop'HJ2019-03-14
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #434 - fix plain text issue Closes #434 See merge request pleroma/pleroma-fe!675
| | * | | | | | #434 - fix plain text issuedave2019-03-11
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'afterstore-refactor' into 'develop'lambda2019-03-13
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | | | | | | Afterstore refactor See merge request pleroma/pleroma-fe!679
| | * | | | afterStoreSetup: Handle 404 cases.lain2019-03-13
| | | | | |
| | * | | | afterStoreSetup: Emoji and nodeinfo refactor.lain2019-03-13
| | | | | |
| | * | | | afterStoreSetup: refactor TOS and panel fetching, handle 404s.lain2019-03-13
| | | | | |
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-11-18 07:11:08 +0000