HJ
|
b739edb509
|
Merge branch 'fix-sticker-height' into 'develop'
fix sticker picker height in emojo picker
See merge request pleroma/pleroma-fe!1022
|
2019-12-15 17:59:27 +00:00 |
|
|
|
32d7a49b9d
|
use flex for stickers
|
2019-12-15 17:58:37 +01:00 |
|
HJ
|
c1a0e23947
|
Merge branch 'revert-c2c48ec2' into 'develop'
Reinstate `push` and `admin` scopes
See merge request pleroma/pleroma-fe!1034
|
2019-12-14 14:12:41 +00:00 |
|
|
|
1cba6c56f0
|
i18n/update-ja_easy
|
2019-12-13 17:05:13 +00:00 |
|
|
|
749a399944
|
Merge branch 'issue_124' into 'develop'
Change 403 messaging
See merge request pleroma/pleroma-fe!1020
|
2019-12-13 17:02:09 +00:00 |
|
|
|
0b49e798e0
|
Merge branch 'feature/lockdown-timelines-private-mode' into 'develop'
interaction with BE private mode
See merge request pleroma/pleroma-fe!989
|
2019-12-13 16:58:29 +00:00 |
|
HJ
|
766a674a48
|
Merge branch 'upgrade-babel' into 'develop'
Upgrade babel to v7
Closes #733
See merge request pleroma/pleroma-fe!1029
|
2019-12-13 10:21:29 +00:00 |
|
HJ
|
9789123b1c
|
Merge branch 'mfa/login_form' into 'develop'
mfa: fix login and recovery form
See merge request pleroma/pleroma-fe!1031
|
2019-12-13 10:18:50 +00:00 |
|
Mark Felder
|
d899d06973
|
Use a centralized fallback for missing values and use instance.federating instead of
instance.federation.enabled
|
2019-12-12 15:29:50 -06:00 |
|
Mark Felder
|
8d14036a23
|
Add fallback in case BE does not report federating status in nodeinfo
|
2019-12-12 15:17:23 -06:00 |
|
Mark Felder
|
0743fbb28b
|
The value we are looking for is federationPolicy.enabled, not federationPolicy.federating
Also the || true fallback does not work and always becomes true
|
2019-12-12 13:56:07 -06:00 |
|
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 |
|
Maksim Pechnikov
|
addacf36d1
|
mfa: removed unused code
|
2019-12-12 21:19:13 +03: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 |
|
Ivan Tashkinov
|
341416b0e0
|
Revert "Merge branch 'revert-96cab6d8' into 'develop'"
This reverts merge request !1032
|
2019-12-12 14:43:48 +00: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
|
b973ee5915
|
must use h in higher babel-plugin-transform-vue-jsx
|
2019-12-12 12:13:31 +05:00 |
|
Maksim Pechnikov
|
f70fe28f64
|
mfa: fix login and recovery form
|
2019-12-12 08:42:21 +03: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 |
|
|
|
7e3a4fa8ec
|
fix invisible tab-switcher in emoji picker
|
2019-12-09 22:16:51 +01:00 |
|
|
|
f6d8f245e6
|
Revert "fix sticker picker height in emojo picker"
This reverts commit 914c783984.
|
2019-12-09 22:15:38 +01:00 |
|
Wyatt Benno
|
8ee8033955
|
Set error data
|
2019-12-09 10:31:57 +09:00 |
|
Wyatt Benno
|
1a043d4350
|
remove console
|
2019-12-09 09:11:31 +09:00 |
|
Wyatt Benno
|
e86af0c965
|
Change naming, make more general
|
2019-12-09 09:02:34 +09: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 |
|
Absturztaube
|
914c783984
|
fix sticker picker height in emojo picker
|
2019-12-07 10:29:53 +01:00 |
|
Wyatt Benno
|
01855f315c
|
Wording updates
|
2019-12-06 09:38:55 +09:00 |
|
Wyatt Benno
|
13fc2612ae
|
Change 403 messaging
|
2019-12-05 11:48:37 +09: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 |
|
|
|
55da4462a4
|
[i18n] Improve easy/pedantic Japanese switching
|
2019-11-19 17:02:45 +00:00 |
|
