Shpuld Shpuldson
910b82e231
Use last seen notif instead of first unseen notif for sinceId
2020-01-14 11:13:59 +02:00
HJ
7257189ea7
Merge branch 'pleroma-amoled-theme' into 'develop'
...
Add default pleroma AMOLED dark theme
See merge request pleroma/pleroma-fe!1039
2020-01-07 23:39:14 +00:00
Sierra
ae2ae00d41
Add AMOLED dark theme
2020-01-07 21:13:51 +00:00
HJ
ad97e03b59
Merge branch 'fix-move-type-notification' into 'develop'
...
Fix for move type notification
See merge request pleroma/pleroma-fe!1026
2020-01-03 10:16:42 +00:00
HJ
215662afde
Merge branch 'develop' into 'fix-move-type-notification'
...
# Conflicts:
# static/fontello.json
2020-01-03 09:05:48 +00:00
HJ
1a82a00a2b
Merge branch 'mfa_fix' into 'develop'
...
mfa fix
See merge request pleroma/pleroma-fe!1036
2019-12-30 14:45:49 +00:00
Wyatt Benno
816c077c4f
mfa fix
2019-12-30 19:27:44 +09:00
HJ
b8f4b18ae5
Merge branch 'streaming' into 'develop'
...
Streaming and Backend Interactor service overhaul, removed the need for copypasting
See merge request pleroma/pleroma-fe!1012
2019-12-26 16:49:42 +00:00
Henry Jameson
bd07e5de1c
unify showimmideately
2019-12-26 14:35:46 +02:00
Henry Jameson
43197c4243
Some error handling
2019-12-26 14:12:35 +02:00
Henry Jameson
b619477573
Merge remote-tracking branch 'upstream/develop' into streaming
...
* upstream/develop: (51 commits)
toggle_activation api is also deprecated
use vuex action
refactor toggleActivationStatus
replace setActivationStatus api with new one
use flex for stickers
i18n/update-ja_easy
Use a centralized fallback for missing values and use instance.federating instead of instance.federation.enabled
Add fallback in case BE does not report federating status in nodeinfo
The value we are looking for is federationPolicy.enabled, not federationPolicy.federating
Logic should be to hide TWKN if not federating OR if instance is not public
Finally trust eslint
More lint
More lint
Lint
mfa: removed unused code
increase icon width a little bit in the nav panel
add icons to nav panel
Revert "Merge branch 'revert-96cab6d8' into 'develop'"
Support "native" captcha
Revert "Merge branch 'oauth-extra-scopes' into 'develop'"
...
2019-12-26 12:47:51 +02:00
HJ
f7029a27eb
Merge branch '716' into 'develop'
...
Fix "Deactivation of remote accounts from frontend does not work"
Closes #716
See merge request pleroma/pleroma-fe!1006
2019-12-18 00:51:41 +00:00
taehoon
4e4c4af422
toggle_activation api is also deprecated
2019-12-15 14:32:04 -05:00
taehoon
36376ce57c
use vuex action
2019-12-15 14:32:04 -05:00
taehoon
45e7f93c49
refactor toggleActivationStatus
2019-12-15 14:32:04 -05:00
taehoon
506822bed0
replace setActivationStatus api with new one
2019-12-15 14:32:04 -05:00
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
3691093572
Merge branch 'i18b/update-ja_easy' into 'develop'
...
i18n/update-ja_easy
See merge request pleroma/pleroma-fe!1002
2019-12-13 17:05:14 +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
051b9703df
Merge branch 'nav-icons' into 'develop'
...
Add icons to nav panel
See merge request pleroma/pleroma-fe!1016
2019-12-12 19:15:14 +00:00
Maksim Pechnikov
addacf36d1
mfa: removed unused code
2019-12-12 21:19:13 +03:00
Henry Jameson
585702b1ce
fix desktop notifications not working with streaming
2019-12-12 18:53:36 +02: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
c2c48ec25c
Merge branch 'revert-96cab6d8' into 'develop'
...
Revert "Merge branch 'oauth-extra-scopes' into 'develop'"
See merge request pleroma/pleroma-fe!1032
2019-12-12 09:42:41 +00: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
seven
d7bc1aff1d
fix babelrc plugin config
2019-12-12 06:35:48 +05:00
Henry Jameson
63a5f50e7c
fix deletes causing errors
2019-12-11 18:20:43 +02:00
