Commit Graph

1741 Commits

Author SHA1 Message Date
HJ
d94fdd0617 Merge branch '220-import-export-blocks-mutes' into 'develop'
Allow import/export of blocks

See merge request pleroma/pleroma-fe!717
2019-04-29 18:15:58 +00:00
taehoon
5b16e36828 remove & 2019-04-29 13:57:44 -04:00
taehoon
a793835566 add a comment 2019-04-29 13:53:21 -04:00
taehoon
b1f8221a0a show ellipsis for long user name and screen name 2019-04-29 13:27:10 -04:00
taehoon
3665c86d70 use default_scope parameter 2019-04-27 21:51:17 -04:00
taehoon
2c4af6693a clean up 2019-04-27 14:04:30 -04:00
taehoon
ab19669bf1 refactoring 2019-04-27 08:31:06 -04:00
taehoon
95bc2d727b add “export blocks” feature 2019-04-27 08:31:06 -04:00
taehoon
13abe64f87 fix wrong function binding 2019-04-27 08:31:06 -04:00
taehoon
08eaf9bd33 make reusable Exporter component 2019-04-27 08:31:06 -04:00
taehoon
0ab2f9dfa5 add “block import” feature 2019-04-27 08:31:06 -04:00
taehoon
6ea4154084 change api function name 2019-04-27 08:31:06 -04:00
taehoon
6d0e98a1c2 make Importer component reusable 2019-04-27 08:31:06 -04:00
taehoon
18bb209ace add uploading icon css 2019-04-27 08:31:06 -04:00
taehoon
903bce40c3 move formData generating logic to api.service 2019-04-27 08:31:06 -04:00
taehoon
562120ae48 split out follow’s importer as a separate component 2019-04-27 08:31:06 -04:00
taehoon
ac0b45fa14 Update avatar uploading 2019-04-27 08:30:08 -04:00
taehoon
e14720419f Switch to mastoapi for updating user profile 2019-04-27 08:30:08 -04:00
taehoon
909d11825d Switch to mastoapi for updating banner 2019-04-27 08:30:08 -04:00
taehoon
808e1ac11c Switch to mastoapi for updating avatar
# Conflicts:
#	src/services/api/api.service.js
2019-04-27 08:30:08 -04:00
shpuld
8af8f719e4 fix i18n 2019-04-22 21:37:27 +03:00
shpuld
3e23b34168 fix overflow behavior 2019-04-22 21:07:29 +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
d417945427 Merge branch 'develop' into brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users 2019-04-22 17:24:35 +03: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
taehoon
0bf451bb36 remove withList hoc 2019-04-17 11:32:48 -04:00
taehoon
738a3dc02d refactor using List component 2019-04-17 11:32:48 -04:00
taehoon
1cec2b6969 use reusable List vue component instead of withList hoc
Using slot is the preferred way in vue
2019-04-17 11:32:48 -04:00
taehoon
4b292564d8 add SelectableRow component 2019-04-17 11:32:48 -04:00
taehoon
a509990937 add checkbox component 2019-04-17 11:32:48 -04:00
shpuld
75a650aa6d update styles and remove unnecessary stuff 2019-04-17 18:28:44 +03:00
taehoon
2e86a4eb4f fix mess in UserProfile component 2019-04-15 16:49:33 -04:00
Shpuld Shpludson
55410c91fa Merge branch '489' into 'develop'
Fix Blocked status inconsistency between Blocks setting tab and Following profile tab

Closes #489

