Commit Graph

1238 Commits

Author SHA1 Message Date
Alexey Kostenko
5838cd617c Web: People: Return to profile editor after save avatar 2020-10-12 07:12:32 +03:00
Alexey Kostenko
237f737ba7 Merge branch 'feature/files' into feature/avatar-editor-redesign 2020-10-11 20:04:18 +03:00
ee6307e288 Web: People: Added hack for build machine only 2020-10-09 19:14:48 +03:00
Artem Tarasov
d7d9a55e50 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-09 16:23:41 +03:00
TatianaLopaeva
5f0c974629 Web: People: Added console.log 2020-10-09 16:16:28 +03:00
Artem Tarasov
24c799ed76 Web: People: applied ProfileView loader 2020-10-09 16:10:29 +03:00
1dfd7afe1c Update yarn.lock files 2020-10-09 15:07:41 +03:00
a5c77baae0 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-09 14:57:52 +03:00
065c8daaa0 Web: People: Applied Filter loader 2020-10-09 14:57:43 +03:00
TatianaLopaeva
77426da7fe Web: People: Added console.log 2020-10-09 14:45:15 +03:00
e01f577f39 Web: People: Fixed show loading process 2020-10-09 13:37:41 +03:00
TatianaLopaeva
e60eac22f7 Web: People: Added color for Icon by layout 2020-10-08 17:33:16 +03:00
TatianaLopaeva
9d3381ba9c Web: People: Added Box with displayProp and marginProp property, deleted style from Icon 2020-10-08 17:31:27 +03:00
Alexey Kostenko
1f91802257 Web: People: Fixed opening avatar editor (Create user) 2020-10-08 15:17:44 +03:00
TatianaLopaeva
54d2a99d29 Web: People: Added font-weight and color by layout 2020-10-08 14:49:57 +03:00
TatianaLopaeva
0e7f19332e Web: People: Deleted unnecessary for EmptyScreenContainer widthProps 2020-10-08 14:25:28 +03:00
TatianaLopaeva
51b86b2620 Merge branch 'feature/files' into feature/people-filter-empty-screen 2020-10-08 14:15:51 +03:00
Alexey Kostenko
1129a00d21 Merge branch 'feature/files' into feature/avatar-editor-redesign 2020-10-08 14:00:50 +03:00
4059c94e34
Merge pull request #91 from ONLYOFFICE/feature/fix-redirect-after-update-profile
Feature/fix redirect after update profile
2020-10-08 13:20:31 +03:00
TatianaLopaeva
43dbd9e511 Web: People: Changed margin-right by layout 2020-10-08 12:04:35 +03:00
Artem Tarasov
3d60e9ac63 Web: People: fixed isEdit flag 2020-10-08 11:10:55 +03:00
Alexey Kostenko
95c3a379f7 Merge branch 'feature/files' into feature/avatar-editor-redesign 2020-10-08 11:03:59 +03:00
Alexey Kostenko
1f1dbdee36 Web: People: Desktop avatarEditor - Fix rotation bug, fixed Wheel empty image bug, fixed twitching of the picture when saving 2020-10-08 10:55:30 +03:00
Alexey Kostenko
f5592333c8 Web: People/Client: Fix rotation bug, fixed Wheel empty image bug, fixed twitching of the picture when saving, refactoring (remove callback using) 2020-10-08 09:55:20 +03:00
Artem Tarasov
c5dfb870b3 Web: People: deleted unusaed variables 2020-10-07 17:09:14 +03:00
Artem Tarasov
974ccdbf48 Merge branch 'feature/files' into feature/fix-redirect-after-update-profile
# Conflicts:
#	products/ASC.People/Client/src/components/Article/Body/index.js
#	products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Profile/Section/Header/index.js
#	products/ASC.People/Client/src/components/pages/Profile/index.js
#	products/ASC.People/Client/src/store/profile/actions.js
2020-10-07 16:56:36 +03:00
Alexey Kostenko
98fef4e364 Web: People: Changed text in header ( avatar editor page ) 2020-10-07 16:01:42 +03:00
TatianaLopaeva
34506827b5 Update yarn.lock 2020-10-07 15:53:29 +03:00
Alexey Kostenko
d5b62f7bb2 Merge branch 'feature/files' into feature/avatar-editor-redesign 2020-10-07 15:30:56 +03:00
e76e50dc79 Web: ServiceWorkers: Turned off debug mode 2020-10-07 13:43:51 +03:00
11348e5fba Update yarn.lock files 2020-10-07 12:58:38 +03:00
2e74a1bde3 Web: Replaced some code tot selectors 2020-10-07 12:47:55 +03:00
Alexey Kostenko
90a045fa1c Web: People: Refactoring (Moved mobile view of avatar editor from page to component) 2020-10-07 11:42:07 +03:00
Alexey Kostenko
5b7b9aacbb Web: People: Added toggle AvatarEditor in redux (this state need for mobile view AvatarEditor) 2020-10-07 10:05:44 +03:00
42d7ffae45 Web: People: Fixed loading Profile info after change People filter fields 2020-10-06 19:26:01 +03:00
7fb3ce6c09 Web: People: Added groups for API people loading 2020-10-06 19:07:10 +03:00
c2cd41f8f2 Web: People: Fixed working of GroupMenu after applied reselect 2020-10-06 18:18:01 +03:00
Alexey Kostenko
4a318d4e13 Web: People: Removed the ability to go to the avatar editor from the context menu 2020-10-06 16:44:01 +03:00
Alexey Kostenko
9a80672059 Web: People: Fixed saving empty avatar, removed unused code 2020-10-06 15:57:55 +03:00
Artem Tarasov
0244d97007 Web: People: rename component LeaveFormDialog to DataLossWarningDialog, action setIsVisibleModalLeave to setIsVisibleDataLossDialog 2020-10-06 13:29:11 +03:00
3ad873f1c8 Web: People: Restored fields in filtering data 2020-10-06 12:46:10 +03:00
Artem Tarasov
045e618c3a Merge branch 'feature/files' into feature/fix-redirect-after-update-profile 2020-10-06 12:20:21 +03:00
Artem Tarasov
e0547caad7 Web: People: fix routing 2020-10-06 11:49:36 +03:00
af756a1e76 Web: Fixed opening @self profile view 2020-10-06 11:33:53 +03:00
Alexey Kostenko
39ee2f972c Merge branch 'feature/files' into feature/avatar-editor-redesign 2020-10-06 11:15:53 +03:00
Alexey Kostenko
2249cec75a Web: People: Fixed upload new photo on avatar page 2020-10-06 10:53:26 +03:00
Alexey Kostenko
f429c75ab5 Web: People: Added Loader on avatar-editor page 2020-10-06 09:38:35 +03:00
Alexey Kostenko
f0f12bff69 Web: People: Code formatting 2020-10-06 08:46:47 +03:00
Alexey Kostenko
28b2f7630e Web: People: Added translation keys 2020-10-06 08:23:20 +03:00
Alexey Kostenko
5df3850527 Web: People/Components: Added handling of the cancel button 2020-10-06 07:00:37 +03:00
c5f87f8200 Web: People: Fixed refresh page with Filter 2020-10-05 21:41:04 +03:00
8d7cf4f2dc Web: Replaced getCurrentModule with getCurrentProduct selector 2020-10-05 20:56:36 +03:00
Artem Tarasov
16d70a4168 Web: People: added LeaveFormDialog to updateUserForm 2020-10-05 18:54:57 +03:00
Artem Tarasov
3493ec390a Web: People: added LeaveFormDialog to article, createUser 2020-10-05 18:13:33 +03:00
Artem Tarasov
a0873f6db2 Web: People: refactoring LeaveFormDialog 2020-10-05 18:12:32 +03:00
Alexey Kostenko
b45965a15c Web: Components/People: Added cancel button on avatar editor page 2020-10-05 17:15:25 +03:00
Artem Tarasov
5765475684 Web: People: added check for editing a form when clicking on a tree 2020-10-05 17:13:52 +03:00
Artem Tarasov
09a91ba47f Web: People: refactoring LeaveFormDialog 2020-10-05 17:11:58 +03:00
Artem Tarasov
c44543e177 Web: People: deleted unusing variables 2020-10-05 17:10:28 +03:00
Alexey Kostenko
e6572e9574 Web: People/Components: Style fix, added translate keys 2020-10-05 15:39:55 +03:00
63ee865d98 Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
#	products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/src/pages/login/index.js
#	web/ASC.Web.Common/src/utils/index.js
2020-10-05 15:37:09 +03:00
Artem Tarasov
5159b5c5b1 Web: People: added component LeaveFormDialog 2020-10-05 15:01:10 +03:00
Ilya Oleshko
df7a8c6515 Web: People: Home : Fixed status display 2020-10-05 14:59:42 +03:00
978b67f7a7 Update yarn.lock files 2020-10-05 14:46:07 +03:00
d00d16ee02 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/src/components/pages/Wizard/index.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/src/api/settings/index.js
#	web/ASC.Web.Common/src/pages/login/index.js
#	web/ASC.Web.Common/src/store/auth/reducer.js
#	web/ASC.Web.Common/src/utils/index.js
#	web/ASC.Web.Common/yarn.lock
2020-10-05 13:32:26 +03:00
Artem Tarasov
0a248e6f3b Web: People: fixed updating avatar in user list after creating new user 2020-10-05 13:29:14 +03:00
Artem Tarasov
0836a55d68 Web: People: fixed redirect after editing user via direct link 2020-10-05 12:45:16 +03:00
Artem Tarasov
a92365df79 fixed filter setting after returning from user/group view/edit 2020-10-05 11:29:01 +03:00
Artem Tarasov
0cac098bdf Web: People: fixed updating list of users after creating user 2020-10-05 10:50:50 +03:00
TatianaLopaeva
37e195ba53 Web: Re-wrote condition if the nameSchemaId is not set 2020-10-05 09:48:11 +03:00
Artem Tarasov
b82b55217b Web: People: fixed inability to close the modal window for adding an avatar when creating a user 2020-10-05 09:35:50 +03:00
Alexey Kostenko
98d006d825 Web: Components: Fix mobile styles on AvatarEditor 2020-10-04 14:41:39 +03:00
Artem Tarasov
7dcc96b716 Web: People: added update state.people.users after update profile 2020-10-02 22:57:41 +03:00
9d32d7629a Web: People: Re-written Home/Header with selectors and reselect + refactoring 2020-10-02 18:34:50 +03:00
TatianaLopaeva
7bbc5bb693 Web: Added mapDispatchToProps at ProfileInfo 2020-10-02 15:47:13 +03:00
Alexey Kostenko
19a7d88fe1 Web: People/Components: Fix save avatar, added AvatarEditor component on AvatarEditor page 2020-10-02 10:10:40 +03:00
7bbba5f158 Web: People: Re-written Home/Body with selectors and reselect + refactoring 2020-10-01 22:01:52 +03:00
c008acee57 Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/src/components/Article/MainButton/index.js
#	products/ASC.People/Client/src/components/pages/Profile/index.js
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
2020-10-01 17:32:12 +03:00
TatianaLopaeva
b33328218a Update yarn.lock files 2020-10-01 09:37:25 +03:00
TatianaLopaeva
82fac1f54d Deleted unnecessary constant 2020-10-01 08:58:17 +03:00
TatianaLopaeva
6cfdee13b0 Added language into array of useEffect 2020-10-01 08:55:59 +03:00
ccd1aef9f8 Web: Re-written NavMenu with selectors and reselect 2020-10-01 01:25:08 +03:00
Alexey Kostenko
31391676cb Web: People: Added conditions for going to the page with the avatar editor 2020-09-30 15:50:39 +03:00
Artem Tarasov
14f0d0f2be update yarn.lock 2020-09-30 15:00:27 +03:00
Artem Tarasov
c68b6d6b7f update yarn.lock 2020-09-30 10:53:51 +03:00
4b302d1634 Web: People: Replaced RequestLoader to showLoader/hideLoader function calls 2020-09-29 17:43:13 +03:00
Alexey Kostenko
c8374e3fa8 Web: People: Added a template for the avatar editor page 2020-09-29 16:46:27 +03:00
ad4b28d1f2 Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
#	products/ASC.Files/Client/public/index.html
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Article/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
#	products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Common/src/components/index.js
2020-09-29 11:48:36 +03:00
5ad8730c46 Web: People: Fixed open @self profile 2020-09-28 16:20:16 +03:00
Alexey Kostenko
c8b88c507f Web: People: Updated toast notifications 2020-09-28 11:48:35 +03:00
a6180afa35 Web: Normalize routing + refactoring 2020-09-25 19:14:50 +03:00
69b21cd7a5 Web: People: Fixed routing to GroupAction from Home page 2020-09-25 11:04:34 +03:00
c5ed32f384 Web: People: Fixed routing to view/edit Profile from Home page 2020-09-25 10:53:39 +03:00
63a973375a Web: People: Added RowsLoader to Section Body 2020-09-25 10:39:21 +03:00
Alexey Kostenko
69dcd77129 Web: People: Moved indication of success of link copy in InviteDialog 2020-09-24 16:18:37 +03:00
5f632302f9 Web: People: Added HeadlineLoader to Section Header 2020-09-24 14:35:23 +03:00
deabd31690 Web: People: Added TreeFolderLoader 2020-09-24 14:22:17 +03:00
97539afc02 Web: People: Added HeadlineLoader 2020-09-24 13:42:32 +03:00
4c214e2ff2 Merge branch 'feature/files' into feature/loading-acceleration 2020-09-24 12:56:52 +03:00
885eb4a691 Web: Clients: Added #temp-content markup on load and opportunity to hide it + router refactoring 2020-09-23 18:42:47 +03:00
Artem Tarasov
dc57312bf8 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-23 14:12:26 +03:00
Artem Tarasov
20dc47473c Web: People: fixed style of TreeMenu 2020-09-23 14:12:03 +03:00
Alexey Kostenko
95179a967f Web: People: Removed unnecessary request to get invite link when visiting People page 2020-09-23 10:16:03 +03:00
Artem Tarasov
b2013f4dc2 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-22 17:58:17 +03:00
Artem Tarasov
9a6110ea9e Web: People: fixed size of sorting block on tablet 2020-09-22 17:57:54 +03:00
Alexey Kostenko
744f7cdfb6 Web: People: Removed forced copying of invitation link when opening ModalDialog 2020-09-22 16:14:35 +03:00
Artem Tarasov
964cd4a0ec Web: People: deleted unusing variable 2020-09-22 15:42:57 +03:00
Artem Tarasov
9a2f04008d Web: People: fixed styles 2020-09-22 15:18:36 +03:00
Alexey Kostenko
6689b82d32 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-22 09:31:59 +03:00
Artem Tarasov
caea60046f Web: People: refactoring: added utils.js, replaced changeDocumentTitle() with setDocumentTitle() 2020-09-21 14:54:35 +03:00
Alexey Kostenko
cd7d714476 Web: People: Fix loader style 2020-09-21 12:17:56 +03:00
Artem Tarasov
5f3a4c83e8 Web: People: fixed replacement of group members when adding 2020-09-19 23:26:11 +03:00
7b4441676e Update yarn.lock files 2020-09-19 18:35:17 +03:00
0f00799480 Web: Client: Fixed redirect to defaultPage 2020-09-19 18:24:48 +03:00
4a09b4b5f2 Web: fixed body scroll 2020-09-18 17:06:35 +03:00
Artem Tarasov
939a29442f Web: People: refactoring - changing document.title with changeTitleDocument() 2020-09-18 11:19:16 +03:00
Artem Tarasov
2e8a170166 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-17 16:10:09 +03:00
Artem Tarasov
ba03e55ffc added display of changes in group composition after adding/removing members 2020-09-17 16:05:56 +03:00
Artem Tarasov
fcaf136b2c added document title change after group update and deletion 2020-09-17 16:04:23 +03:00
9623029d82 Web: Files: Speeded up loading first page + refactoring 2020-09-17 12:07:36 +03:00
2f4a3141d5 Web: People: Speeded up loading first page + refactoring 2020-09-17 11:28:23 +03:00
a4cb368513 Update yarn.lock files 2020-09-16 18:39:06 +03:00
ba7c4db354 WebL People: Remove temp prop 2020-09-16 18:35:49 +03:00
374e4ece1a WebL People: Remove temp prop 2020-09-16 18:32:14 +03:00
e66ca03cbb Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-16 18:08:41 +03:00
ecb2879a77 Web: Components: Styled AvatarEditor + applied changes 2020-09-16 18:08:32 +03:00
Artem Tarasov
0fb03ea54a Web: People: fixed double redirect after edit/create group 2020-09-16 16:13:03 +03:00
3b691247b2 Update yarn.lock files 2020-09-15 23:29:13 +03:00
986e53608d Update yarn.lock files 2020-09-15 22:55:11 +03:00
d750335924 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	web/ASC.Web.Components/package.json
2020-09-15 22:43:37 +03:00
2bad04c058 Update yarn.lock files 2020-09-15 22:42:42 +03:00
Artem Tarasov
58a43ed52d Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-15 16:24:57 +03:00
Vladislav Makhov
d4f4691fef Web: People: Change width values for rows 2020-09-15 16:22:58 +03:00
Artem Tarasov
6153e02c54 Web: People: added translation for Head field in GroupAction if there is no owner 2020-09-15 16:22:07 +03:00
Artem Tarasov
89baffc5d6 Web: People: fixed display of profile removed if the group was created without an owner 2020-09-15 15:36:43 +03:00
Artem Tarasov
9c0bac60f5 Web:People: fixed styles for TreeMenu 2020-09-15 15:05:40 +03:00
Artem Tarasov
b4d0776ca4 Web:People: changed check for rendering PageLayout.ArticleMainButton 2020-09-14 14:34:42 +03:00
Artem Tarasov
3e42b49c3e Web:People: added icons for tree nodes, changed icon for root folder 2020-09-14 14:31:44 +03:00
Alexey
69b8d0ec7d Web: Files/People/Components: Content rendered without columns on mobile devices 2020-09-14 08:51:54 +03:00
65fbf2247e Update yarn.lock files 2020-09-11 22:51:28 +03:00
8045eecf1b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Article/Body/index.js
2020-09-11 22:30:09 +03:00
4d97d6a7ac Web: Clients: Moved setup title to Article/Body 2020-09-11 21:45:46 +03:00
99a6fd523e Web: Client: Moved organizationName into authReducer 2020-09-11 18:03:40 +03:00
Vladislav Makhov
175b244cd2 Fix state bug 2020-09-10 15:54:50 +03:00
Vladislav Makhov
b81f2e0dba Fix state bug 2020-09-10 15:01:56 +03:00
Vladislav Makhov
c12ae9624b Avatar editor: add indication of loading process 2020-09-10 14:18:58 +03:00
7433eea815 Web: Clients: SW: Added code for updating SW lifecycle to update the app after user triggered refresh 2020-09-10 13:19:06 +03:00
323823981a Update yarn.lock files 2020-09-09 22:25:31 +03:00
e4a222b57b Web: People: Fixed redirect on Save/Cancel GroupAction page 2020-09-09 22:18:27 +03:00
b3b6fd0938 Web: Components: Re-written ModalDialog component with SLOT pattern 2020-09-09 21:49:25 +03:00