dave
8275f2aa9a
#396 : update registration form
2019-02-24 14:30:29 -05:00
Shpuld Shpludson
1dd7120e16
Merge branch 'issue-389-search-loading-icon' into 'develop'
...
#389 : add loading icon in search panel
Closes #389
See merge request pleroma/pleroma-fe!610
2019-02-24 16:24:53 +00:00
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
Henry Jameson
135eca40ea
Merge remote-tracking branch 'upstream/develop' into shigusegubu
...
* upstream/develop:
bad defaults
2019-02-22 00:16:20 +02:00
jasper
34d723215b
Activate user search text field
2019-02-21 11:20:46 -08:00
HJ
3768a4623f
Merge branch 'fix-mutes' into 'develop'
...
bad defaults
Closes #384
See merge request pleroma/pleroma-fe!605
2019-02-21 17:56:41 +00:00
Henry Jameson
4136d9cdd1
bad defaults
2019-02-21 19:52:58 +02: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
Shpuld Shpludson
254b0afab7
Merge branch 'issue-383-content-type' into 'develop'
...
#383 : content type error
Closes #383
See merge request pleroma/pleroma-fe!603
2019-02-21 17:06:10 +00:00
dave
09822cc15b
#383 : content type error
2019-02-21 11:16:11 -05:00
taehoon
eb22e7f462
Use Object.entries instead of Object.keys
2019-02-20 21:50:10 -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
85d43d17f5
Add missing translation strings
2019-02-20 13:30:31 -05:00
taehoon
32c112bc96
Remove pagination logic in fetchBlocks api
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
b4a5b5203f
Minor css improvements of hocs
2019-02-20 13:30:31 -05:00
taehoon
8680046c4e
Pass down slots into wrapped components
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
8f608e060c
Just save blocks/mutes instead of adding
2019-02-20 13:30:30 -05:00
taehoon
1fd9a1c7c0
Set blockIds and muteIds to the currentUser state only
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
159e84532e
Add withSubscription hoc
2019-02-20 13:30:30 -05:00
taehoon
8270274865
Update hocs to pass parent-scope bindings to the wrapped component
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
taehoon
12df967cb6
Add withLoadMore hoc
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
Shpuld Shpludson
22a0858ef4
Merge branch 'issue-377-local-user-no-link' into 'develop'
...
#377 : no exteral profile link for local users
Closes #377
See merge request pleroma/pleroma-fe!599
2019-02-19 19:35:44 +00:00
dave
0caf59a911
#377 : no exteral profile link for local users
2019-02-19 13:49:04 -05:00
Shpuld Shpludson
40159324b4
Merge branch 'issue-364-register-freeze' into 'develop'
...
#364 : update ap_id error with username
Closes #364
See merge request pleroma/pleroma-fe!597
2019-02-19 18:00:39 +00:00
jasper
1e43a47c3c
Update: Fix fetch error when login
2019-02-19 09:42:53 -08:00