See merge request pleroma/pleroma-fe!751
2019-04-15 19:58:15 +00:00
taehoon
329dc833b3 clean up 2019-04-14 23:44:50 -04:00
taehoon
d874ca905c support i18n 2019-04-14 23:44:50 -04:00
taehoon
d58e08cf52 add search to the mutes tab as well 2019-04-14 23:44:50 -04:00
taehoon
0bdb0e5a81 rename Autosuggest component 2019-04-14 23:44:49 -04:00
taehoon
1cf9780e05 make more generic 2019-04-14 23:44:49 -04:00
taehoon
fc5f4fba8c make more generic 2019-04-14 23:44:49 -04:00
taehoon
8410add394 make UserAutoSuggest component more generic 2019-04-14 23:44:49 -04:00
taehoon
9184435887 remove blocked one from the results on real time 2019-04-14 23:44:49 -04:00
taehoon
33467880ed improve ui 2019-04-14 23:44:49 -04:00
taehoon
60b07eeaa4 filter out blocked user or me from the results 2019-04-14 23:44:49 -04:00
taehoon
69f9ea987c make blocking functional in the search results 2019-04-14 23:44:49 -04:00
taehoon
fd4289e45a improve ui 2019-04-14 23:44:49 -04:00
taehoon
787737c80d hide results on outside click 2019-04-14 23:44:49 -04:00
taehoon
b2eb43e3c8 rename css classes 2019-04-14 23:44:49 -04:00
taehoon
94e67ff118 rewrite USerAutoSuggest without any dependency 2019-04-14 23:44:49 -04:00
taehoon
da5844205c add user autosuggest component 2019-04-14 23:44:49 -04:00
taehoon
e7010d73ac store friends/followers in the global user repository 2019-04-14 23:41:38 -04:00
Henry Jameson
7d01b3d8ba Fix wrong usercard notification 2019-04-12 10:49:22 +03:00
Brenden Bice
8ed4eb8a7f refactor showing favs and repeats logic 2019-04-11 23:26:13 -04:00
Brenden Bice
f74a6b4b57 display favs & reblogged users on expanded post in timeline view 2019-04-11 23:26:13 -04:00
Brenden Bice
efd20967df display avatars only on highlighted post 2019-04-11 23:26:13 -04:00
Brenden Bice
8cac0dec6f add fadein effect to panel 2019-04-11 23:26:13 -04:00
Brenden Bice
246fab328f remove commented code 2019-04-11 23:26:13 -04:00
Brenden Bice
fcea3d62cb display avatars list on highlighted post 2019-04-11 23:26:13 -04:00
Brenden Bice
b75d899c7a use transition wrapper component 2019-04-11 23:26:13 -04:00
Brenden Bice
1f4fcf56cd remove custom fadein logic 2019-04-11 23:26:13 -04:00
Brenden Bice
e734370e33 use a tag for favs/repeated title 2019-04-11 23:26:13 -04:00
Brenden Bice
2d826abb41 use normal font weight instead of lighter 2019-04-11 23:26:13 -04:00
Brenden Bice
84b6ff9f99 use filter array function 2019-04-11 23:26:13 -04:00
Brenden Bice
7885955344 remove important in the property value 2019-04-11 23:26:13 -04:00
Brenden Bice
c1001da860 remove important in css property 2019-04-11 23:26:13 -04:00
Brenden Bice
c361b41641 use global fallback variable 2019-04-11 23:26:13 -04:00
Brenden Bice
7dea2d470e remove duplicates from avatars list 2019-04-11 23:26:13 -04:00
Brenden Bice
80ba4f27c8 add hover effect to label 2019-04-11 23:26:13 -04:00
Brenden Bice
94730c9ff7 update design of stats section 2019-04-11 23:26:13 -04:00
Brenden Bice
f6847c163c adjust avatar size of avatar list 2019-04-11 23:26:13 -04:00
Brenden Bice
db2733b265 set fall back value of border color 2019-04-11 23:26:13 -04:00
Brenden Bice
5be03eb161 handle 0 length of avatars 2019-04-11 23:26:12 -04:00
Brenden Bice
a8de515155 use i18n for title text 2019-04-11 23:26:12 -04:00
Brenden Bice
45b69dc312 add avatar list section title 2019-04-11 23:26:12 -04:00
Brenden Bice
87a4cd450c adjust space between avatars 2019-04-11 23:26:12 -04:00
Brenden Bice
df622e6ed6 layout avatars side by side 2019-04-11 23:26:12 -04:00
Brenden Bice
0f5ea9c164 apply theming to avatars list 2019-04-11 23:26:12 -04:00
Brenden Bice
8a2f55644c improve code quality 2019-04-11 23:26:12 -04:00
Brenden Bice
8c9bcdc6c1 rename favourite to favorite 2019-04-11 23:26:12 -04:00
Brenden Bice
6511166631 display favs & favorited user in one line 2019-04-11 23:26:12 -04:00
Brenden Bice
df68ce4d83 set maximum avatars count to 15 2019-04-11 23:26:12 -04:00
Brenden Bice
4ab2ddb03c improve code quality 2019-04-11 23:26:12 -04:00
Brenden Bice
d19bee0b66 fetch parent post boost users information 2019-04-11 23:26:12 -04:00
Brenden Bice
44d07ceb25 support mobile size screen 2019-04-11 23:26:12 -04:00
Brenden Bice
0d8eb1d00b set default avatar background 2019-04-11 23:26:12 -04:00
Brenden Bice
2db607f49c limit avatars list to display 10 2019-04-11 23:26:12 -04:00
Brenden Bice
ff25966702 display users in stacked avatarlist 2019-04-11 23:26:12 -04:00
Brenden Bice
85457fc917 fetch reblogged users 2019-04-11 23:26:12 -04:00
Brenden Bice
2d339cd3b8 fetch favorited users 2019-04-11 23:26:12 -04:00
taehoon
ab7a418d80 maintain conversationsObject storage 2019-04-11 12:46:06 -04:00
taehoon
fa16d66c52 remove unused importing 2019-04-11 07:56:26 -04:00
taehoon
724602bdc1 get statuses in a conversation from the global repository instead of local state 2019-04-11 07:56:26 -04:00
dave
d498a26af5 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications 2019-04-09 15:42:05 -04:00
Shpuld Shpludson
d7cf841dfe Merge branch '486-expand-button' into 'develop'
#486 - remove expand button on conversation page

Closes #486

See merge request pleroma/pleroma-fe!742
2019-04-09 18:52:18 +00:00
jared
5df049ca31 #486 - remove expand button on conversation page 2019-04-09 14:10:51 -04:00
Shpuld Shpludson
b3ace226fb Merge branch 'fix/prevent-repeated-fetching' into 'develop'
#485 Prevent repeated fetching

Closes #485

See merge request pleroma/pleroma-fe!738
2019-04-09 18:05:46 +00:00
jasper
011f04c196 fix small bug 2019-04-09 09:19:48 -07:00
jasper
b7d7c21617 Add await to login befor redirect to friends timeline 2019-04-09 08:57:41 -07:00
jasper
1570e779b1 Prevent repeated fetching 2019-04-09 08:38:13 -07:00
Shpuld Shpludson
1e9ddcb0da Merge branch 'fix/notification-bugs' into 'develop'
#474 Fix notification bugs

Closes #474

See merge request pleroma/pleroma-fe!728
2019-04-09 15:24:33 +00:00
dave
d3218807b4 #436 - merge develop 2019-04-08 21:04:59 -04:00
Shpuld Shpludson
546ced43d9 Merge branch 'moderation-menu' into 'develop'
Moderation menu #310

See merge request pleroma/pleroma-fe!595
2019-04-08 19:01:40 +00:00
dave
b0da32fea2 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications 2019-04-08 14:29:12 -04:00
jasper
a1275be4c0 Separate timeline and notification 2019-04-04 09:03:56 -07:00