aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| | | | |
| * | | | afterStoreSetup: refactor.lain2019-03-13
| | | | |
| * | | | Load persistedStated with async/await.lain2019-03-13
|/ / / /
* | | | Merge branch 'feature/mobile-improvements-2' into 'develop'Shpuld Shpludson2019-03-11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add floating post-status button on mobile See merge request pleroma/pleroma-fe!628
| * | | | Add floating post-status button on mobileShpuld Shpludson2019-03-11
|/ / / /
* | | | Merge branch '382-update-user-settings-icon' into 'develop'Shpuld Shpludson2019-03-11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update user settings icon to pencil Closes #382 See merge request pleroma/pleroma-fe!602
| * | | | Update user settings icon to penciltaehoon2019-03-11
|/ / / /
* | | | Merge branch 'develop' into 'develop'lambda2019-03-11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only connect to chat upon authenticating Closes #403 See merge request pleroma/pleroma-fe!666
| * | | | Only connect to chat when authenticating in the first placeslice2019-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | To avoid duplication of the connection, the chat socket is destroyed upon logging out.
| * | | | Check for websocket token before connecting to chatslice2019-03-10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Closes #403. Previously, a socket to the chat channel would be opened if chat is enabled, regardless if the user is logged in or not. This patch only allows a connection to be opened if a wsToken (websocket token) is present, which prevents websocket errors from unauthenticated users.
* | | | Merge branch 'i18n-cs' into 'develop'lambda2019-03-11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | I18n: Update Czech translation See merge request pleroma/pleroma-fe!651
| * | | | I18n: Update Czech translationLorem Ipsum2019-03-11
|/ / / /
* | | | Merge branch 'emoji-limit-profile' into 'develop'HJ2019-03-11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | user_card.vue: Set img.emoji to 32×32px See merge request pleroma/pleroma-fe!665