aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'upgrade-babel' into 'develop'HJ2019-12-13
|\ | | | | | | | | | | | | Upgrade babel to v7 Closes #733 See merge request pleroma/pleroma-fe!1029
| * must use h in higher babel-plugin-transform-vue-jsxseven2019-12-12
| |
| * fix babelrc plugin configseven2019-12-12
| |
| * upgrade babel-registerseven2019-12-11
| |
| * update babelrcseven2019-12-11
| |
| * upgrade babel-plugin-transform-runtimeseven2019-12-11
| |
| * upgrade babel-plugin-lodashseven2019-12-11
| |
| * babel-plugin-add-module-exports is not necessary for babel v7seven2019-12-11
| |
| * upgrade babel-plugin-transform-vue-jsxseven2019-12-11
| |
| * update babelrc presets configseven2019-12-11
| |
| * upgrade babel presetseven2019-12-11
| |
| * upgrade Babel core to v7seven2019-12-11
| |
* | Merge branch 'mfa/login_form' into 'develop'HJ2019-12-13
|\ \ | | | | | | | | | | | | mfa: fix login and recovery form See merge request pleroma/pleroma-fe!1031
| * | mfa: removed unused codeMaksim Pechnikov2019-12-12
| | |
| * | mfa: fix login and recovery formMaksim Pechnikov2019-12-12
| | |
* | | Merge branch 'nav-icons' into 'develop'feld2019-12-12
|\ \ \ | | | | | | | | | | | | | | | | Add icons to nav panel See merge request pleroma/pleroma-fe!1016
| * | | 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
|\ \ \ | | | | | | | | | | | | | | | | Support "native" captcha See merge request pleroma/pleroma-fe!1033
| * | | Support "native" captchaEgor Kislitsyn2019-12-12
| |/ /
* | | Merge branch 'load-button-fix' into 'develop'HJ2019-12-12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix css runtime loading issue Closes #734 See merge request pleroma/pleroma-fe!1030
| * | | fix css runtime loading issueseven2019-12-12
| | |/ | |/|
* | | Merge branch 'revert-96cab6d8' into 'develop'lain2019-12-12
|\ \ \ | |_|/ |/| | | | | | | | Revert "Merge branch 'oauth-extra-scopes' into 'develop'" See merge request pleroma/pleroma-fe!1032
| * | Revert "Merge branch 'oauth-extra-scopes' into 'develop'"lain2019-12-12
|/ / | | | | This reverts merge request !1024
* | Merge branch 'hideSitename' into 'develop'HJ2019-12-11
|\ \ | | | | | | | | | | | | Hide instance url/link/text in header using hideSitename instance option See merge request pleroma/pleroma-fe!1018
| * | add documentation for new instance optiontaehoon2019-12-11
| | |
| * | hide instance url/link/text in header using hideSitename optiontaehoon2019-12-11
|/ /
* | Merge branch 'fix/mfa_routes' into 'develop'rinpatch2019-12-11
|\ \ | | | | | | | | | | | | fixed typo See merge request pleroma/pleroma-fe!1027
| * | fixed typoMaksim Pechnikov2019-12-11
|/ /
* | Merge branch 'oauth-extra-scopes' into 'develop'rinpatch2019-12-11
|\ \ | |/ |/| | | | | OAuth 'push' and 'admin' scopes support See merge request pleroma/pleroma-fe!1024
| * Added OAuth 'push' and 'admin' scopes.Ivan Tashkinov2019-12-08
| |
* | Merge branch 'fix/remove-status-hack' into 'develop'HJ2019-12-08
|\ \ | |/ |/| | | | | Remove whitespace hack on empty post content See merge request pleroma/pleroma-fe!1023
| * Remove whitespace hack on empty post contentrinpatch2019-12-08
|/ | | | | | It's no longer necessary since the backend handles posts with empty content fine and also fixes an odd whitespace when attachment links are disabled.
* Merge branch 'fix-font-load-for-pleroma-be' into 'develop'HJ2019-12-05
|\ | | | | | | | | | | | | Change output directory of fontello Closes pleroma-support#14 See merge request pleroma/pleroma-fe!1021
| * Change output directory of fontellokPherox2019-12-05
|/
* Merge branch '701' into 'develop'HJ2019-12-03
|\ | | | | | | | | | | | | Versioning the font resources using webpack Closes #701 See merge request pleroma/pleroma-fe!1017
| * add html-webpack-plugin to karma configtaehoon2019-12-03
| |
| * use another fork of fontello-webpack-plugintaehoon2019-12-03
| |
| * add animate-spin classtaehoon2019-12-03
| |
| * remove needless codetaehoon2019-12-03
| |
| * use another approach for versioning font filestaehoon2019-12-03
| |
| * versioning the font resources through webpacktaehoon2019-12-02
|/
* Merge branch 'fix/mrf-js-errors' into 'develop'Shpuld Shpludson2019-12-02
|\ | | | | | | | | fix "can't find property of undefined" errors in mrf transparency panel See merge request pleroma/pleroma-fe!1008
| * fix "can't find property of undefined" errors in mrf transparency panelShpuld Shpludson2019-12-02
|/
* Merge branch '719' into 'develop'Shpuld Shpludson2019-12-02
|\ | | | | | | | | | | | | Fix "Muted users not being collapsed on other user's profiles" Closes #719 See merge request pleroma/pleroma-fe!1013
| * restore muted users collapsing logic on other user’s profilestaehoon2019-11-25
| |
* | Merge branch '712' into 'develop'Shpuld Shpludson2019-12-02
|\ \ | |/ |/| | | | | | | | | Move mention button right next to mute button Closes #712 See merge request pleroma/pleroma-fe!1015
| * move mention button right next to mute buttontaehoon2019-11-26
|/
* Merge branch 'i18n/improve-easy-pedantic-japanese-switching-system' into ↵HJ2019-11-19
|\ | | | | | | | | | | | | 'develop' [i18n] Improve easy/pedantic Japanese switching See merge request pleroma/pleroma-fe!1003
| * [i18n] Improve easy/pedantic Japanese switchingHakaba Hitoyo2019-11-19
|/