Commit graph

109 commits

Author SHA1 Message Date
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
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
dave
63cfe051c7 #371: show notification when user setting's saved 2019-02-19 12:38:49 -05:00
taehoon
2de756aa0c Better error handling 2019-02-15 13:34:33 -05:00
taehoon
2132d58075 Remove cropped image size restriction 2019-02-15 13:34:33 -05:00
taehoon
b24db12e1c Make embedded image cropper 2019-02-15 13:34:33 -05:00
taehoon
09949fc7ee Crop avatar image using minWidth/minHeight 2019-02-15 13:34:33 -05:00
taehoon
13725f040b Add avatar crop popup 2019-02-15 13:34:33 -05:00
HJ
5d73a1dd06 Revert "Merge branch 'fix/no-autocomplete-in-non-post-forms' into 'develop'"
This reverts merge request !551
2019-02-14 19:15:59 +00:00
Xiaofeng An
2d91c9d949 make bio field auto-complete 2019-02-08 11:13:35 -05:00
HJ
62b3b9b8d4 Merge branch 'add-admin-and-moderator-fields-to-user-card-view' into 'develop'
Add admin and moderator indicators to the user profile

See merge request pleroma/pleroma-fe!519
2019-02-07 22:45:08 +00:00
dave
3128417176 #315 - separate export and fetch follows logic 2019-02-07 09:57:16 -05:00
dave
2f12ac7ea4 #315 - export all follows as CSV 2019-02-06 11:17:23 -05:00
eugenijm
648f635429 Allow to configure visibility for admin and moderator badges 2019-02-06 18:07:10 +03:00
Maxim Filippov
0c5c889850 Rename "hide_following" to "hide_follows" 2019-02-06 14:21:13 +03:00
Maxim Filippov
18594569bd Split hide_network into hide_followers & hide_followings 2019-02-06 02:59:59 +03:00
dave
94fdc2d583 #138 - fix lint error 2019-02-04 15:06:38 -05:00
dave
e1f9298ef2 #138 - unescape user bio 2019-02-04 15:03:01 -05:00
dave
c1883f5282 #138 - escape html entities in BIO text 2019-02-04 14:25:21 -05:00
Shpuld Shpludson
d4991d0162 Revert "Merge branch 'feature/split-hide-network' into 'develop'"
This reverts merge request !497
2019-02-03 14:32:23 +00:00
shpuld
476bf0afe1 Fix media timeline attachments being small by adding an option to not render background tabs in tab switcher 2019-01-31 17:00:31 +02:00
Maxim Filippov
298cea8f6d Split hide_network into hide_followers & hide_followings 2019-01-30 01:11:40 +03:00
Lambda
24eba26c5b Restore old routes, enable user route as fallback. 2018-12-25 18:43:52 +01:00
Maxim Filippov
2211c533dd Merge branch 'develop' into feature/new-user-routes 2018-12-17 02:39:37 +03:00
Henry Jameson
7d3385f349 fix 2018-12-15 03:30:39 +03:00
HJ
99b2b7a203 Merge branch 'feature/file-size-checking' into 'develop'
[pleroma#36] Add errors when file uploading fails

See merge request pleroma/pleroma-fe!405
2018-12-13 21:02:17 +00:00
Shpuld Shpludson
915487072b Merge branch 'fix/reset-follows-export' into 'develop'
Reset enableFollowsExport when an export file is available to download

See merge request pleroma/pleroma-fe!412
2018-12-13 15:06:50 +00:00
Rinpatch
dd6a9ae645 oof 2018-12-13 17:51:29 +03:00
rinpatch
457132fb37 get rid of slots 2018-12-13 15:44:37 +01:00
Henry Jameson
c52b8019ae added hide_network option, fixed properties naming 2018-12-13 16:04:22 +03:00
Rinpatch
48edc0c8fc Refactor arrays to individual options 2018-12-13 11:25:03 +03:00
link0ff
33c2d21bb7 Reset enableFollowsExport to true after 2 sec when an export file is available to download 2018-12-12 22:00:04 +02:00
Rinpatch
9c24ac1d05 I am dumb 2018-12-12 20:01:37 +03:00
Rinpatch
5ca2e75df3 Handle errors from server 2018-12-12 19:31:16 +03:00
Rinpatch
bf8bb9ce13 Moved upload errors in user_settings to an array. Moved upload error strings to its separate section in i18n 2018-12-12 16:38:01 +03:00
Rinpatch
25a04f2294 Avatar, background, banner filesize errors 2018-12-11 16:02:35 +03:00
Maxim Filippov
ae8f0f36d8 Use "~" as a route namespace symbol 2018-12-10 01:21:52 +03:00
Maxim Filippov
7d5794b9fa Fix redirect paths 2018-12-06 22:10:46 +03:00
raeno
59b84c2a06 Do not use underscore at the beginning of the method 2018-11-30 18:53:59 +04:00
raeno
0c3cd05965 Logout user on password change 2018-11-30 17:30:55 +04:00
William Pitcock
1af5c8fd39 add support for disabling rich text formatting 2018-09-22 03:54:05 +00:00
Henry Jameson
82fa5d08c4 more refactoring 2018-09-17 17:51:39 +03:00
Henry Jameson
eacbd9b500 Separated tab-switcher into a reusable component. This depends on JSX addition 2018-08-27 22:22:25 +03:00
Foxhkron
56ddeec8f3
Merge upstream 2018-08-19 01:23:03 +02:00
William Pitcock
fe06beae18 fix lint issues 2018-08-18 17:06:07 +00:00
William Pitcock
61d40f40ae allow default visibility scope to be configured 2018-08-18 17:06:06 +00:00
William Pitcock
7a08ba43e2 user settings: enable locking/unlocking an account 2018-05-29 14:19:28 +00:00
Syldexia
e0ba6a5876 Added change password to user settings 2018-05-21 23:01:09 +01:00
Roger Braun
959b2d9d66 Merge branch 'develop' into Syldexia/pleroma-fe-feature/account-deletion 2018-05-20 13:16:49 +02:00
aka
3c525d6a3b use es6 notation for exportFollows 2018-05-18 07:34:36 -03:00
aka
fed8781583 fix linting 2018-05-16 19:51:52 -03:00
aka
fae7a40aeb Adds an option to export follows 2018-05-13 20:47:08 -03:00
Syldexia
327b6fb5dc Added delete account section to user settings 2018-05-13 15:24:42 +01:00
eal
a058941aed Add follow import to user settings. 2017-12-23 17:08:45 +02:00
Shpuld Shpuldson
1526b4560c Clean up to have much less redundant code. 2017-08-18 11:51:17 +03:00
Shpuld Shpuldson
6d7d173e4d Make linter happy. 2017-08-16 00:46:55 +03:00
Shpuld Shpuldson
acf3fd5d91 Add new user-settings component/route, add options to change name, bio, avatar, banner and bg. Add those options to api service and backend interactor service. 2017-08-02 22:09:40 +03:00