Henry Jameson
543604fd2d
removed unused masto api, added initial version of interactions timeline
2019-05-14 22:48:44 +03:00
Henry Jameson
04fa2aefb3
get rid of reply-left, we decided it should go long time ago
2019-05-14 19:49:03 +03:00
Henry Jameson
addeb85220
fix prod build
2019-05-13 21:54:25 +03:00
Henry Jameson
750dca4a10
Merge remote-tracking branch 'upstream/develop' into webpack-4-dart-sass
...
* upstream/develop: (116 commits)
Fix small mistake in Polish translation
link interaction avatars to the user profile
Use more clear explanation in the scope notice, make sure the hide button doesn't overlap with text in notice.
use backendInteractor
refactor api service functions using new helper
clean up
update favorite number earlier
update status interaction upon retweet action response
sync up favoritedBy with favorite/unfavorite action
do not regenerate status object
reduce needless calculation
Move scope visibility notice to the status form, make it dismissible
Revert "eliminate expandable prop in favor of inConversation"
status attention doesn’t have relationship entities
make it short
fix wrong inlineExpanded
expanded is always false, eliminate it
eliminate expandable prop in favor of inConversation
fix conversationId comparision bug using integer format
Display additional scope description above the status form for mobile users.
...
2019-05-13 20:38:54 +03:00
Marcin Mikołajczak
caf9e627a7
Fix small mistake in Polish translation
2019-05-10 06:52:01 +00:00
HJ
cd67b1f496
Merge branch '527' into 'develop'
...
Fix "Liking/reprööting posts while post is highlighted in conversation fails to update the liked/reprööted status"
Closes #527
See merge request pleroma/pleroma-fe!787
2019-05-09 17:17:26 +00:00
HJ
177e53cf6a
Merge branch 'mobile-scope' into 'develop'
...
Display additional scope description above the status form for mobile users.
Closes #505
See merge request pleroma/pleroma-fe!767
2019-05-09 17:13:50 +00:00
taehoon
31e14cd45d
link interaction avatars to the user profile
2019-05-08 12:04:33 -04:00
eugenijm
a89010843d
Use more clear explanation in the scope notice, make sure the hide button doesn't overlap with text in notice.
2019-05-08 16:50:39 +03:00
taehoon
7d60ab322e
use backendInteractor
2019-05-07 23:36:35 -04:00
taehoon
26131266a9
refactor api service functions using new helper
2019-05-07 23:27:22 -04:00
taehoon
a54cf47ba5
clean up
2019-05-07 23:21:19 -04:00
taehoon
28c2a700e1
update favorite number earlier
2019-05-07 23:19:46 -04:00
taehoon
ff3a7e8b5b
update status interaction upon retweet action response
2019-05-07 23:17:52 -04:00
taehoon
f75e40e462
sync up favoritedBy with favorite/unfavorite action
2019-05-07 16:43:54 -04:00
taehoon
78a4ab98af
do not regenerate status object
2019-05-07 16:20:24 -04:00
taehoon
9a9d66dca1
reduce needless calculation
2019-05-07 15:54:49 -04:00
HJ
157d4e601e
Merge branch 'fix/floating-button' into 'develop'
...
Mobile Post button fix
Closes #506
See merge request pleroma/pleroma-fe!769
2019-05-07 18:40:49 +00:00
Shpuld Shpludson
496ccd0bb3
Merge branch 'patch-2' into 'develop'
...
Update es.json
See merge request pleroma/pleroma-fe!784
2019-05-07 17:35:28 +00:00
eugenijm
4af343374a
Move scope visibility notice to the status form, make it dismissible
2019-05-07 19:13:45 +03:00
taehoon
917e82e8ee
Revert "eliminate expandable prop in favor of inConversation"
...
This reverts commit 1455e1f9d5
.
2019-05-06 21:36:55 -04:00
taehoon
134b1894d6
status attention doesn’t have relationship entities
2019-05-06 16:41:12 -04:00
taehoon
44a18eb838
make it short
2019-05-06 16:17:29 -04:00
taehoon
1a3799bfac
fix wrong inlineExpanded
2019-05-06 16:16:43 -04:00
taehoon
3adfbc0357
expanded is always false, eliminate it
2019-05-06 15:30:36 -04:00
taehoon
1455e1f9d5
eliminate expandable prop in favor of inConversation
2019-05-06 15:29:24 -04:00
taehoon
a27a2f78ac
fix conversationId comparision bug using integer format
2019-05-06 13:24:11 -04:00
eugenijm
befaa477a3
Display additional scope description above the status form for mobile users.
2019-05-06 18:10:58 +03:00
tarteka
bfd25a5c3f
Update es.json
2019-05-06 08:38:24 +00:00
taehoon
489927bdc9
toggle showing new status form instead of toggle mouting
2019-05-05 23:00:45 -04:00
taehoon
bc41a7b305
make sure media modal to be above reporting modal
2019-05-05 13:48:25 -04:00
taehoon
9787d99672
update api services
2019-05-03 11:40:06 -04:00
taehoon
220a7e89d5
use native scrollbar
2019-05-03 11:40:06 -04:00
taehoon
abad528dd4
refactor using List component
2019-05-03 11:40:06 -04:00
taehoon
8561bf6612
remove transition css
2019-05-03 11:40:06 -04:00
taehoon
19a0476985
update api endpoint url
2019-05-03 11:40:06 -04:00
taehoon
ddc7c870f4
rewrite checkbox component
2019-05-03 11:40:06 -04:00
taehoon
58a420f2b3
fix panel title overflow issue in mobile
2019-05-03 11:40:06 -04:00
taehoon
0bb8247822
fix double scrollbar display bug in mobile
2019-05-03 11:40:06 -04:00
taehoon
e97f8a4728
prevent parent scroll
2019-05-03 11:40:06 -04:00
taehoon
6b1e305a18
use custom scrollbar
2019-05-03 11:40:06 -04:00
taehoon
01cc7e4480
modal style improvements
2019-05-03 11:40:06 -04:00
taehoon
2e6eab51b8
Update promisedRequest helper to support json payload
2019-05-03 11:40:06 -04:00
taehoon
f364068e10
Improve mobile layout
2019-05-03 11:40:06 -04:00
taehoon
91502a25a4
Add a css class to the checkbox indicator
2019-05-03 11:40:06 -04:00
taehoon
cf72ebb407
update copy
2019-05-03 11:40:05 -04:00
taehoon
5d0bae5569
update generic error message
2019-05-03 11:40:05 -04:00
taehoon
d115d98a1b
add translations
2019-05-03 11:40:05 -04:00
taehoon
471085f0f3
add error message
2019-05-03 11:40:05 -04:00
taehoon
dfc56dfee2
reset modal state if api request is completed
2019-05-03 11:40:05 -04:00
taehoon
1b07c6ae4f
add processing state and close modal after api request is completed
2019-05-03 11:40:05 -04:00
taehoon
1878e56c16
reset modal state when userId is changed
2019-05-03 11:40:05 -04:00
taehoon
02d169b92c
add promisedRequest helper
2019-05-03 11:40:05 -04:00
taehoon
cea6ea42f0
add api service function
2019-05-03 11:40:05 -04:00
taehoon
2cda9010df
add user reporting modal
2019-05-03 11:40:05 -04:00
Shpuld Shpludson
0438031da4
Merge branch 'develop' into 'develop'
...
[i18n]Update oc.json
See merge request pleroma/pleroma-fe!777
2019-05-03 14:57:04 +00:00
Shpuld Shpludson
513613a4b2
Merge branch 'patch-2' into 'develop'
...
Update es.json
See merge request pleroma/pleroma-fe!779
2019-05-03 14:56:45 +00:00
taehoon
6ae3c1cfcf
autoload older notifications when scrolled to the bottom
2019-05-03 07:52:22 -04:00
tarteka
09253420a2
Update es.json
2019-05-03 00:22:14 +00:00
taehoon
f8ae631d8c
fix notifications div scrolling issue on mobile
2019-05-02 08:21:02 -04:00
Exilat
b98bab52a9
Update oc.json
2019-05-01 16:40:40 +00:00
shpuld
c44c048356
add title and alt for avatars, fix console errors in avatarlist
2019-05-01 17:33:56 +03:00
Shpuld Shpludson
b1bd5bd08e
Merge branch 'develop' into 'brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users'
...
# Conflicts:
# src/services/api/api.service.js
2019-04-30 15:11:30 +00:00
HJ
0f7f685c5e
Merge branch '437-user-profile-settings' into 'develop'
...
Transition to MastoAPI: user profile settings
Closes #437
See merge request pleroma/pleroma-fe!682
2019-04-30 06:05:52 +00:00
eugenijm
b18fea8508
Debounce floating post button autohide
2019-04-29 22:53:30 +03:00
shpuld
da08388d6a
filter outside of component
2019-04-29 22:36:39 +03:00
eugenijm
ae1496cfb4
Make floating post button configurable
2019-04-29 21:32:29 +03:00
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
904a64de89
use json content type
2019-04-27 14:20:32 -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
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
William Pitcock
f4420cbf9f
entity normalizer: hook up in_reply_to_account_acct
2019-04-27 04:52:11 +00:00
William Pitcock
55823b8d67
add BBCode strings
2019-04-26 22:48:21 +00:00
Henry Jameson
2b5cf61a8f
firefox
2019-04-24 21:53:51 +03: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
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
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
taehoon
3565b18712
fetch all friends using pagination
2019-04-19 00:27:06 -04:00
taehoon
992c8e1f77
stop fetching user relationship when user is unauthorized
2019-04-17 22:47:56 -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
948baba9d3
add muted user to the mutes list in real time
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
5c2c222252
add blocked user to the blocked list on real time
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
fd171da0dc
attempt at making it work
2019-04-13 18:28:50 +03:00
Brenden Bice
41845389a9
display no message on empty data fetched from api
2019-04-12 23:12:22 -04:00
Brenden Bice
2ae0507575
remove error message on no more following
2019-04-12 23:09:05 -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