Commit Graph

3884 Commits (7257189ea796d51117285814d32ed6138fdb3458)
 

Author SHA1 Message Date
HJ 7257189ea7 Merge branch 'pleroma-amoled-theme' into 'develop'
5 years ago
Sierra ae2ae00d41 Add AMOLED dark theme
5 years ago
HJ ad97e03b59 Merge branch 'fix-move-type-notification' into 'develop'
5 years ago
HJ 215662afde Merge branch 'develop' into 'fix-move-type-notification'
5 years ago
HJ 1a82a00a2b Merge branch 'mfa_fix' into 'develop'
5 years ago
Wyatt Benno 816c077c4f mfa fix
5 years ago
HJ b8f4b18ae5 Merge branch 'streaming' into 'develop'
5 years ago
Henry Jameson bd07e5de1c unify showimmideately
5 years ago
Henry Jameson 43197c4243 Some error handling
5 years ago
Henry Jameson b619477573 Merge remote-tracking branch 'upstream/develop' into streaming
5 years ago
HJ f7029a27eb Merge branch '716' into 'develop'
5 years ago
taehoon 4e4c4af422 toggle_activation api is also deprecated
5 years ago
taehoon 36376ce57c use vuex action
5 years ago
taehoon 45e7f93c49 refactor toggleActivationStatus
5 years ago
taehoon 506822bed0 replace setActivationStatus api with new one
5 years ago
HJ b739edb509 Merge branch 'fix-sticker-height' into 'develop'
5 years ago
Absturztaube 32d7a49b9d use flex for stickers
5 years ago
HJ c1a0e23947 Merge branch 'revert-c2c48ec2' into 'develop'
5 years ago
feld 3691093572 Merge branch 'i18b/update-ja_easy' into 'develop'
5 years ago
Hakaba Hitoyo 1cba6c56f0 i18n/update-ja_easy
5 years ago
feld 749a399944 Merge branch 'issue_124' into 'develop'
5 years ago
feld 0b49e798e0 Merge branch 'feature/lockdown-timelines-private-mode' into 'develop'
5 years ago
HJ 766a674a48 Merge branch 'upgrade-babel' into 'develop'
5 years ago
HJ 9789123b1c Merge branch 'mfa/login_form' into 'develop'
5 years ago
Mark Felder d899d06973 Use a centralized fallback for missing values and use instance.federating instead of
5 years ago
Mark Felder 8d14036a23 Add fallback in case BE does not report federating status in nodeinfo
5 years ago
Mark Felder 0743fbb28b The value we are looking for is federationPolicy.enabled, not federationPolicy.federating
5 years ago
Mark Felder 2514dc183f Logic should be to hide TWKN if not federating OR if instance is not public
5 years ago
Mark Felder 7ddd5af081 Finally trust eslint
5 years ago
Mark Felder afe5b3a82d More lint
5 years ago
Mark Felder 211d25cd5a More lint
5 years ago
Mark Felder 3eeb3dc572 Lint
5 years ago
Mark Felder 821a2bcc68 Merge branch 'develop' into feature/lockdown-timelines-private-mode
5 years ago
feld 051b9703df Merge branch 'nav-icons' into 'develop'
5 years ago
Maksim Pechnikov addacf36d1 mfa: removed unused code
5 years ago
Henry Jameson 585702b1ce fix desktop notifications not working with streaming
5 years ago
taehoon a412b53801 increase icon width a little bit in the nav panel
5 years ago
taehoon 7fa294f11c add icons to nav panel
5 years ago
Ivan Tashkinov 341416b0e0 Revert "Merge branch 'revert-96cab6d8' into 'develop'"
5 years ago
HJ c7376b8325 Merge branch 'support-native-captcha' into 'develop'
5 years ago
HJ a621382a3f Merge branch 'load-button-fix' into 'develop'
5 years ago
Egor Kislitsyn ed3144eb11 Support "native" captcha
5 years ago
lain c2c48ec25c Merge branch 'revert-96cab6d8' into 'develop'
5 years ago
lain b399235848 Revert "Merge branch 'oauth-extra-scopes' into 'develop'"
5 years ago
seven b973ee5915 must use h in higher babel-plugin-transform-vue-jsx
5 years ago
Maksim Pechnikov f70fe28f64 mfa: fix login and recovery form
5 years ago
seven 386719b0d0 fix css runtime loading issue
5 years ago
seven d7bc1aff1d fix babelrc plugin config
5 years ago
Henry Jameson 63a5f50e7c fix deletes causing errors
5 years ago
HJ 3cc6f80628 Merge branch 'hideSitename' into 'develop'
5 years ago