| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge branch '438-mastoapi-user-search' into 'develop' | lambda | 2019-03-22 |
| |\ | | | | | | | | | | | | | Transition to MastoAPI: user search Closes #438 See merge request pleroma/pleroma-fe!677 | ||
| | * | Switch to mastoapi for user search | taehoon | 2019-03-15 |
| | | | |||
| * | | Merge branch 'issue-449-auto-token-fetch' into 'develop' | Shpuld Shpludson | 2019-03-21 |
| |\ \ | | | | | | | | | | | | | | | | | | | #449 - fix auth token fetch issue Closes #449 See merge request pleroma/pleroma-fe!696 | ||
| | * | | #449 - fix auth token fetch issue | dave | 2019-03-21 |
| | | | | |||
| * | | | Merge branch 'issue-444-remote-follow' into 'develop' | Shpuld Shpludson | 2019-03-21 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | #444 - show `remote follow` button when logged out Closes #444 See merge request pleroma/pleroma-fe!692 | ||
| | * | | | #444 - remote follow clean up | dave | 2019-03-19 |
| | | | | | |||
| | * | | | #444 - show `remote follow` button when logged out | dave | 2019-03-19 |
| | | | | | |||
| * | | | | Merge branch 'feature/bypass-avatar-cropper' into 'develop' | Shpuld Shpludson | 2019-03-21 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #443 Add button to save without cropping Closes #443 See merge request pleroma/pleroma-fe!691 | ||
| | * | | | | Add button to save without cropping | jasper | 2019-03-18 |
| | |/ / / | |||
| * | | | | Merge branch 'patch-2' into 'develop' | Shpuld Shpludson | 2019-03-21 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | [i18n] Update oc.json See merge request pleroma/pleroma-fe!684 | ||
| | * | | | | [i18n] Update oc.json | Exilat | 2019-03-15 |
| | | |_|/ | |/| | | |||
| * | | | | Merge branch 'develop' into 'develop' | Shpuld Shpludson | 2019-03-21 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fixing typos and badly translated strings (Portuguese) See merge request pleroma/pleroma-fe!676 | ||
| | * | | | | fixing typos and badly translated strings | Rond | 2019-03-11 |
| | | | | | | |||
| * | | | | | Merge branch 'feature/version-info' into 'develop' | Shpuld Shpludson | 2019-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-info | Edijs | 2019-03-13 |
| | |\ \ \ \ | |||
| | * | | | | | Code refactoring | Edijs | 2019-03-10 |
| | | | | | | | |||
| | * | | | | | Version links to BE/FE | Edijs | 2019-03-10 |
| | | | | | | | |||
| | * | | | | | Added new tab to display versions of BE/FE | Edijs | 2019-03-10 |
| | | | | | | | |||
| * | | | | | | Make select tag use --inputText as text color | Marcin Mikołajczak | 2019-03-20 |
| | |_|_|_|/ |/| | | | | |||
| * | | | | | post-merge fixes | Henry Jameson | 2019-03-17 |
| | | | | | | |||
| * | | | | | Merge remote-tracking branch 'upstream/develop' into mastoapi/emojis | Henry Jameson | 2019-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' | HJ | 2019-03-15 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Transition to MastoAPI: user data See merge request pleroma/pleroma-fe!655 | ||
| | | * | | | | fix user-card avatar falling into permament failed state | Henry Jameson | 2019-03-14 |
| | | | | | | | |||
| | | * | | | | fix flake id users not fetching correctly | Henry Jameson | 2019-03-14 |
| | | | | | | | |||
| | | * | | | | fix console error | Henry Jameson | 2019-03-14 |
| | | | | | | | |||
| | | * | | | | whoops | Henry Jameson | 2019-03-12 |
| | | | | | | | |||
| | | * | | | | レインせんぱいにサンキュー | Henry Jameson | 2019-03-12 |
| | | | | | | | |||
| | | * | | | | fix embedded relationship card parsing | Henry Jameson | 2019-03-12 |
| | | | | | | | |||
| | | * | | | | actually use embedded relationship if it's present | Henry Jameson | 2019-03-11 |
| | | | | | | | |||
| | | * | | | | instead of filtering nulls, let's just not have them in the first place | Henry Jameson | 2019-03-11 |
| | | | | | | | |||
| | | * | | | | fixed tests, review fixes, now storing local users with downcase screen name for | Henry Jameson | 2019-03-11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | better compatibility | ||
| | | * | | | | fix error | Henry Jameson | 2019-03-09 |
| | | | | | | | |||
| | | * | | | | attempt at fixing switching to user TL | Henry Jameson | 2019-03-09 |
| | | | | | | | |||
| | | * | | | | fix reply-to marker, also whoops console log | Henry Jameson | 2019-03-09 |
| | | | | | | | |||
| | | * | | | | revert some stuff, turns out it's actually breaking. Fixed some local user ↵ | Henry Jameson | 2019-03-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | things | ||
| | | * | | | | Since BE doesn't support fetching user by screen name over MastoAPI we'll gonna | Henry Jameson | 2019-03-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | just fetching it over QvitterAPI real quick :DDDDDDDDD | ||
| | | * | | | | switch to mastoapi for user timeline | Henry Jameson | 2019-03-08 |
| | | | | | | | |||
| | | * | | | | Partially transitioned user data to MastoAPI. Added support for fetching | Henry Jameson | 2019-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' | lambda | 2019-03-15 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after store: fix setting postFormats field See merge request pleroma/pleroma-fe!683 | ||
| | | * | | | | | after store: fix setting postFormats field | William Pitcock | 2019-03-14 |
| | | | |_|/ / | | |/| | | | |||
| | * | | | | | Merge branch 'afterstore-refactor' into 'develop' | lambda | 2019-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. | lain | 2019-03-13 |
| | | |/ / / / | |||
| | * | | | | | Merge branch 'issue-434-plain-text' into 'develop' | HJ | 2019-03-14 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | #434 - fix plain text issue Closes #434 See merge request pleroma/pleroma-fe!675 | ||
| | | * | | | | #434 - fix plain text issue | dave | 2019-03-11 |
| | | | |_|/ | | |/| | | |||
| | * | | | | afterStoreSetup: Handle 404 cases. | lain | 2019-03-13 |
| | | | | | | |||
| | * | | | | afterStoreSetup: Emoji and nodeinfo refactor. | lain | 2019-03-13 |
| | | | | | | |||
| | * | | | | afterStoreSetup: refactor TOS and panel fetching, handle 404s. | lain | 2019-03-13 |
| | | | | | | |||
| | * | | | | afterStoreSetup: refactor. | lain | 2019-03-13 |
| | | | | | | |||
| | * | | | | Load persistedStated with async/await. | lain | 2019-03-13 |
| | |/ / / | |||
| | * | | | Add floating post-status button on mobile | Shpuld Shpludson | 2019-03-11 |
| | | | | | |||
