Edijs
66a105a519
Revert
2019-02-22 13:53:43 -07:00
dave
9bedf96b98
#389 : add loading icon in search panel
2019-02-22 13:37:02 -05:00
Shpuld Shpludson
99051f4a55
Merge branch 'fix/fetch-error-when-login' into 'develop'
...
#370 fix/fetch-error-when-login
See merge request pleroma/pleroma-fe!596
2019-02-22 15:17:17 +00:00
Shpuld Shpludson
e34e1ccdae
Merge branch '227-manage-blocks-mutes' into 'develop'
...
Add Blocks / Mutes management tabs under user settings page
See merge request pleroma/pleroma-fe!578
2019-02-22 14:54:12 +00:00
taehoon
22851a3a96
Remove needless code
2019-02-21 20:15:51 -05:00
jasper
34d723215b
Activate user search text field
2019-02-21 11:20:46 -08:00
Henry Jameson
90a82b7dec
Merge remote-tracking branch 'upstream/develop' into shigusegubu
...
* upstream/develop: (33 commits)
#383 : content type error
#376 : update status timeline when it's empty
#377 : no exteral profile link for local users
#371 : show notification when user setting's saved
Clean up CSS a bit
#364 : update ap_id error with username
Rename: instanceSpecificPanelPresent
Hide isp option if instance has panel disabled
Take over branch and fix some issues
Fix lint errors
Better error handling
Remove cropped image size restriction
Remove modal component
Make embedded image cropper
Revert eslintrc changes
Check if variable exists before using
Remove event listeners when destory ImageCropper
Localization of ImageCropper component
Remove event listener when modal is destroyed
Crop avatar image using minWidth/minHeight
...
2019-02-21 19:32:49 +02:00
Shpuld Shpludson
c3fa2c90e2
Merge branch 'issue-376-no-statuses' into 'develop'
...
#376 : update status timeline when it's empty
Closes #376
See merge request pleroma/pleroma-fe!601
2019-02-21 17:24:39 +00:00
dave
09822cc15b
#383 : content type error
2019-02-21 11:16:11 -05:00
taehoon
37eec09b9b
Comment out the mutes tab
2019-02-20 13:30:31 -05:00
taehoon
5bd36c6476
Remove needless css
2019-02-20 13:30:31 -05:00
taehoon
46e1f30347
Fix indent
2019-02-20 13:30:31 -05:00
taehoon
395d212904
Add new strings to i18n
2019-02-20 13:30:31 -05:00
taehoon
a5162bd636
Add note for empty state to the lists using slot
2019-02-20 13:30:31 -05:00
taehoon
6d4d705c51
Rename some options and add comments to HOCs
2019-02-20 13:30:31 -05:00
taehoon
339373b495
Improve chaining hocs using vue-compose
2019-02-20 13:30:30 -05:00
taehoon
f81b82b471
Use hoc definitions to be factor of factory
2019-02-20 13:30:30 -05:00
taehoon
e91a94ff9c
Add mutes tab
2019-02-20 13:30:30 -05:00
taehoon
09315b2780
Add a prop to force-refresh data to withSubscription hoc
2019-02-20 13:30:30 -05:00
taehoon
8c8a6edc78
Remove pagination support from block-list
2019-02-20 13:30:30 -05:00
taehoon
52913d8f87
Complete functionality of BlockCard
2019-02-20 13:30:30 -05:00
taehoon
0220d3d304
Finally, added BlockCard
2019-02-20 13:30:30 -05:00
taehoon
5d6e1864a5
Update BasicUserCard template and add a slot for customization
2019-02-20 13:30:30 -05:00
taehoon
94e6de11b7
Add withList hoc and remove UserList component
2019-02-20 13:30:30 -05:00
taehoon
a817cc7cb4
Wire up ui to real blocks api data
2019-02-20 13:30:30 -05:00
taehoon
a56d2dfeb1
Add blocks tab with test data to user settings page
2019-02-20 13:30:30 -05:00
taehoon
4a737cbe45
Add reusable BasicUserCard and UserList components
2019-02-20 13:30:30 -05:00
dave
e20a7be3aa
#376 : update status timeline when it's empty
2019-02-20 10:13:28 -05:00
Shpuld Shpludson
cfdd885e04
Merge branch 'issue-371-user-setting-notification' into 'develop'
...
#371 : show notification when user setting's saved
Closes #371
See merge request pleroma/pleroma-fe!598
2019-02-20 14:42:27 +00:00
Shpuld Shpludson
a49f6dbf65
Merge branch 'fix/follow-list' into 'develop'
...
Watch user change in follow-list
Closes #360
See merge request pleroma/pleroma-fe!584
2019-02-20 14:32:45 +00:00
dave
0caf59a911
#377 : no exteral profile link for local users
2019-02-19 13:49:04 -05:00
jasper
1e43a47c3c
Update: Fix fetch error when login
2019-02-19 09:42:53 -08:00
dave
63cfe051c7
#371 : show notification when user setting's saved
2019-02-19 12:38:49 -05:00
Shpuld Shpludson
53484ae4bf
Merge branch 'issue-344-css-refactor' into 'develop'
...
#344 - replace float: with flexbox, clean up
See merge request pleroma/pleroma-fe!566
2019-02-19 16:49:44 +00:00
Shpuld Shpludson
0e1295edea
Merge branch 'follow-requests-for-locked-accounts' into 'develop'
...
Follow Request notification count for restricted accounts
See merge request pleroma/pleroma-fe!561
2019-02-19 16:38:05 +00:00
shpuld
32df77c16a
Merge branch 'tae-hoon/pleroma-fe-323-improve-image-lightbox' into develop
2019-02-19 18:34:09 +02:00
shpuld
4e0f934301
Clean up CSS a bit
2019-02-19 18:33:40 +02:00
Shpuld Shpludson
7b9a6f8d43
Merge branch '256-avatar-crop-popup' into 'develop'
...
Add avatar cropper
Closes #256
See merge request pleroma/pleroma-fe!547
2019-02-19 15:37:01 +00:00
Shpuld Shpludson
ed3c318be0
Merge branch 'edijs/pleroma-fe-fix/followers-ui' into 'develop'
...
Fix followers/follows UI, fix #343 fix #340
Closes #340 and #343
See merge request pleroma/pleroma-fe!590
2019-02-19 14:47:32 +00:00
Edijs
d032ce2758
Validate if there are any new status to show
2019-02-18 18:32:20 -07:00
jasper
b4709515f2
Fix error when login
2019-02-18 17:15:16 -08:00
jasper
d4a2376e12
fix/fetch-error-when-login
2019-02-18 12:32:08 -08:00
jasper
24d7f9917b
Remove posts by blocking or following
2019-02-18 11:39:35 -08:00
Edijs
0d2922afb3
Remove event listener when component destroy
2019-02-17 14:37:24 -07:00
Edijs
642b0be0b2
Bind a keyboard to show new status
2019-02-17 14:31:13 -07:00
Edijs
c30dabbdd4
Rename: instanceSpecificPanelPresent
2019-02-17 14:24:14 -07:00
Edijs
e871e3f2ac
Hide isp option if instance has panel disabled
2019-02-17 13:24:24 -07:00
shpuld
e801d78e9d
Take over branch and fix some issues
2019-02-17 18:54:22 +02:00
Henry Jameson
59196e1dd9
Merge remote-tracking branch 'upstream/develop' into shigusegubu
...
* upstream/develop:
Parameter name changed.
#361 - fix theme preview background
Fix console error - maximum call stack size exceeded
update japanese translation
2019-02-16 19:51:10 +02:00
taehoon
3094c50ff9
Fix lint errors
2019-02-15 13:34:33 -05:00