aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Logic should be to hide TWKN if not federating OR if instance is not publicMark Felder2019-12-12
| | | | Private instances should not show any timelines
* 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
|\
| * 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
| |/
| * Merge branch 'greentext-strikes-back' into 'develop'HJ2019-11-19
| |\ | | | | | | | | | | | | | | | | | | ⑨ Added greentext support ⑨ Closes #9 See merge request pleroma/pleroma-fe!994
| | * use yarn, try to restart pipelineHenry Jameson2019-11-14
| | |
| | * tests + updatesHenry Jameson2019-11-14
| | |
| | * eslintHenry Jameson2019-11-14
| | |
| | * making dtluna proud or disgustedHenry Jameson2019-11-14
| | |
| | * Made it optionalHenry Jameson2019-11-14
| | |
| | * Fix regex, tag detector conditionHenry Jameson2019-11-14
| | |
| | * adds greentext, also small fixesHenry Jameson2019-11-14
| | |
| * | Merge branch 'iss-149/profile-fields-normalize' into 'develop'Shpuld Shpludson2019-11-19
| |\ \ | | | | | | | | | | | | | | | | Normalize profile fields See merge request pleroma/pleroma-fe!995