Commit Graph

2836 Commits

Author SHA1 Message Date
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
HJ 9e2fa50b74 Merge branch 'bugfix/in-reply-to-account-acct' into 'develop'
entity normalizer: hook up in_reply_to_account_acct

See merge request pleroma/pleroma-fe!773
2019-04-27 07:19:16 +00:00
William Pitcock f4420cbf9f entity normalizer: hook up in_reply_to_account_acct 2019-04-27 04:52:11 +00:00
kaniini 8575f65852 Merge branch 'strings/bbcode' into 'develop'
add BBCode strings

See merge request pleroma/pleroma-fe!772
2019-04-26 22:52:27 +00:00
William Pitcock 55823b8d67 add BBCode strings 2019-04-26 22:48:21 +00:00
HJ e351f8630c Merge branch '492' into 'develop'
Fix Follow/Mute/Block not functional issue in the user search page

Closes #492

See merge request pleroma/pleroma-fe!754
2019-04-25 12:32:29 +00: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 4b173b5182 Merge branch '487' into 'develop'
Fix broken Follow Export

Closes #487

See merge request pleroma/pleroma-fe!762
2019-04-22 13:59:12 +00:00
Shpuld Shpludson ffecbc2e79 Merge branch 'develop' into 'develop'
[i18n] Update for Occitan language

See merge request pleroma/pleroma-fe!765
2019-04-22 13:20:13 +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
Shpuld Shpludson b7c16ad68e Merge branch 'bugfix/user-card-emojis-2' into 'develop'
user_card.vue: Fix .emoji to apply to img

See merge request pleroma/pleroma-fe!766
2019-04-22 13:06:15 +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
Exilat ed9aa8df76 Update oc.json 2019-04-20 14:44:43 +00:00
Exilat 213891ac71 Update oc.json 2019-04-20 14:38:04 +00:00
Exilat 69468c7c41 Update oc.json 2019-04-20 14:35:14 +00:00
Exilat 44f18caf4d Update oc.json 2019-04-20 14:29:04 +00: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
Brenden Bice d6be4fd921 rebuild fontello with wrench icon added
# Conflicts:
#	static/font/css/fontello-codes.css
#	static/font/css/fontello-embedded.css
#	static/font/css/fontello-ie7-codes.css
#	static/font/css/fontello-ie7.css
#	static/font/css/fontello.css
#	static/font/demo.html
#	static/font/font/fontello.eot
#	static/font/font/fontello.svg
#	static/font/font/fontello.ttf
#	static/font/font/fontello.woff
#	static/font/font/fontello.woff2
2019-04-19 13:20:02 -04:00
taehoon 3565b18712 fetch all friends using pagination 2019-04-19 00:27:06 -04:00
HJ 61d04b8823 Merge branch '497' into 'develop'
Stop fetching user relationship when user is unauthorized

Closes #497

See merge request pleroma/pleroma-fe!759
2019-04-18 06:16:36 +00:00
taehoon 992c8e1f77 stop fetching user relationship when user is unauthorized 2019-04-17 22:47:56 -04:00
Shpuld Shpludson ed0f10e9ee Merge branch '227-bulk-delete' into 'develop'
Add "bulk mute/unmute/block/unblock" feature

See merge request pleroma/pleroma-fe!733
2019-04-17 15:43:05 +00: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