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
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
taehoon
54f692622a
wire up staff accounts with correct store data
2019-12-15 14:30:09 -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
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
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
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
Henry Jameson
63a5f50e7c
fix deletes causing errors
2019-12-11 18:20:43 +02: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
kPherox
c3e7806acb
remove unused fallback
2019-12-11 18:48:18 +09:00
kPherox
b4acbf5311
Add user migrates filter to interactions
2019-12-11 18:30:26 +09:00
kPherox
e8333fff8d
change the expression of move
2019-12-11 18:30:23 +09:00
Henry Jameson
6acd889589
Option to enable streaming
2019-12-10 21:30:27 +02:00
kPherox
31aa177eea
Fix target account link
2019-12-11 04:02:25 +09:00
kPherox
6af870cd90
Add view for moves notifications
2019-12-11 00:00:45 +09:00
kPherox
2bc63720a5
fix parse for move type notifications
2019-12-11 00:00:36 +09: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
Henry Jameson
505fb26061
better wrapper for websocket
2019-12-08 19:18:38 +02:00
Henry Jameson
1b1620a755
Merge remote-tracking branch 'upstream/develop' into streaming
...
* upstream/develop:
Remove whitespace hack on empty post content
Change output directory of fontello
add html-webpack-plugin to karma config
use another fork of fontello-webpack-plugin
add animate-spin class
remove needless code
use another approach for versioning font files
versioning the font resources through webpack
fix "can't find property of undefined" errors in mrf transparency panel
move mention button right next to mute button
restore muted users collapsing logic on other user’s profiles
2019-12-08 16:07:30 +02:00
Henry Jameson
ff95d865d2
Updated streaming and improved error-handling, some more refactoring to api
2019-12-08 16:05:41 +02: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
Henry Jameson
172ebaf4e6
improved initial notifications fetching
2019-11-24 22:01:12 +02:00
Henry Jameson
319bb4ac28
initial streaming work
2019-11-24 18:50:28 +02:00
Henry Jameson
ddb6fb9217
Backend Interactor service overhaul, removed the need for copypasting
2019-11-24 13:57:46 +02:00
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
Shpuld Shpuldson
de945ba3e9
wip commit, add basic popover for emoji reaction select
2019-11-15 16:29:25 +02:00
Shpuld Shpuldson
d007502629
add fetching for emoji reactions, draft design
2019-11-15 08:39:21 +02: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
Ariadne Conill
c24f95b498
mrf transparency panel: refactor to use vuex mapState
2019-11-09 11:32:18 -06:00
Ariadne Conill
6d6b5f3dbb
mrf transparency panel: remove unneeded components{}
2019-11-09 11:16:19 -06:00
Ariadne Conill
a4ae956a62
boot: cleanup resolveStaffAccounts
2019-11-09 00:34:05 -06:00
Ariadne Conill
6dfe3cc911
lint
2019-11-09 00:23:22 -06:00
Ariadne Conill
90f764224d
about: add MRF transparency panel
2019-11-09 00:09:32 -06:00
Ariadne Conill
20ccd93a17
about: add staff panel
2019-11-08 23:21:07 -06:00
Ariadne Conill
5db77c839b
about page: fix hiding of instance-specific panel, flow ToS and ISP better
2019-11-08 21:57:09 -06:00
Ariadne Conill
6cede475be
nav panel: add link to about page
2019-11-08 21:53:53 -06:00
e4820012a3
redirect /remote-users/:username@:hostname -> /users/:id, /remote-users/:hostname/:username -> /users/:id
2019-11-08 22:27:25 +00:00
HJ
2b68134ab0
Merge branch 'emoji-optimizations' into 'develop'
...
Emoji fixes, optimizations and improvements
Closes #690 , #686 , #682 , #674 , and #678
See merge request pleroma/pleroma-fe!969
2019-11-08 22:01:42 +00:00
Henry Jameson
a3501d58d8
clear filter on reopen, fix error message in console
2019-11-08 23:57:20 +02:00
Henry Jameson
23137dfd4b
reset position when reopening emoji picker
2019-11-08 21:44:36 +02:00
Henry Jameson
a69946923b
eslint fix
2019-11-08 21:35:58 +02:00
Henry Jameson
a43f1614ca
fix not being able to see unicode emojis when there few of them when searching
...
on emoji-a-ton instances
2019-11-08 21:28:51 +02:00
Henry Jameson
9338c81f4a
replace sanity button with loading on scroll
2019-11-08 21:25:13 +02:00
Henry Jameson
a38d16273d
fix search not working, use computer property instead of state
2019-11-08 20:12:01 +02:00
Henry Jameson
0dcb696e26
Merge remote-tracking branch 'upstream/develop' into emoji-optimizations
...
* upstream/develop: (95 commits)
Lightbox/modal multi image improvements - #381
'/api/pleroma/profile/mfa' -> '/api/pleroma/accounts/mfa'
Add ability to change user's email
translations-de-batch-1
eu-translate update
profile-banner rounding css, fixes #690
fix indentation
remove needless ref
show preview popover when hover numbered replies
refactor conditions
do not make too many nested div
add fetchStatus action
refactor status loading logic
split status preview popover into a separate component
uninstall mobile-detect library
listen both events
minor css fix
restrict distance at top side only
set different trigger event in desktop and mobile by default
fix eslint warnings
...
2019-11-08 19:48:31 +02:00
taehoon
c1478b0887
fix eslint warnings
2019-11-08 11:14:01 -05:00
Wyatt Benno
f66026bf20
Lightbox/modal multi image improvements - #381
2019-11-08 06:16:26 +00:00
Maksim
ded022a1d2
'/api/pleroma/profile/mfa' -> '/api/pleroma/accounts/mfa'
2019-11-08 02:42:32 +00:00
Sergey Suprunenko
e3381cdef1
Add ability to change user's email
2019-11-08 02:21:19 +00:00
18acc7af29
translations-de-batch-1
2019-11-08 01:29:01 +00:00
Tarteka
28524ab4a6
eu-translate update
2019-10-30 22:31:55 +01:00
DYM
1d2ddaf2d0
profile-banner rounding css, fixes #690
2019-10-30 03:15:57 +00:00
Henry Jameson
b66564a30d
Merge remote-tracking branch 'upstream/develop' into settings-refactor
...
* upstream/develop: (89 commits)
remove needless ref
show preview popover when hover numbered replies
refactor conditions
do not make too many nested div
add fetchStatus action
refactor status loading logic
split status preview popover into a separate component
uninstall mobile-detect library
listen both events
minor css fix
restrict distance at top side only
set different trigger event in desktop and mobile by default
fix eslint warnings
fix popper go behind the top bar
migrate Popper to v-popover
fix popper go behind the top bar
fix eslint warnings
reset font-size to normal text size using rem
use top placement by default
hide status preview popper when hover popper content
...
2019-10-29 09:36:16 +02:00
Henry Jameson
c79b2501d2
fix indentation
2019-10-29 09:35:42 +02:00
Shpuld Shpludson
42f428d90e
Merge branch 'eu-translate' into 'develop'
...
[i18n] basque update and fix
See merge request pleroma/pleroma-fe!966
2019-10-29 07:04:51 +00:00
Shpuld Shpludson
c79da5c456
Merge branch '599' into 'develop'
...
Fix "Posts get cut off when there is not enough space to display them at the bottom"
Closes #599
See merge request pleroma/pleroma-fe!863
2019-10-29 06:37:23 +00:00
Shpuld Shpludson
3a3db35985
Merge branch 'patch-3' into 'develop'
...
Little fix to some strings on es.json
See merge request pleroma/pleroma-fe!967
2019-10-29 06:06:58 +00:00
Henry Jameson
6ade3be5b4
fix loadEmojiInsane button submitting the form
2019-10-27 19:20:38 +02:00
taehoon
237d95b0f7
remove needless ref
2019-10-24 23:50:50 -04:00
taehoon
fbd1922567
show preview popover when hover numbered replies
2019-10-24 22:55:02 -04:00
taehoon
c5e391b606
refactor conditions
2019-10-24 22:41:15 -04:00
taehoon
644343ccda
do not make too many nested div
2019-10-24 22:27:23 -04:00
taehoon
f969e9ab3d
add fetchStatus action
2019-10-24 22:21:33 -04:00
taehoon
e00cf288f5
refactor status loading logic
2019-10-24 22:14:53 -04:00
taehoon
62b2648a3e
split status preview popover into a separate component
2019-10-24 16:53:36 -04:00
taehoon
95e211ccb7
listen both events
2019-10-24 16:11:28 -04:00
taehoon
052a00dadb
minor css fix
2019-10-24 15:15:33 -04:00
taehoon
17295429e5
restrict distance at top side only
2019-10-24 15:15:33 -04:00
taehoon
c009f17651
set different trigger event in desktop and mobile by default
2019-10-24 15:15:33 -04:00
taehoon
c9ba37ba2c
fix eslint warnings
2019-10-24 15:15:33 -04:00
taehoon
39e92e76b9
fix popper go behind the top bar
2019-10-24 15:15:33 -04:00
taehoon
85c897403a
migrate Popper to v-popover
2019-10-24 15:15:33 -04:00
taehoon
2f7f6967fd
fix popper go behind the top bar
2019-10-24 15:15:33 -04:00
taehoon
e834b9d88b
fix eslint warnings
2019-10-24 15:15:33 -04:00
taehoon
1504b272d2
reset font-size to normal text size using rem
2019-10-24 15:15:33 -04:00
taehoon
0f65280e20
use top placement by default
2019-10-24 15:15:33 -04:00
taehoon
72fe385ec4
hide status preview popper when hover popper content
2019-10-24 15:15:33 -04:00
taehoon
498d7bcb5e
use better name
2019-10-24 15:15:33 -04:00
taehoon
5d6fcb3bb3
css cleanup
2019-10-24 15:15:33 -04:00
taehoon
a26ec64b3b
fix minor css issues in status preview
2019-10-24 15:15:33 -04:00
taehoon
565d53812b
reposition popper after fetching status
2019-10-24 15:15:33 -04:00
taehoon
5faafdb428
use popper for status preview
2019-10-24 15:15:32 -04:00
