Henry Jameson
e0247e21f6
Merge remote-tracking branch 'upstream/develop' into webpack-4-dart-sass
...
* upstream/develop: (126 commits)
entity normalizer: hook up in_reply_to_account_acct
add BBCode strings
fix follow button not updating bug in follow-card
refer searched user objects from the global user rep
set max-width of textarea in settings page
Remove space in the timeline setting copy
user_card.vue: Fix .emoji to apply to img
Update oc.json
Update oc.json
Update oc.json
Update oc.json
replace pencil with wrench icon
rebuild fontello with wrench icon added
fetch all friends using pagination
stop fetching user relationship when user is unauthorized
Revert "recover border between basic-user-card using list component"
remove extra spacing
code readability
fix typos
clean up
...
2019-04-27 12:26:17 +03:00
taehoon
445b54c553
fix follow button not updating bug in follow-card
2019-04-22 11:17:01 -04:00
taehoon
f2f3fa81d8
refer searched user objects from the global user rep
2019-04-22 11:17:01 -04:00
Shpuld Shpludson
c8f967d5c0
Merge branch '500' into 'develop'
...
Set max-width of textarea in settings page
Closes #500
See merge request pleroma/pleroma-fe!761
2019-04-22 14:00:09 +00:00
Shpuld Shpludson
98742979c8
Merge branch '501' into 'develop'
...
Remove space in the timeline setting copy
Closes #501
See merge request pleroma/pleroma-fe!763
2019-04-22 13:15:07 +00:00
Shpuld Shpludson
9183c9e845
Merge branch 'change-pencil-to-wrentch' into 'develop'
...
Change pencil icon to wrentch
See merge request pleroma/pleroma-fe!764
2019-04-22 13:11:14 +00:00
taehoon
f7baa6e190
set max-width of textarea in settings page
2019-04-21 14:06:32 -04:00
taehoon
aefd4551a3
Remove space in the timeline setting copy
2019-04-21 14:06:10 -04:00
Haelwenn (lanodan) Monnier
14d506154e
user_card.vue: Fix .emoji to apply to img
2019-04-20 21:12:56 +02:00
Brenden Bice
6aee2ed63f
replace pencil with wrench icon
...
# Conflicts:
# src/components/user_card/user_card.vue
2019-04-19 13:24:35 -04:00
taehoon
de945e5f88
Revert "recover border between basic-user-card using list component"
...
This reverts commit 1d56d486f1f679e793e710969ad54cce5fdb1ebc.
# Conflicts:
# src/components/follow_requests/follow_requests.vue
# src/components/user_search/user_search.vue
# src/components/who_to_follow/who_to_follow.vue
2019-04-17 11:32:49 -04:00
taehoon
bd88a481c6
remove extra spacing
2019-04-17 11:32:49 -04:00
taehoon
e67fecff0a
code readability
2019-04-17 11:32:49 -04:00
taehoon
bb38a43117
fix typos
2019-04-17 11:32:49 -04:00
taehoon
a89236f67c
clean up
2019-04-17 11:32:49 -04:00
taehoon
10ecc2c816
make sure to use filtered selected keys
2019-04-17 11:32:49 -04:00
taehoon
ecff6acf2d
support indeterminate checkbox state
2019-04-17 11:32:49 -04:00
taehoon
3f5e798de7
render span tag only if it has content
2019-04-17 11:32:49 -04:00
taehoon
988849116d
update model and props properties
2019-04-17 11:32:49 -04:00
taehoon
8088043a0c
import scss variables
2019-04-17 11:32:49 -04:00
taehoon
1144025f30
update checkbox importing path
2019-04-17 11:32:49 -04:00
taehoon
468aec0de1
rewrite checkbox component as non-functional
2019-04-17 11:32:49 -04:00
taehoon
ac9ddfb1e2
support i18n
2019-04-17 11:32:49 -04:00
taehoon
7f6bd538f3
ui improvements
2019-04-17 11:32:49 -04:00
taehoon
c81bde0c1d
clean up
2019-04-17 11:32:49 -04:00
taehoon
d3cad54aa3
add bulk mute/unmute buttons and wire up to vuex
2019-04-17 11:32:49 -04:00
taehoon
13c8f10f4b
wire up bulk action buttons to vuex
2019-04-17 11:32:49 -04:00
taehoon
7e74a13fcf
add a comment
2019-04-17 11:32:49 -04:00
taehoon
1afef1037e
show list header only if there are items
2019-04-17 11:32:49 -04:00
taehoon
ac62e47c70
pass down empty slot
2019-04-17 11:32:49 -04:00
taehoon
67919f95a6
make border of list header thicker
2019-04-17 11:32:49 -04:00
taehoon
8fa639f252
add bulk action buttons
2019-04-17 11:32:49 -04:00
taehoon
403c7bbe6c
add reusable progress-button cmoponent
2019-04-17 11:32:49 -04:00
taehoon
fe7766bc61
replace scope attributes by slot-scope
2019-04-17 11:32:49 -04:00
taehoon
d4e43e0e26
add border-bottom to the header
2019-04-17 11:32:49 -04:00
taehoon
7a8ffcd79b
support header slot
2019-04-17 11:32:49 -04:00
taehoon
cf2c411db3
add header to selectable-list component
2019-04-17 11:32:49 -04:00
taehoon
83faa96f1b
remove border-bottom of the last list item
2019-04-17 11:32:49 -04:00
taehoon
ca26776b4e
recover border between basic-user-card using list component
2019-04-17 11:32:49 -04:00
taehoon
f066ccd28b
show empty slot only if it has content
2019-04-17 11:32:49 -04:00
taehoon
b8ec13c8fd
let not selectable-list know about getKey prop
2019-04-17 11:32:49 -04:00
taehoon
32035217b8
clean up
2019-04-17 11:32:49 -04:00
taehoon
792ae1697e
refactor selectable-list using list component
2019-04-17 11:32:49 -04:00
taehoon
d806038ad3
add border-bottom style to the list component as well
2019-04-17 11:32:49 -04:00
taehoon
80d83b46d9
move border-bottom style to the list
2019-04-17 11:32:49 -04:00
taehoon
3a318dc373
add some styling to the selectable-list component
2019-04-17 11:32:48 -04:00
taehoon
f6e9f28745
use key properly
2019-04-17 11:32:48 -04:00
taehoon
e0b2463750
save selected items to the state
2019-04-17 11:32:48 -04:00
taehoon
d9b3f5be47
use SelectableList for blocks/mutes list
2019-04-17 11:32:48 -04:00
taehoon
23b9d1eaa3
rename selectable_row to selectable_list
2019-04-17 11:32:48 -04:00
