| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | remove mock data | Shpuld Shpuldson | 2020-01-26 |
| | | |||
| * | change emoji reactions to use new format | Shpuld Shpuldson | 2020-01-26 |
| | | |||
| * | clean up code, fix prediction bug | Shpuld Shpuldson | 2020-01-14 |
| | | |||
| * | fix merge conflicts | Shpuld Shpuldson | 2020-01-13 |
| |\ | |||
| | * | Merge branch 'develop' into 'fix-move-type-notification' | HJ | 2020-01-03 |
| | |\ | | | | | | | | | | # Conflicts: # static/fontello.json | ||
| | | * | mfa fix | Wyatt Benno | 2019-12-30 |
| | | | | |||
| | | * | unify showimmideately | Henry Jameson | 2019-12-26 |
| | | | | |||
| | | * | Some error handling | Henry Jameson | 2019-12-26 |
| | | | | |||
| | | * | Merge remote-tracking branch 'upstream/develop' into streaming | Henry Jameson | 2019-12-26 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (51 commits) toggle_activation api is also deprecated use vuex action refactor toggleActivationStatus replace setActivationStatus api with new one use flex for stickers i18n/update-ja_easy Use a centralized fallback for missing values and use instance.federating instead of instance.federation.enabled Add fallback in case BE does not report federating status in nodeinfo The value we are looking for is federationPolicy.enabled, not federationPolicy.federating Logic should be to hide TWKN if not federating OR if instance is not public Finally trust eslint More lint More lint Lint mfa: removed unused code increase icon width a little bit in the nav panel add icons to nav panel Revert "Merge branch 'revert-96cab6d8' into 'develop'" Support "native" captcha Revert "Merge branch 'oauth-extra-scopes' into 'develop'" ... | ||
| | | | * | toggle_activation api is also deprecated | taehoon | 2019-12-15 |
| | | | | | |||
| | | | * | use vuex action | taehoon | 2019-12-15 |
| | | | | | |||
| | | | * | refactor toggleActivationStatus | taehoon | 2019-12-15 |
| | | | | | |||
| | | | * | replace setActivationStatus api with new one | taehoon | 2019-12-15 |
| | | | | | |||
| | | | * | Merge branch 'fix-sticker-height' into 'develop' | HJ | 2019-12-15 |
| | | | |\ | | | | | | | | | | | | | | | | | | | | | fix sticker picker height in emojo picker See merge request pleroma/pleroma-fe!1022 | ||
| | | | | * | use flex for stickers | Absturztaube | 2019-12-15 |
| | | | | | | |||
| | | | | * | fix invisible tab-switcher in emoji picker | Absturztaube | 2019-12-09 |
| | | | | | | |||
| | | | | * | Revert "fix sticker picker height in emojo picker" | Absturztaube | 2019-12-09 |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 914c78398469988f549930bd35d044082d155277. | ||
| | | | | * | fix sticker picker height in emojo picker | Absturztaube | 2019-12-07 |
| | | | | | | |||
| | | | * | | Merge branch 'revert-c2c48ec2' into 'develop' | HJ | 2019-12-14 |
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Reinstate `push` and `admin` scopes See merge request pleroma/pleroma-fe!1034 | ||
| | | | | * | | Revert "Merge branch 'revert-96cab6d8' into 'develop'" | Ivan Tashkinov | 2019-12-12 |
| | | | | | | | | | | | | | | | | | | | This reverts merge request !1032 | ||
| | | | * | | | i18n/update-ja_easy | Hakaba Hitoyo | 2019-12-13 |
| | | | | | | | |||
| | | | * | | | Merge branch 'issue_124' into 'develop' | feld | 2019-12-13 |
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 403 messaging See merge request pleroma/pleroma-fe!1020 | ||
| | | | | * | | | Set error data | Wyatt Benno | 2019-12-09 |
| | | | | | | | | |||
| | | | | * | | | remove console | Wyatt Benno | 2019-12-09 |
| | | | | | | | | |||
| | | | | * | | | Change naming, make more general | Wyatt Benno | 2019-12-09 |
| | | | | | | | | |||
| | | | | * | | | Wording updates | Wyatt Benno | 2019-12-06 |
| | | | | | | | | |||
| | | | | * | | | Change 403 messaging | Wyatt Benno | 2019-12-05 |
| | | | | | |/ | | | | |/| | |||
| | | | * | | | Merge branch 'feature/lockdown-timelines-private-mode' into 'develop' | feld | 2019-12-13 |
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interaction with BE private mode See merge request pleroma/pleroma-fe!989 | ||
| | | | | * | | | Use a centralized fallback for missing values and use instance.federating ↵ | Mark Felder | 2019-12-12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of instance.federation.enabled | ||
| | | | | * | | | Add fallback in case BE does not report federating status in nodeinfo | Mark Felder | 2019-12-12 |
| | | | | | | | | |||
| | | | | * | | | The value we are looking for is federationPolicy.enabled, not ↵ | Mark Felder | 2019-12-12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | federationPolicy.federating Also the || true fallback does not work and always becomes true | ||
| | | | | * | | | Logic should be to hide TWKN if not federating OR if instance is not public | Mark Felder | 2019-12-12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Private instances should not show any timelines | ||
| | | | | * | | | Finally trust eslint | Mark Felder | 2019-12-12 |
| | | | | | | | | |||
| | | | | * | | | More lint | Mark Felder | 2019-12-12 |
| | | | | | | | | |||
| | | | | * | | | More lint | Mark Felder | 2019-12-12 |
| | | | | | | | | |||
| | | | | * | | | Lint | Mark Felder | 2019-12-12 |
| | | | | | | | | |||
| | | | | * | | | Merge branch 'develop' into feature/lockdown-timelines-private-mode | Mark Felder | 2019-12-12 |
| | | | | |\ \ \ | |||
| | | | | * | | | | side drawer: same treatment | Ariadne Conill | 2019-11-11 |
| | | | | | | | | | |||
| | | | | * | | | | app: search API is not available in private mode so disable it | Ariadne Conill | 2019-11-11 |
| | | | | | | | | | |||
| | | | | * | | | | nav panel: disable TWKN if federation disabled, disable Public and TWKN if ↵ | Ariadne Conill | 2019-11-11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | privateMode is enabled | ||
| | | | | * | | | | nav panel: refactor to use vuex mapState | Ariadne Conill | 2019-11-11 |
| | | | | | | | | | |||
| | | | | * | | | | boot: track whether private mode is enabled or not | Ariadne Conill | 2019-11-11 |
| | | | | | | | | | |||
| | | | * | | | | | Merge branch 'upgrade-babel' into 'develop' | HJ | 2019-12-13 |
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade babel to v7 Closes #733 See merge request pleroma/pleroma-fe!1029 | ||
| | | | | * | | | | | must use h in higher babel-plugin-transform-vue-jsx | seven | 2019-12-12 |
| | | | | | | | | | | |||
| | | | * | | | | | | Merge branch 'mfa/login_form' into 'develop' | HJ | 2019-12-13 |
| | | | |\ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | mfa: fix login and recovery form See merge request pleroma/pleroma-fe!1031 | ||
| | | | | * | | | | | mfa: removed unused code | Maksim Pechnikov | 2019-12-12 |
| | | | | | | | | | | |||
| | | | | * | | | | | mfa: fix login and recovery form | Maksim Pechnikov | 2019-12-12 |
| | | | | | | | | | | |||
| | | | * | | | | | | increase icon width a little bit in the nav panel | taehoon | 2019-12-12 |
| | | | | | | | | | | |||
| | | | * | | | | | | add icons to nav panel | taehoon | 2019-12-12 |
| | | | | |_|_|_|/ | | | |/| | | | | |||
| | | | * | | | | | Merge branch 'support-native-captcha' into 'develop' | HJ | 2019-12-12 |
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support "native" captcha See merge request pleroma/pleroma-fe!1033 | ||
