aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAge
* remove mock dataShpuld Shpuldson2020-01-26
* change emoji reactions to use new formatShpuld Shpuldson2020-01-26
* clean up code, fix prediction bugShpuld Shpuldson2020-01-14
* fix merge conflictsShpuld Shpuldson2020-01-13
|\
| * Merge branch 'develop' into 'fix-move-type-notification'HJ2020-01-03
| |\
| | * mfa fixWyatt Benno2019-12-30
| | * unify showimmideatelyHenry Jameson2019-12-26
| | * Some error handlingHenry Jameson2019-12-26
| | * Merge remote-tracking branch 'upstream/develop' into streamingHenry Jameson2019-12-26
| | |\
| | | * toggle_activation api is also deprecatedtaehoon2019-12-15
| | | * use vuex actiontaehoon2019-12-15
| | | * refactor toggleActivationStatustaehoon2019-12-15
| | | * replace setActivationStatus api with new onetaehoon2019-12-15
| | | * Merge branch 'fix-sticker-height' into 'develop'HJ2019-12-15
| | | |\
| | | | * use flex for stickersAbsturztaube2019-12-15
| | | | * fix invisible tab-switcher in emoji pickerAbsturztaube2019-12-09
| | | | * Revert "fix sticker picker height in emojo picker"Absturztaube2019-12-09
| | | | * fix sticker picker height in emojo pickerAbsturztaube2019-12-07
| | | * | Merge branch 'revert-c2c48ec2' into 'develop'HJ2019-12-14
| | | |\ \
| | | | * | Revert "Merge branch 'revert-96cab6d8' into 'develop'"Ivan Tashkinov2019-12-12
| | | * | | i18n/update-ja_easyHakaba Hitoyo2019-12-13
| | | * | | Merge branch 'issue_124' into 'develop'feld2019-12-13
| | | |\ \ \
| | | | * | | Set error dataWyatt Benno2019-12-09
| | | | * | | remove consoleWyatt Benno2019-12-09
| | | | * | | Change naming, make more generalWyatt Benno2019-12-09
| | | | * | | Wording updatesWyatt Benno2019-12-06
| | | | * | | Change 403 messagingWyatt Benno2019-12-05
| | | | | |/ | | | | |/|
| | | * | | Merge branch 'feature/lockdown-timelines-private-mode' into 'develop'feld2019-12-13
| | | |\ \ \
| | | | * | | Use a centralized fallback for missing values and use instance.federating ins...Mark Felder2019-12-12
| | | | * | | Add fallback in case BE does not report federating status in nodeinfoMark Felder2019-12-12
| | | | * | | The value we are looking for is federationPolicy.enabled, not federationPolic...Mark Felder2019-12-12
| | | | * | | Logic should be to hide TWKN if not federating OR if instance is not publicMark Felder2019-12-12
| | | | * | | Finally trust eslintMark Felder2019-12-12
| | | | * | | More lintMark Felder2019-12-12
| | | | * | | More lintMark Felder2019-12-12
| | | | * | | LintMark Felder2019-12-12
| | | | * | | Merge branch 'develop' into feature/lockdown-timelines-private-modeMark Felder2019-12-12
| | | | |\ \ \
| | | | * | | | side drawer: same treatmentAriadne Conill2019-11-11
| | | | * | | | app: search API is not available in private mode so disable itAriadne Conill2019-11-11
| | | | * | | | nav panel: disable TWKN if federation disabled, disable Public and TWKN if pr...Ariadne Conill2019-11-11
| | | | * | | | nav panel: refactor to use vuex mapStateAriadne Conill2019-11-11
| | | | * | | | boot: track whether private mode is enabled or notAriadne Conill2019-11-11
| | | * | | | | Merge branch 'upgrade-babel' into 'develop'HJ2019-12-13
| | | |\ \ \ \ \
| | | | * | | | | must use h in higher babel-plugin-transform-vue-jsxseven2019-12-12
| | | * | | | | | Merge branch 'mfa/login_form' into 'develop'HJ2019-12-13
| | | |\ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | | * | | | | mfa: removed unused codeMaksim Pechnikov2019-12-12
| | | | * | | | | mfa: fix login and recovery formMaksim Pechnikov2019-12-12
| | | * | | | | | increase icon width a little bit in the nav paneltaehoon2019-12-12
| | | * | | | | | add icons to nav paneltaehoon2019-12-12
| | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Merge branch 'support-native-captcha' into 'develop'HJ2019-12-12
| | | |\ \ \ \ \