Commit graph

3149 commits

Author SHA1 Message Date
Mark Felder 2514dc183f Logic should be to hide TWKN if not federating OR if instance is not public
Private instances should not show any timelines
2019-12-12 13:51:50 -06:00
Mark Felder 7ddd5af081 Finally trust eslint 2019-12-12 13:46:07 -06:00
Mark Felder afe5b3a82d More lint 2019-12-12 13:41:52 -06:00
Mark Felder 211d25cd5a More lint 2019-12-12 13:39:18 -06:00
Mark Felder 3eeb3dc572 Lint 2019-12-12 13:37:32 -06:00
Mark Felder 821a2bcc68 Merge branch 'develop' into feature/lockdown-timelines-private-mode 2019-12-12 13:32:52 -06:00
taehoon a412b53801 increase icon width a little bit in the nav panel 2019-12-12 10:42:27 -05:00
taehoon 7fa294f11c add icons to nav panel 2019-12-12 10:42:27 -05:00
HJ c7376b8325 Merge branch 'support-native-captcha' into 'develop'
Support "native" captcha

See merge request pleroma/pleroma-fe!1033
2019-12-12 12:24:35 +00:00
HJ a621382a3f Merge branch 'load-button-fix' into 'develop'
Fix css runtime loading issue

Closes #734

See merge request pleroma/pleroma-fe!1030
2019-12-12 12:23:01 +00:00
Egor Kislitsyn ed3144eb11 Support "native" captcha 2019-12-12 18:19:46 +07:00
lain b399235848 Revert "Merge branch 'oauth-extra-scopes' into 'develop'"
This reverts merge request !1024
2019-12-12 09:38:24 +00:00
seven 386719b0d0 fix css runtime loading issue 2019-12-12 08:33:40 +05:00
taehoon d0c78989aa hide instance url/link/text in header using hideSitename option 2019-12-11 10:14:30 -05:00
Maksim Pechnikov d6dc2bad1f fixed typo 2019-12-11 15:59:29 +03:00
rinpatch 96cab6d811 Merge branch 'oauth-extra-scopes' into 'develop'
OAuth 'push' and 'admin' scopes support

See merge request pleroma/pleroma-fe!1024
2019-12-11 09:57:32 +00:00
Ivan Tashkinov a06705d939 Added OAuth 'push' and 'admin' scopes. 2019-12-08 13:52:26 +03:00
rinpatch 3b11860d34 Remove whitespace hack on empty post content
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.
2019-12-08 02:05:50 +03:00
taehoon 9d44015ab4 add animate-spin class 2019-12-03 11:16:38 -05:00
taehoon 57f46e68e4 remove needless code 2019-12-03 10:34:17 -05:00
taehoon afd4524c39 use another approach for versioning font files 2019-12-03 10:32:46 -05:00
taehoon 0082ed837e versioning the font resources through webpack 2019-12-02 10:24:43 -05:00
Shpuld Shpludson fa38a41e42 fix "can't find property of undefined" errors in mrf transparency panel 2019-12-02 12:20:24 +00:00
Shpuld Shpludson d3adffbefe Merge branch '719' into 'develop'
Fix "Muted users not being collapsed on other user's profiles"

Closes #719

See merge request pleroma/pleroma-fe!1013
2019-12-02 12:17:43 +00:00
taehoon 7ebf3602d5 move mention button right next to mute button 2019-11-26 19:57:27 -05:00
taehoon 40e774e05a restore muted users collapsing logic on other user’s profiles 2019-11-25 12:25:01 -05:00
Hakaba Hitoyo 55da4462a4 [i18n] Improve easy/pedantic Japanese switching 2019-11-19 17:02:45 +00:00
HJ 0eda60eeb4 Merge branch 'greentext-strikes-back' into 'develop'
⑨ Added greentext support ⑨

Closes #9

See merge request pleroma/pleroma-fe!994
2019-11-19 14:22:17 +00:00
kPherox a55486f8d7 Normalize profile fields 2019-11-19 14:15:41 +00:00
kPherox 0995658757 backend interactor service: implement startFetchingFollowRequest
backend interactor service: remove unused fetchFollowRequests
2019-11-19 14:07:15 +00:00
taehoon 44cd5ef814 show badge visibility user setting checkbox only if needed 2019-11-16 12:12:21 -05:00
AkiraFukushima 67c95c9d06 Use kana+kanji as default for Japanese translation 2019-11-17 01:11:19 +09:00
Mew Mew 3ecfbc8ea2 Fix translation (https://blob.cat/notice/9oyYO1RzcNbJXxKxeq) 2019-11-15 05:09:01 +00:00
Henry Jameson bd2a682b83 tests + updates 2019-11-14 22:40:20 +02:00
taehoon 90fc6b0774 close image modal by clicking image 2019-11-14 14:07:05 -05:00
Henry Jameson 51ea295704 eslint 2019-11-14 00:52:38 +02:00
Henry Jameson bce750c571 making dtluna proud or disgusted 2019-11-14 00:49:31 +02:00
Henry Jameson 897131572f Made it optional 2019-11-14 00:47:20 +02:00
Henry Jameson 692ee0e95a Fix regex, tag detector condition 2019-11-14 00:41:14 +02:00
Henry Jameson 50dc9df8a4 adds greentext, also small fixes 2019-11-14 00:18:14 +02:00
taehoon 58839ecef8 change N/A to Hidden 2019-11-12 13:31:30 -05:00
taehoon 85685d6478 add a translation 2019-11-12 11:42:07 -05:00
taehoon 949f47063b show N/A when count is hidden 2019-11-12 11:41:55 -05:00
Ariadne Conill 43d4d17b41 side drawer: same treatment 2019-11-11 14:37:14 -06:00
Ariadne Conill cb5f73148a app: search API is not available in private mode so disable it 2019-11-11 14:28:10 -06:00
Ariadne Conill 1f9674350c nav panel: disable TWKN if federation disabled, disable Public and TWKN if privateMode is enabled 2019-11-11 14:28:07 -06:00
Ariadne Conill 21f1637e43 nav panel: refactor to use vuex mapState 2019-11-11 14:14:44 -06:00
Ariadne Conill 99fd096ddd boot: track whether private mode is enabled or not 2019-11-11 14:06:31 -06:00
Henry Jameson 9e774fffbf achieve the perfect speeeeen in media-upload 2019-11-11 21:45:40 +02:00
taehoon 3c3f2c654e add hideISP to defaultState of config module 2019-11-10 14:42:01 -05:00