Diana
e20b87447e
Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop
2020-12-24 03:18:47 +03:00
76d7ed6c73
Merge branch 'master' into develop
...
# Conflicts:
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/src/components/drop-down/index.js
2020-12-23 21:42:44 +03:00
7803696e01
Update yarn.lock files
2020-12-23 12:43:27 +03:00
1d5fc44dac
Web: People: Added target for link
2020-12-23 11:57:09 +03:00
cffb61d1a5
Web: People: Added translation for success of sending the invitation
2020-12-23 11:43:53 +03:00
352ec309b8
Web: People: Fixed displaying errors on language change
2020-12-23 11:34:21 +03:00
TatianaLopaeva
0bd9a4001a
Web: Common/People: Fixed automatic scrolling when loading, viewing a profile and updating a profile and refactoring.
2020-12-23 11:30:48 +03:00
TatianaLopaeva
91f09ed700
Merge branch 'develop' into feature/fix-hide/show-header
...
# Conflicts:
# web/ASC.Web.Common/src/store/auth/actions.js
2020-12-23 11:01:34 +03:00
57ba1d7cc5
People: model. Added FromInviteLink
2020-12-22 17:19:58 +03:00
64f8aadd56
People: fix activation email
2020-12-22 15:54:34 +03:00
Diana
9b338e0f78
Merge branch 'feature/asc-files-tests' of https://github.com/ONLYOFFICE/AppServer into develop
2020-12-22 15:37:10 +03:00
2d9906f6a1
Web: Common: added employeeStatus to PeopleSelector, fixed display of disabled users
2020-12-22 15:34:19 +03:00
50b45b785a
Web: People: fixed access to editing the profile for the user, fixed the registration date
2020-12-22 14:55:35 +03:00
06de1efbae
Update yarn.lock files
2020-12-22 11:59:57 +03:00
4f8c04a10f
Web: People: Fixed displaying SectionHeader loader
2020-12-22 11:50:44 +03:00
a54a735cfa
Web: People: Fixed displaying not found language in combobox
2020-12-22 11:36:07 +03:00
Alexey Kostenko
c3fbf9fc93
Web: Files/People: Removed hover on mobile devices in page navigation buttons
2020-12-21 17:56:25 +03:00
853f8fa8df
Web: People: fixed access to the profile
2020-12-18 15:44:04 +03:00
8f3de38301
Web: People: hid edit button if profile is disabled
2020-12-18 15:36:00 +03:00
TatianaLopaeva
02949cc644
Web: People: Article: Deleted useless console.log.
2020-12-18 09:47:15 +03:00
f42fc72cf9
Merge branch 'master' into develop
...
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/package.json
2020-12-17 21:03:48 +03:00
53f510ae18
Bump version to v0.0.4
2020-12-17 21:00:36 +03:00
TatianaLopaeva
def290f8eb
Web: People: Fixed displaying of header (Android).
2020-12-17 20:16:26 +03:00
326d234773
Update yarn.lock files
2020-12-17 18:35:04 +03:00
de4e0de1ed
Web: People: remove useless console.log from ProfileInfo
2020-12-17 17:40:10 +03:00
42a496f442
Web: People: removed componentDidMount from filter, fixed profile group select
2020-12-17 17:37:22 +03:00
9da7eb90b0
Web: People: fixed minDate, maxDate to profile dates
2020-12-17 15:17:32 +03:00
Diana
fada5e278b
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer into feature/asc-files-tests
2020-12-17 13:20:52 +03:00
c573e23b0b
Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3
2020-12-17 12:37:41 +03:00
3815a57394
Update yarn.lock files
2020-12-17 12:37:28 +03:00
2b766b2862
Web: People: fixed Row checkedProps
2020-12-17 12:36:02 +03:00
Ilya Oleshko
2fe145d556
Web: People : Home : Fixed group menu out of screen
2020-12-17 12:19:18 +03:00
d849ac9c38
Web: People: Fixed empty phone and password inputs in ProfileAction
2020-12-17 12:08:57 +03:00
91a9255bbc
Web: People: fixed access to action menu
2020-12-17 11:11:12 +03:00
bc2bea064f
Web: People: added minDate to DatePicker
2020-12-17 11:09:44 +03:00
02698ae515
Web: People: fixed GroupAction translations
2020-12-17 11:06:46 +03:00
41bca489bb
Fixed versions (About version)
2020-12-16 19:09:56 +03:00
TatianaLopaeva
b1829fc49e
Web: People: Profile: Added check for ios & refactoring.
2020-12-16 16:28:30 +03:00
TatianaLopaeva
5cefde1bea
Web: People: Profile: Fixed automatic scrolling down on page refresh (ipad (safari/chrome))
2020-12-16 16:15:27 +03:00
TatianaLopaeva
5c2aba0d13
Web: People: Profile: Refactoring.
2020-12-16 12:42:00 +03:00
TatianaLopaeva
3fd5cda0cf
Web: People: Profile: Refactoring
2020-12-16 12:40:22 +03:00
4afadf2e0c
Web: Added support of public folders + moved back to original index.html
2020-12-15 19:27:30 +03:00
c9293ac86d
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# packages/asc-web-common/src/components/FilterInput/FilterInput.js
# packages/asc-web-common/src/components/FilterInput/sub-components/SortComboBox.js
# packages/asc-web-common/src/components/PageLayout/index.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-body.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-header.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-main-button.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section-body.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section-header.js
# packages/asc-web-common/src/components/PrivateRoute/PrivateRoute.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/pages/DocEditor/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/ContactField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/DateField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/EmailField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/RadioField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextChangeField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextField.js
# products/ASC.People/Client/src/index.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/Confirm/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
# web/ASC.Web.Client/src/helpers/confirmRoute.js
# web/ASC.Web.Client/src/index.js
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# web/ASC.Web.Login/src/LoginContent.jsx
# web/ASC.Web.Login/src/sub-components/register-container.js
# yarn.lock
2020-12-15 18:40:27 +03:00
Artem Tarasov
91bce60705
Merge branch 'develop' into feature/fix-hide/show-header
...
# Conflicts:
# web/ASC.Web.Components/src/components/drop-down/index.js
2020-12-15 16:33:01 +03:00
TatianaLopaeva
eb0743a3ad
Web: Common/People/Files: Added simplified functionality of scrolling up when switching to a new page.
2020-12-15 14:08:14 +03:00
TatianaLopaeva
0dd8f2858a
Merge branch 'develop' into feature/fix-hide/show-header
...
# Conflicts:
# web/ASC.Web.Common/src/components/PageLayout/sub-components/article.js
2020-12-14 21:30:39 +03:00
Artem Tarasov
a0f5261576
Merge branch 'develop' into bugfix/dropdown-fix
...
# Conflicts:
# web/ASC.Web.Common/package.json
2020-12-14 20:59:14 +03:00
TatianaLopaeva
0c615d470b
Web: Took the information about the width of the window from the store
2020-12-14 19:50:54 +03:00
TatianaLopaeva
b695e9d081
Web: People: Profile: Removed automatic scrolling down after multiple updates (ipad)
2020-12-14 16:37:18 +03:00
Ilya Oleshko
460b1ec0d9
Web: People : Home : Fixed fetch users after profile navigation
2020-12-11 16:03:48 +03:00
TatianaLopaeva
aa6eebb51b
Web: Files/People: Home: Fixed the displaying load of section header
2020-12-11 14:21:37 +03:00
TatianaLopaeva
c9a8027ddf
Merge branch 'develop' into feature/fix-hide/show-header
...
# Conflicts:
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Common/src/components/PageLayout/sub-components/section-body.js
# web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.js
# web/ASC.Web.Common/src/store/auth/actions.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Components/package.json
2020-12-11 11:12:28 +03:00
Artem Tarasov
72a21a1def
Merge branch 'develop' into bugfix/dropdown-fix
2020-12-10 20:46:24 +03:00
356ace1c57
Merge branch 'develop' into bugfix/upload-with-convertation
2020-12-10 19:14:58 +03:00
0b0d7187e0
Update yarn.lock files
2020-12-10 18:45:49 +03:00
Alexey Kostenko
abda53a082
Web: Files/People/Common: Fixed header styles
2020-12-10 13:31:53 +03:00
Alexey Kostenko
1a53841499
Web: Files/People/Common: Fixed header style
2020-12-10 09:48:35 +03:00
Artem Tarasov
6511557445
Web: Components/People: applied prop showDisabledItems
2020-12-09 13:09:41 +03:00
Artem Tarasov
fb10d00272
Web: Files/Components/Common/People: z-index fix
2020-12-09 10:59:04 +03:00
Artem Tarasov
854acc0b1a
Merge branch 'develop' into bugfix/dropdown-fix
...
# Conflicts:
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/package.json
2020-12-08 23:03:42 +03:00
4d88b2fc28
Update yarn.lock files
2020-12-08 18:37:19 +03:00
ce4a3e3338
Update yarn.lock files
2020-12-08 18:17:46 +03:00
7d3dde38c4
Update yarn.lock files
2020-12-08 15:26:54 +03:00
Artem Tarasov
34d246deaf
Web: Components/Files/People: z-index fix
2020-12-08 14:16:23 +03:00
Ilya Oleshko
d2719e1cd9
Web: Fixed usage lodash/isEqual on fast-deep-equal
2020-12-08 14:09:46 +03:00
Ilya Oleshko
bd13067d0b
Web: Added fast-deep-equal
2020-12-08 14:08:26 +03:00
Artem Tarasov
071f6c27c3
Merge branch 'develop' into bugfix/dropdown-fix
...
# Conflicts:
# web/ASC.Web.Common/package.json
2020-12-08 13:15:02 +03:00
c48b5783f1
People: search ignore case
2020-12-07 19:56:59 +03:00
Ilya Oleshko
4147d2f31a
Web: Fixed temp loaders
2020-12-07 11:11:04 +03:00
71b6e9f27d
Web: Files: init Files build and loading (Moved out from CRA)
2020-12-07 10:49:07 +03:00
Ilya Oleshko
83466bd638
Merge branch 'develop' into bugfix/login-fix
2020-12-07 09:52:04 +03:00
70aa6c023d
Web: Added dynostore for people reducers loading
2020-12-06 20:15:01 +03:00
Artem Tarasov
93da24a63a
Web: Common/Files/People: fixed z-index
2020-12-04 14:58:37 +03:00
0784453daf
Fix errors on login and logout
2020-12-04 14:21:51 +03:00
1675896294
Merge branch 'develop' into feature/dotnet5
...
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Services/WCFService/IFileStorageService.cs
2020-12-04 11:59:10 +03:00
Ilya Oleshko
d03584fcdd
Web: Fixed isAuthenticated logic
2020-12-04 11:38:15 +03:00
a39192ff21
Web: Common: added new containers styles, added classNames to people and files containers
2020-12-03 18:03:05 +03:00
TatianaLopaeva
715b732706
Web: People: Refactoring
2020-12-03 17:22:27 +03:00
TatianaLopaeva
126f907d19
Web: People: Canceled scrolling up when blocking and deleting a user without calling the context menu
2020-12-03 16:21:48 +03:00
1ed59c1694
Web: People: init People build and loading (Moved out from CRA)
2020-12-03 13:09:33 +03:00
228c304211
Merge branch 'develop' into feature/asc-files-tests
2020-12-01 12:29:36 +03:00
TatianaLopaeva
2cebf625fc
Merge branch 'develop' into feature/fix-hide/show-header
2020-12-01 10:45:48 +03:00
f10f6b8d3b
Update yarn.lock files
2020-11-30 15:11:23 +03:00
4ad116937a
Merge branch 'develop' into bugfix/fix-empty-screen-description
2020-11-30 13:27:35 +03:00
c029a2df04
Web: People: fixed text alignment
2020-11-30 12:15:45 +03:00
8c965fa4e1
Web: People: changed empty screen description, fixed icons alignment
2020-11-28 13:44:31 +03:00
a0adc29899
Web: People: fixed alignment and color of icons
2020-11-28 13:15:30 +03:00
83e4db1e7f
Web: People: removed useless buttons styles
2020-11-28 13:05:10 +03:00
2b7480a200
Web: People: fixed headers fontWeight
2020-11-28 13:03:53 +03:00
TatianaLopaeva
e64b93da30
Merge branch 'develop' into feature/fix-hide/show-header
2020-11-27 11:22:50 +03:00
40546da35d
fix create file
2020-11-26 20:30:57 +03:00
afc280904b
Web: People: fixed passwordSettings minLength
2020-11-26 12:27:09 +03:00
4a1023808c
People: filter groups
2020-11-24 16:13:49 +03:00
b2832468c4
Frontend: client's code re-organization
2020-11-24 13:18:23 +03:00
TatianaLopaeva
bcadb285c2
Web: Common: Rename id for scroll
2020-11-24 11:26:10 +03:00
TatianaLopaeva
df1cc9bc80
Web: Common: Changed the conditions for scrolling the page up
2020-11-24 11:15:37 +03:00
beee70cd15
yarn workspaces init commit
2020-11-21 16:07:23 +03:00
Artem Tarasov
f2d15f07f8
Web: People: Filter: changed translation of elements in the sorting list
2020-11-20 12:43:35 +03:00
TatianaLopaeva
70f5118e13
Web: Common: Fixed issue with displaying context menu
2020-11-20 11:08:26 +03:00
TatianaLopaeva
975780ba25
Merge branch 'develop' into feature/fix-hide/show-header
2020-11-18 11:03:55 +03:00
TatianaLopaeva
b0df4eb3c9
Web/Common: Fixed show visible header when switching from desktop to tablet
2020-11-17 21:23:33 +03:00
6cb92946be
fix uploadmemberphoto
2020-11-17 18:01:34 +03:00
eb6b54482e
fix warnings
2020-11-17 13:47:17 +03:00
TatianaLopaeva
25fa29f500
Merge branch 'develop' into feature/fix-hide/show-header
2020-11-17 11:39:40 +03:00
75fce656f0
Merge branch 'develop' into feature/dotnet5
2020-11-17 11:31:14 +03:00
Alexey Kostenko
3702bd597d
Web: Common: Refactoring HOC withLayoutSize
2020-11-17 10:32:02 +03:00
Alexey Kostenko
c6d4b5bf60
Merge branch 'develop' into hotfix/filter-input-hotfix
2020-11-17 08:11:35 +03:00
Alexey Kostenko
99ae4dba20
Web: People: Changed Consumer to HOC
2020-11-17 06:39:08 +03:00
cd523404f1
Merge branch 'develop' into refactoring/scope
2020-11-16 17:09:19 +03:00
Alexey Kostenko
af8ce86d2d
Merge branch 'develop' into hotfix/filter-input-hotfix
2020-11-16 12:36:55 +03:00
TatianaLopaeva
e6fac866fe
Merge branch 'develop' into feature/fix-hide/show-header
...
# Conflicts:
# web/ASC.Web.Common/src/components/NavMenu/index.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header.js
2020-11-16 10:29:35 +03:00
a66f99f574
net5.0
2020-11-15 18:55:57 +03:00
68483bc979
Merge branch 'develop' into refactoring/scope
...
# Conflicts:
# common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Startup.cs
2020-11-13 16:03:17 +03:00
Alexey Kostenko
df060ba8a2
Merge branch 'develop' into hotfix/filter-input-hotfix
2020-11-13 10:58:34 +03:00
Viktor Fomin
fc33f10e37
Merge branch 'develop' into feature/filter-loader
2020-11-13 10:30:09 +03:00
2ec76cae70
Merge branch 'develop' into bugfix/x-www-form-urlencoded
2020-11-12 18:03:10 +03:00
Viktor Fomin
4c398104cb
Update yarn.lock files
2020-11-12 15:06:18 +03:00
Alexey Kostenko
913c45a00b
Merge branch 'develop' into hotfix/filter-input-hotfix
2020-11-12 14:40:46 +03:00
Viktor Fomin
9890f1cc43
Update yarn.lock files
2020-11-12 13:37:13 +03:00
Viktor Fomin
0bb00e39db
Web: People: added header loader
2020-11-12 13:31:19 +03:00
Alexey Kostenko
366989ea9c
Web: People: Added sectionWidth prop to filterInput
2020-11-12 11:23:08 +03:00
Viktor Fomin
3dc69fc9e8
Web: People: added group loader
2020-11-12 00:12:28 +03:00
Viktor Fomin
45e9ab5aea
Merge branch 'develop' into feature/filter-loader
2020-11-11 23:26:03 +03:00
d8bd2b7d21
Update yarn.lock files
2020-11-11 22:03:47 +03:00
c4411f7b00
Merge branch 'develop' into hotfix/section-loader
2020-11-11 21:54:02 +03:00
SuhorukovAnton
9039c810c5
x-www-form-urlencoded: fix
2020-11-11 18:36:58 +03:00
Viktor Fomin
d2a30544d6
Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader
2020-11-11 17:38:10 +03:00
Viktor Fomin
91bc88ad28
Update yarn.lock files
2020-11-11 17:37:48 +03:00
Viktor Fomin
2cc252c2ae
Merge branch 'develop' into feature/filter-loader
2020-11-11 16:42:22 +03:00
Artem Tarasov
006ac1bb19
Update yarn.lock files
2020-11-11 16:16:30 +03:00
Alexey Kostenko
63dad62226
Web: People: Do not show the loader if the data has already been loaded (Switching from the profile page to the main page)
2020-11-11 15:46:46 +03:00
Alexey Kostenko
7a6a9b539b
Web: People: Fixed loading of the main page when switching from a profile
2020-11-11 14:09:40 +03:00
Viktor Fomin
40e2d85dbd
Update yarn.lock files
2020-11-11 13:27:17 +03:00
TatianaLopaeva
58ee96df1f
Web: Common: Fixed display of header
2020-11-11 12:09:19 +03:00
TatianaLopaeva
b8cb6f2508
Merge branch 'develop' into feature/fix-hide/show-header
...
# Conflicts:
# web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.js
2020-11-11 10:13:03 +03:00
Viktor Fomin
0852dd0814
Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader
2020-11-10 18:25:25 +03:00
Viktor Fomin
2ebd7e882c
Web: People: fix first loader
2020-11-10 18:20:56 +03:00
Viktor Fomin
df4c89cb91
Merge branch 'develop' into feature/filter-loader
2020-11-10 18:09:58 +03:00
Viktor Fomin
0490c8c3f0
Update yarn.lock files
2020-11-10 18:08:51 +03:00
Viktor Fomin
a82551568b
Web: People: fix props name
2020-11-10 17:30:43 +03:00
SuhorukovAnton
6e2860a7e5
Merge branch 'develop' into bugfix/x-www-form-urlencoded
2020-11-10 14:51:33 +03:00
SuhorukovAnton
44e565ca37
x-www-form-urlencoded: add models
2020-11-10 13:41:32 +03:00
Artem Tarasov
4031a609b8
Merge branch 'develop' into hotfix/documents-bugfix
...
# Conflicts:
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/src/components/icons/svg/index.js
2020-11-10 13:34:04 +03:00
1490332568
Merge branch 'develop' into refactoring/scope
...
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Helpers/WordpressHelper.cs
# products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
# products/ASC.Files/Server/Startup.cs
2020-11-10 11:42:50 +03:00
Viktor Fomin
834e8e6516
Update yarn.lock files
2020-11-10 10:46:26 +03:00
Viktor Fomin
8648abedbd
Web: People: delete first header preloader
2020-11-10 10:40:33 +03:00
Viktor Fomin
afd252e2ce
Web: People: fix profile action loader
2020-11-10 03:08:59 +03:00
Viktor Fomin
a7dee56194
Update yarn.lock files
2020-11-09 23:01:57 +03:00
Viktor Fomin
9f19173195
Web: People: added circle in row
2020-11-09 22:57:02 +03:00
TatianaLopaeva
c458c2d4fd
Web: Common: Changed styles by layout
2020-11-09 20:50:02 +03:00
Viktor Fomin
6e8685d8d6
Update yarn.lock files
2020-11-09 16:54:13 +03:00
Viktor Fomin
b3f4bd3f64
Update yarn.lock files
2020-11-09 15:16:44 +03:00
Viktor Fomin
33ef924307
Web: People: fix first loader
2020-11-09 15:11:04 +03:00
Viktor Fomin
b0d202f7c9
Update yarn.lock files
2020-11-09 13:17:06 +03:00
Viktor Fomin
884cb67a35
Web: People: delete logo
2020-11-09 13:07:43 +03:00
Viktor Fomin
445b2e83b5
Web: People: delete loading label
2020-11-09 12:37:13 +03:00
Viktor Fomin
c2e74d3756
Update yarn.lock files
2020-11-06 18:43:16 +03:00
Viktor Fomin
b1f9db662d
Web: People: fix color
2020-11-06 16:17:56 +03:00
SuhorukovAnton
89c6e5548c
x-www-form-urlencoded: fix
2020-11-06 13:39:25 +03:00
SuhorukovAnton
7b8efca8b3
x-www-form-urlencoded: fix
2020-11-06 12:46:57 +03:00
SuhorukovAnton
855c5bc92b
x-www-form-urlencoded: first version
2020-11-06 12:03:49 +03:00
Viktor Fomin
151dc898f5
Update yarn.lock files
2020-11-05 12:28:39 +03:00
Artem Tarasov
38c7faec04
Merge branch 'develop' into hotfix/documents-bugfix
2020-11-05 11:57:55 +03:00
Artem Tarasov
ace2111197
Web: People: applied prop size for Avatar Component
2020-11-05 11:40:19 +03:00
Viktor Fomin
3bdff517f9
Web: People: rename headers components
2020-11-05 11:16:33 +03:00
TatianaLopaeva
7e034e60de
Web: Common: Added display condition for section-header when group button menu is visible
2020-11-05 10:39:53 +03:00
TatianaLopaeva
8f47fe938c
Merge branch 'develop' into feature/fix-hide/show-header
2020-11-05 10:35:16 +03:00
Artem Tarasov
df9a1658e9
Web: People: refactoring
2020-11-05 09:44:20 +03:00
Artem Tarasov
6a4cabcedf
Web: Components/Files/People: fix styles
2020-11-05 09:22:14 +03:00
79ea471098
Merge branch 'develop' into refactoring/scope
...
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/ASC.Core.Common/BaseCommonLinkUtility.cs
# common/services/ASC.ApiSystem/Startup.cs
# common/services/ASC.Data.Backup/BackupServiceLauncher.cs
# common/services/ASC.Data.Backup/Startup.cs
# common/services/ASC.Data.Storage.Migration/Program.cs
# common/services/ASC.Notify/NotifyServiceLauncher.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Socket.IO.Svc/Program.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Thumbnails.Svc/Program.cs
# common/services/ASC.UrlShortener.Svc/Program.cs
# products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Program.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Startup.cs
# web/ASC.Web.Studio/Startup.cs
2020-11-04 15:22:43 +03:00
Viktor Fomin
72467a70c2
Web: People: fix header loader
2020-11-04 12:24:02 +03:00
Viktor Fomin
91c254c638
Web: Common: fix main button loader
2020-11-03 18:36:19 +03:00
Vladislav Makhov
22a494a5ad
yarn.lock update
2020-11-03 17:39:49 +03:00
Vladislav Makhov
1e483de4ba
Merge branch 'develop' into feature/third-party-settings
...
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/locales/en/translation.json
# web/ASC.Web.Client/src/components/pages/Settings/locales/ru/translation.json
# web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
# web/ASC.Web.Client/src/store/settings/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
# web/ASC.Web.Common/src/api/settings/index.js
# web/ASC.Web.Components/src/components/icons/svg/index.js
2020-11-03 15:29:09 +03:00
60e66c1abe
Web: Fixed PWA App icon url on iOS
2020-11-02 21:42:53 +03:00
7e828b5643
Autofac: fix
2020-11-02 19:27:08 +03:00
TatianaLopaeva
e876d2939a
Merge branch 'develop' into feature/fix-hide/show-header
...
# Conflicts:
# web/ASC.Web.Common/src/components/Main/index.js
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Common/src/components/PageLayout/sub-components/article.js
2020-11-02 16:41:52 +03:00
Ilya Oleshko
318202ca57
Web: People : UserContent : Added sectionWidth property, fixed missing styles
2020-10-30 14:23:56 +03:00
Ilya Oleshko
b055c0224a
Web: People : Body : Added context to RowContainer
2020-10-30 14:23:23 +03:00
Ilya Oleshko
648427fbf4
Web: People : Header : Added context to Header
2020-10-30 14:22:48 +03:00
bc725f29df
Web: Common: added re-resizable package, added new acticle
2020-10-29 17:33:05 +03:00
265feee81e
Refactoring: scope
2020-10-29 12:31:55 +03:00
049e8f63e9
Refactoring: scope.
2020-10-29 11:13:51 +03:00
TatianaLopaeva
d7a8226671
Merge branch 'develop' into feature/fix-hide/show-header
...
# Conflicts:
# web/ASC.Web.Common/src/components/Main/index.js
2020-10-28 19:02:51 +03:00
51f1f92307
Scope: refactoring.
2020-10-28 15:26:27 +03:00
e9a9b320e8
Scope: refactoring. Notify, People
2020-10-27 18:34:22 +03:00
Vladislav Makhov
eab8d8e8e2
update yarn.lock
2020-10-27 14:28:56 +03:00
TatianaLopaeva
1c09c48152
Merge branch 'develop' into feature/fix-hide/show-header
2020-10-27 10:52:12 +03:00
Vladislav Makhov
64a72b522f
Update yarn.lock
2020-10-27 10:49:55 +03:00
cb849577fb
Update yarn.lock files
2020-10-23 13:45:17 +03:00
b585313aa5
Update yarn.lock files
2020-10-23 12:21:57 +03:00
TatianaLopaeva
ce6f879f67
Web: People/Common added Layout
2020-10-22 20:09:44 +03:00
TatianaLopaeva
cf62d42532
Web:Added styled
2020-10-22 13:15:02 +03:00
TatianaLopaeva
8a62445203
Web: People/Common Added full page scroll
2020-10-22 10:52:42 +03:00
05a6034b05
Merge branch 'develop' into feature/people-filter-empty-screen
2020-10-19 20:53:59 +03:00
830c73a134
Scope: refactoring
2020-10-19 18:53:15 +03:00
Alexey Kostenko
5adc0f8697
Web: People: Added loader when switching groups
2020-10-19 14:15:04 +03:00
TatianaLopaeva
2dd956c700
Update yarn.lock files
2020-10-19 13:41:22 +03:00
TatianaLopaeva
41d0c3e9d9
Merge branch 'develop' into feature/people-filter-empty-screen
2020-10-19 12:11:34 +03:00
181ac04fd8
DI: register fix
2020-10-18 19:34:30 +03:00
ed50f3bc98
Update yarn.lock files
2020-10-16 16:38:11 +03:00
2ab62c351e
Web: People: Applied prettier style fix
2020-10-16 16:23:51 +03:00
TatianaLopaeva
14af00ffd7
Web: Added styles and changed images by layout
2020-10-16 16:21:33 +03:00
TatianaLopaeva
acfe89b4f4
Web: People: Fixed the error of returning to the list of users immediately after refreshing the page and switching to the profile view
2020-10-16 14:54:13 +03:00
Alexey Kostenko
94a31036eb
Fixed navigation (after create user did not work)
2020-10-16 08:55:44 +03:00
Alexey Kostenko
7230d2a48e
Web: People: Fixed navigation (after saving profile changes did not work)
2020-10-16 07:17:58 +03:00
ff1c1765b5
Web: Clients: Turned off Suspense fallback
2020-10-15 18:07:23 +03:00
Alexey Kostenko
df4c926436
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
2020-10-15 13:50:05 +03:00
Alexey Kostenko
5bd7a3b29c
Web: People: Fix loading main People page, after switching from profile
2020-10-15 13:49:55 +03:00
TatianaLopaeva
14bb36900c
Update yarn.lock files
2020-10-15 11:22:58 +03:00
ea97ca05c2
Update yarn.lock files
2020-10-14 17:57:29 +03:00
TatianaLopaeva
f8353c5974
Web: People: Added translate for sex status
2020-10-14 14:02:24 +03:00
Alexey Kostenko
d7d2a94181
Web: People: Added missing translations
2020-10-14 12:48:19 +03:00
Alexey Kostenko
f16145ae62
Merge branch 'feature/files' into feature/avatar-editor-redesign
2020-10-13 17:00:18 +03:00
Alexey Kostenko
e95be64ea6
Web: Components/People: Small refactoring
2020-10-13 16:57:44 +03:00
49f5a52433
Update yarn.lock files
2020-10-13 16:52:17 +03:00
8205c230c7
Web: Clients: Added displaying Loader.Filter for MainButton
2020-10-13 16:43:41 +03:00
2fa205cb6f
Web: Clients: Fixed catching of initial API errors
2020-10-13 16:31:21 +03:00
Alexey Kostenko
8e5db50b9a
Web: People: Show data loss warning on exit
2020-10-13 16:24:46 +03:00
746ecc7f40
Web: Clients: Fixed applying single cursor on loading
2020-10-13 16:20:49 +03:00
Alexey Kostenko
e5254e0a54
Web: People: Fixed saving empty image when creating user
2020-10-13 15:53:53 +03:00
3dd9f71dda
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
2020-10-13 15:51:24 +03:00
5d76e7e6b0
Web: Redesigned displaying of loading processes
2020-10-13 15:51:14 +03:00
668cb3e893
Merge branch 'master' into feature/files
2020-10-13 15:27:31 +03:00
Alexey Kostenko
30032bdce9
Web: People: Removed "is loading" from save button when upload image
2020-10-13 14:06:36 +03:00
0ae5ec1b1b
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
2020-10-13 14:02:11 +03:00
b53e34a0f0
Web: Removed useless Link duplicates
2020-10-13 14:02:04 +03:00
Alexey Kostenko
31fee3c405
Web: People: Reset profile after editing or creating profile
2020-10-13 13:49:11 +03:00
Artem Tarasov
a4a959f972
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
2020-10-13 13:43:16 +03:00
9968873305
Merge branch 'master' into feature/fix_API_return
...
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
2020-10-13 13:33:24 +03:00
a504251359
Merge pull request #99 from ONLYOFFICE/feature/fix-changing-language
...
Feature/fix changing language
2020-10-13 12:55:37 +03:00
02f39a9c71
Merge branch 'master' into feature/files
...
# Conflicts:
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20201006101804_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/Npgsql/WebstudioDbContextNpgsql/20200929102646_WebstudioDbContextNpgsql.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# web/ASC.Web.Core/Files/FileUtility.cs
2020-10-13 12:52:28 +03:00
TatianaLopaeva
4ef2db2ed0
Web: Update yarn.lock
2020-10-13 12:37:34 +03:00
TatianaLopaeva
2f72748f2b
Web: Added getLanguage selector
2020-10-13 11:19:24 +03:00
TatianaLopaeva
f0299db016
Update yarn.lock
2020-10-13 11:14:09 +03:00
Alexey Kostenko
72ac2f5875
Web: People: Fixed avatar editor when creating user
2020-10-13 10:06:05 +03:00
Artem Tarasov
1173410695
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
2020-10-13 10:05:53 +03:00
TatianaLopaeva
f6a5c8a30b
Web: People: added deleting cache and refactoring
2020-10-13 09:45:23 +03:00
c622be89a3
revert discard
2020-10-12 22:39:23 +03:00
43b9c33979
fix formating
2020-10-12 19:23:15 +03:00
TatianaLopaeva
1010886262
Web: Refactoring
2020-10-12 16:56:34 +03:00
36034bf97a
fix warnings
2020-10-12 16:52:31 +03:00
Alexey Kostenko
54f68cb02a
Web: People: Fixed adding avatar then create user
2020-10-12 16:13:14 +03:00
Artem Tarasov
8621f9f321
Web: People: profileView: fixed loader
2020-10-12 13:06:00 +03:00
Alexey Kostenko
fd2c71dce2
Web: People: Fixed avatar editor page (the path to the avatar was put into storage)
2020-10-12 10:04:40 +03:00
Alexey Kostenko
99262bdae6
Web: People: fix desktop avatarEditor
2020-10-12 08:59:17 +03:00
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
e01ee037f2
Merge branch 'master' into feature/fix-messages
...
# Conflicts:
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Core.Common/EF/Context/CoreDbContext.cs
# common/ASC.Core.Common/EF/Context/DbContext.cs
# common/ASC.Core.Common/EF/Context/DbContextManager.cs
# common/ASC.Core.Common/EF/Context/FeedDbContext.cs
# common/ASC.Core.Common/EF/Context/FilesDbContext.cs
# common/ASC.Core.Common/EF/Context/MessagesContext.cs
# common/ASC.Core.Common/EF/Context/ResourceDbContext.cs
# common/ASC.Core.Common/EF/Context/TelegramDbContext.cs
# common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
# common/ASC.Core.Common/EF/Model/AccountLinks.cs
# common/ASC.Core.Common/EF/Model/Core/Acl.cs
# common/ASC.Core.Common/EF/Model/Core/DbCoreSettings.cs
# common/ASC.Core.Common/EF/Model/Core/DbSubscriptionMethod.cs
# common/ASC.Core.Common/EF/Model/Core/Subscription.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioSettings.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedReaded.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedUsers.cs
# common/ASC.Core.Common/EF/Model/FilesConverts.cs
# common/ASC.Core.Common/EF/Model/MobileAppInstall.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsFile.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsLang.cs
# common/ASC.Core.Common/EF/Model/TelegramUser.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbButton.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbQuotaRow.cs
# common/ASC.Core.Common/EF/Model/User/UserGroup.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.Data.Reassigns/ReassignProgressItem.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.VoipService/Dao/CachedVoipDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/EF/DbEncryptedData.cs
# products/ASC.Files/Core/Core/EF/DbFile.cs
# products/ASC.Files/Core/Core/EF/DbFilesBunchObjects.cs
# products/ASC.Files/Core/Core/EF/DbFilesSecurity.cs
# products/ASC.Files/Core/Core/EF/DbFilesTagLink.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyApp.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyIdMapping.cs
# products/ASC.Files/Core/Core/EF/DbFolderTree.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
# products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Server/Startup.cs
# web/ASC.Web.Studio/Startup.cs
2020-10-09 15:40:44 +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
SuhorukovAnton
370400e4c0
fix_API_return: first version
2020-10-09 13:05:48 +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
Alexey Kostenko
721d4d6d83
Merge branch 'feature/files' into feature/avatar-editor-redesign
2020-10-01 10:21:56 +03:00
TatianaLopaeva
01423d1159
Merge branch 'feature/files' into featrure/fixe-switching-language
2020-10-01 09:38:28 +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
2f1d43df7b
Merge branch 'feature/files' into feature/loading-acceleration
2020-09-30 21:11:08 +03:00
140d57d5d4
Merge branch 'master' into feature/files
2020-09-30 18:28:27 +03:00
SuhorukovAnton
edbc0f247c
fix-messages: IDE0022
2020-09-30 17:47:42 +03:00
Artem Tarasov
8db1420cdd
Merge branch 'master' into feature/hash-password
2020-09-30 17:24:51 +03:00
58126fd98d
Auth by passwordHash
2020-09-30 17:16:48 +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
SuhorukovAnton
ba1ed22345
fix-messages: IDE0058
2020-09-30 14:50:39 +03:00
90e61ba082
Added DistributedTaskProgress
2020-09-30 13:54:49 +03:00
Artem Tarasov
c68b6d6b7f
update yarn.lock
2020-09-30 10:53:51 +03:00
e4d4db6563
Merge branch 'master' into feature/remove-wq
...
# Conflicts:
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Common/Threading/Progress/ProgressBase.cs
# common/ASC.Common/Threading/Progress/ProgressQueue.cs
# common/ASC.Common/Threading/Workers/WorkerQueue.cs
# common/ASC.Data.Reassigns/ReassignProgressItem.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.Data.Storage/StaticUploader.cs
# common/ASC.Data.Storage/StorageUploader.cs
# common/services/ASC.Data.Backup/BackupServiceLauncher.cs
# common/services/ASC.Data.Backup/Service/BackupService.cs
# common/services/ASC.Data.Backup/Service/BackupWorker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# web/ASC.Web.Core/Users/UserPhotoManager.cs
2020-09-29 19:46:40 +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
2c1d473314
Merge branch 'master' into feature/files
...
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
2020-09-28 12:29:33 +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
9a092cb8ec
moved from release/11 4414f77b
2020-09-18 17:45:59 +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
d883ef441f
Api: moved from release/11 4414f77b
2020-09-17 15:04:28 +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
Artem Tarasov
1fd0f3c010
fixed redirect edit/view profile in people
2020-09-09 15:35:50 +03:00
9778b258d7
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
2020-09-07 18:41:51 +03:00
efbebc05b5
Update yarn.lock files
2020-09-07 18:41:42 +03:00
d9783ecf26
Web: Common: fixed sort-combobox styles, added isMobile prop
2020-09-07 17:31:36 +03:00
a2f050590b
Update yarn.lock files
2020-09-04 21:04:05 +03:00
fb53f4f1f1
Web: People: Added route to Error520
2020-09-04 20:35:21 +03:00
Ilya Oleshko
91705dd4da
Web: People: Profile : Fixed avatar load
2020-09-03 17:16:05 +03:00
5298c1d27c
Web: People: Excluded caching of temp userPhotos
2020-09-02 18:10:05 +03:00
0eb3b2b4d3
Update yarn.lock files
2020-09-02 12:30:53 +03:00
da50146545
Web: Clients: Added useEffect for changeLanguage call if functional components (issue: Warning: Cannot update a component https://fb.me/setstate-in-render )
2020-09-02 12:19:21 +03:00
4babaa5e67
Web: People: Fixed work with customNames
2020-09-02 11:59:36 +03:00
0152274029
Web: Clients: Fixed workbox.expiration.Plugin is not a constructor
2020-09-01 18:34:06 +03:00
00c6ce5e9b
Web: Clients: Added api-cache in service-worker for base info for 30 Minutes
2020-09-01 18:11:20 +03:00
bd6c0d0338
Web: Clients: Fixed windows is not defined
2020-09-01 18:09:39 +03:00
bc8613c4f6
Web: Clients: Uncommented self.skipWaiting() on install service-worker
2020-09-01 17:53:24 +03:00
Ilya Oleshko
fc76acf31f
Web: People: Home : Fixed property warnings for empty row places
2020-09-01 16:18:58 +03:00
Ilya Oleshko
6ad8abc8fa
Web: People: Home : Added prop widthProp for components
2020-09-01 15:24:10 +03:00
5f7265931c
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
2020-08-31 17:45:52 +03:00
29d9f21d05
Merge branch 'master' into feature/files
...
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# web/ASC.Web.Core/Files/DocumentService.cs
2020-08-31 17:45:57 +03:00
062a3a793f
Update yarn.lock files
2020-08-31 17:45:37 +03:00
f78eb3aada
Web: People: fixed empty-screen-container to new article
2020-08-31 16:33:31 +03:00
d9f70df70a
Update yarn.lock files
2020-08-31 12:42:36 +03:00
2b9f263dbc
Web: People: Added Webpack-bundle-analyzer
2020-08-31 11:59:35 +03:00
Ilya Oleshko
e899d9d6bd
Web: People: Home : Fixed auto scroll to body on mobile or tablet devices
2020-08-28 12:14:22 +03:00
maksim
8282f3f658
fix
2020-08-27 17:01:37 +03:00
15ba6828c5
Merge branch 'master' into feature/files
...
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
2020-08-20 12:43:12 +03:00
d5942241e8
Web: Clients: Parallelized initial API queries
2020-08-20 12:17:36 +03:00
05bc905831
Web: Clients: Fixed regex to transltaion.json files for serviceWorker
2020-08-19 21:18:23 +03:00
8d11e1b0c8
Web: Clients: Changed interaction with serviceWorker
2020-08-19 20:00:41 +03:00
142232d0af
Web: People: added aside panel to context-menu-button, added new translation
2020-08-19 10:38:34 +03:00
7a813247af
Web: Clients: fixed url to loading translation.json for products
2020-08-18 11:18:44 +03:00
ac6dfbaebc
Web People Client: simplified configuration of i18n (+ removed useless requests + removed useless Import page)
2020-08-17 13:17:38 +03:00
Alexey
fada82ae41
Web: Components: Fix rotate in avatar editor
2020-08-14 08:29:15 +03:00
SuhorukovAnton
df8b6fd8b0
private: firtst version
2020-08-12 12:58:08 +03:00
Ilya Oleshko
abc2bcc03c
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
2020-08-11 15:57:35 +03:00
Ilya Oleshko
7ac9ad6c62
Web: People: Reassign: Fixed page wrapper
2020-08-11 15:51:27 +03:00
Ilya Oleshko
6df4e05bd9
Web: People: ProfileAction: Fixed page wrapper
2020-08-11 15:50:15 +03:00
Ilya Oleshko
bbc57115a3
Web: People: Profile: Fixed page wrapper
2020-08-11 15:49:54 +03:00
Ilya Oleshko
ade0c7d149
Web: People: Import: Fixed page wrapper
2020-08-11 15:49:40 +03:00
Ilya Oleshko
94f447a272
Web: People: Home: Fixed page wrapper
2020-08-11 15:49:22 +03:00
Ilya Oleshko
5d3f75b7ed
Web: People: GroupAction: Fixed page wrapper
2020-08-11 15:49:03 +03:00
07116cfea6
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
2020-08-11 14:37:40 +03:00
f071702b77
Web: People: fixed profile routing
2020-08-11 14:37:03 +03:00
Ilya Oleshko
f41d10e07e
Web: People: Home: Fixed items of GroupButtonsMenu
2020-08-11 11:04:40 +03:00
992ab07b87
Common: Reassign. DistributedTaskQueue
2020-08-07 18:42:58 +03:00
ffc756f32b
Backup: DistributedTaskQueue
2020-08-06 21:07:27 +03:00
be81ca291d
Update yarn.lock files + bump versions
2020-07-17 18:03:08 +03:00
d094546147
Merge branch 'master' into feature/files
...
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/yarn.lock
2020-07-17 17:48:50 +03:00
ec20c66c5d
Update yarn.lock files
2020-07-17 17:43:39 +03:00
562abfcdc9
DI: refactoring
2020-07-17 13:52:28 +03:00
679e77a3ea
Update yarn.lock files
2020-07-16 16:09:09 +03:00
098e872a38
Merge branch 'master' into feature/files
...
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
2020-07-16 15:58:43 +03:00
ec8c6a5ddb
Fixed security vulnerability in lodash
2020-07-16 15:54:04 +03:00
78b10ab893
Update yarn.lock files
2020-07-16 14:55:40 +03:00
a54be3b64c
Merge branch 'master' into feature/files
2020-07-15 16:57:14 +03:00
e10ac2ccfa
BaseStartup: refactoring
2020-07-15 15:33:44 +03:00
13b1d0140c
Web: People: fixed header styles
2020-07-08 14:25:01 +03:00
a05a058974
Web: People: fixed header styles
2020-07-08 13:21:06 +03:00
SuhorukovAnton
9d069de30a
general-startup: transform GeneralStartup to BaseStartup
2020-07-07 23:00:39 +03:00
SuhorukovAnton
00558dd95f
general-startup: fix
2020-07-06 10:56:17 +03:00
SuhorukovAnton
71d90ebfa2
general-startup: fix
2020-07-03 18:57:59 +03:00
SuhorukovAnton
2f5491f1ba
general-startup: first version
2020-07-03 14:47:27 +03:00
Ilya Oleshko
51d7984c91
Web: Fixed header icons width to 17px
2020-06-17 11:26:18 +03:00
Ilya Oleshko
b6dd65f1c7
Merge branch 'master' into feature/files
2020-06-15 09:22:52 +03:00
Ilya Oleshko
a1f3b4bde0
Web: Removed faker package, updated yarn lock and fixed stories
2020-06-11 15:54:53 +03:00
7ee4237af4
Update storybook packages (Fix ReDoS vulnerability in websocket-extensions)
2020-06-11 15:13:43 +03:00
144877ab38
Update yarn.lock files
2020-06-08 12:00:05 +03:00
Ilya Oleshko
be6b6eb3ad
Merge branch 'master' into feature/files
2020-06-05 14:25:54 +03:00
635ff124fb
Json: fixed enum
2020-06-05 14:05:42 +03:00
004dcc2d4d
Merge branch 'master' into feature/files
2020-06-04 16:48:03 +03:00
fed4d206f7
Revert logger
2020-06-04 16:46:58 +03:00
d7386049dc
Merge branch 'master' into feature/files
2020-06-04 16:27:06 +03:00
b55cc7c697
Startup: added command line
2020-06-04 16:26:31 +03:00
ae0fb62add
Merge branch 'master' into feature/files
2020-06-04 16:05:12 +03:00
794486f335
Notify: temp log
2020-06-04 16:04:17 +03:00
0a48d2b179
Merge branch 'master' into feature/files
2020-05-28 09:20:58 +03:00
e7ecaefa3c
Added JsonStringEnumConverter
2020-05-27 16:19:58 +03:00
NikolayRechkin
64811dbd39
update yarn.lock files
2020-05-21 15:35:28 +03:00
0705756719
Merge branch 'master' into feature/files
2020-05-19 23:13:51 +03:00
ecd66902a0
Merge branch 'master' into feature/system-json
2020-05-18 14:16:03 +03:00
1842076658
Merge branch 'master' into feature/files
2020-05-18 10:51:37 +03:00
47c79d57f0
Optimization
2020-05-17 16:08:20 +03:00
3a747ef8e4
Merge branch 'master' into feature/system-json
...
# Conflicts:
# common/ASC.Api.Core/Core/ApiContext.cs
# common/ASC.Api.Core/Core/ApiDateTime.cs
# common/ASC.Api.Core/Model/EmployeeWraper.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# products/ASC.People/Server/Models/GroupWrapperFull.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Api/Models/BuildVersion.cs
2020-05-07 10:28:20 +03:00
Daniil Senkiv
09474e8be9
People.Client: replace FilterInput from asc-web-components to asc-web-common, delete asc-web-components FilterInput
2020-03-19 15:05:57 +03:00
15c5114a10
Update yarn.lock files
2020-03-18 13:08:58 +03:00
Daniil Senkiv
730ca469a1
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files
...
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
# products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/src/store/files/reducers.js
# products/ASC.Files/Client/src/store/files/selectors.js
2020-03-17 09:07:39 +03:00
Ilya Oleshko
01bda2d223
People.Client: Home: Fixed people row default width
2020-03-16 12:20:29 +03:00
0bcfec5a19
Update yarn.lock files
2020-03-16 11:20:25 +03:00
eb21f8a957
Update yarn.lock files
2020-03-16 10:37:55 +03:00
dependabot[bot]
3e25e5c6de
Bump acorn from 5.7.3 to 5.7.4 in /products/ASC.People/Client
...
Bumps [acorn](https://github.com/acornjs/acorn ) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases )
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-03-14 00:54:24 +00:00
9a1a118f79
Merge branch 'master' into feature/elastic
2020-02-27 11:24:14 +03:00
cae7c0f8c1
Web: People: fixed translation files
2020-02-27 11:12:11 +03:00
00e5f0c9cf
Web: People: added truncate prop to checkbox, added border to users list container
2020-02-26 16:18:55 +03:00
888d735790
Web: People: fixed user list styles
2020-02-26 15:35:12 +03:00
d33895d8d5
Web: People: added custom scroll to list users
2020-02-26 15:26:54 +03:00
a192178156
Merge branch 'feature/elastic' of github.com:ONLYOFFICE/AppServer into feature/elastic
2020-02-26 11:06:55 +03:00
1bc8f58df4
Merge branch 'master' into feature/user-actions-changes
2020-02-26 10:55:17 +03:00
ac5017da99
Merge branch 'master' into feature/elastic
...
# Conflicts:
# build/build.bat
# build/rebuild.bat
2020-02-26 10:46:37 +03:00
e4af4d168f
Update yarn.lock files
2020-02-26 10:23:38 +03:00
2ccd226940
web: clients: Fixed CRA proxy bug;
2020-02-26 10:02:37 +03:00
30dbb2a6ca
Web: People: added send email function
2020-02-25 16:58:34 +03:00
935772d783
Web: People: renamed DeleteGroupUsersDialog to DeleteUsersDialog
2020-02-25 16:20:48 +03:00
35e2e20049
Files: added model
2020-02-25 15:21:48 +03:00
48513d7356
Web: People: renamed an array of users
2020-02-25 14:20:35 +03:00
fa4a088692
Web: People: fixed onChange checkbox function
2020-02-25 14:18:28 +03:00
e476681495
Web: People: added display of all users in the list in DeleteGroupUsersDialog, fixed display of the list of users
2020-02-25 13:14:44 +03:00
d9522e48ef
Web: People: added display of all users in the list in ChangeUserStatusDialog, fixed display of the list of users
2020-02-25 11:58:04 +03:00
8737369a1c
Web: People: added display of all users in the list in ChangeUserTypeDialog, fixed display of the list of users
2020-02-25 11:35:34 +03:00
ee31bb29b5
Web: People: fixed dialog class names
2020-02-25 11:32:17 +03:00
44ec45ebb6
Merge branch 'master' into feature/elastic
...
# Conflicts:
# common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Caching/CachedQuotaService.cs
# common/ASC.Core.Common/Caching/CachedTenantService.cs
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Context/Impl/AuthManager.cs
# common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
# common/ASC.Core.Common/Context/Impl/TenantManager.cs
# common/ASC.Core.Common/Context/SecurityContext.cs
# common/ASC.Core.Common/Data/DbSettingsManager.cs
# common/ASC.Core.Common/Tenants/TenantUtil.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.IPSecurity/IPSecurity.cs
# common/services/ASC.Studio.Notify/Program.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Core/CookiesManager.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
2020-02-25 11:24:45 +03:00
a90b1fb424
People: added GetExpression
2020-02-25 11:02:13 +03:00
707e0bbf82
Web: People: added display of all users in the list in SendInviteDialog, fixed display of the list of users
2020-02-25 10:51:27 +03:00
af7ac989a6
Web: People: modified sending users to dialogs
2020-02-25 10:47:40 +03:00
a452774b8b
Web: People: added getUsersIds selector
2020-02-25 10:44:08 +03:00
9db8b26985
Replaced NewtonsoftJson with System.Text.Json
2020-02-21 16:19:32 +03:00
c0cc5cc188
Web: People: dialog message translations fixed
2020-02-21 11:57:47 +03:00
356e1d48ec
Web: People: fixed send email header
2020-02-21 11:33:55 +03:00
a9f64e474f
Merge branch 'master' into feature/user-actions-changes
2020-02-21 10:20:16 +03:00
28e94c16fc
Web: People: fixed closing group button menu
2020-02-21 10:18:20 +03:00
7429478e2c
Web: People: added new translations
2020-02-21 09:08:53 +03:00
41b943062a
Web: People: removed unused translations
2020-02-21 09:06:58 +03:00
c5dbf8c859
Removed unused dependencies
2020-02-20 17:57:48 +03:00
c05fd0bfe7
Web: People: fixed change user type error
2020-02-20 16:14:33 +03:00
dd6ac76105
Web: People: added new translations
2020-02-20 16:05:36 +03:00
a1efaa4c17
Web: People: added change user type dialog
2020-02-20 15:55:25 +03:00
43bdd40f46
Web: People: removed unused getSelectionIds function, fixed getUserType function
2020-02-20 15:50:33 +03:00
c9689bc7df
Web: People: rename DeleteGroupUsersShowUsers to ShowUsersList
2020-02-20 15:49:22 +03:00
65fa34dff4
Web: People: added change user status dialog
2020-02-20 14:13:54 +03:00
6c7145f32e
Web: People: removed set disabled dialog
2020-02-20 14:12:42 +03:00
f2dd97824d
Web: People: added new disable users dialog
2020-02-20 11:24:53 +03:00
e0e7803e56
Web: People: fixed users dialogs
2020-02-20 11:23:27 +03:00
f135a022d3
Web: People: fixed selectors functions
2020-02-20 11:22:23 +03:00
9ef838e8fc
Web: People: refactoring delete group users dialog
2020-02-20 09:28:58 +03:00
7ada48f0bc
Web: People: added send invite dialog to group users
2020-02-20 09:26:51 +03:00
05954f21e0
Web: People: added new translations to resourceConfig
2020-02-19 16:09:54 +03:00
a8eb7d8b1b
Web: People: added delete group users warning dialog
2020-02-19 16:08:57 +03:00
7a8baecb2a
Files: ef, di
2020-02-19 11:37:52 +03:00
68e1a6a6a0
Web: People: added disabling action fields in the group buttons menu
2020-02-19 10:32:51 +03:00
fa1bde3742
Web: People: change title of pages, added new translations
2020-02-18 13:16:01 +03:00
Ilya Oleshko
b68ea6335c
People.Client: Home: Fixed width for Row sub components
2020-02-18 12:06:18 +03:00
39db07a4a8
Web: People: fixed clickability of a link to groups in a tree
2020-02-17 17:29:24 +03:00
785f002c4d
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
2020-02-17 16:50:49 +03:00
82380e35e9
Web: People: change title of pages
2020-02-17 16:50:19 +03:00
Ilya Oleshko
289c9e7807
People.Client: Home: Fixed context options array
2020-02-17 15:29:03 +03:00
31526c5e48
Web: People: fixed groups tree links
2020-02-17 13:43:13 +03:00
a5280a1694
Added DIHelper
2020-02-17 11:58:14 +03:00
2c024ca787
Web: People: fixed profile rerender after click on user
2020-02-17 11:08:46 +03:00
d9468384a6
Web: People: added links to users list
2020-02-17 09:50:00 +03:00
933bf17f4e
Web: People: added links to groups in the tree
2020-02-17 08:55:23 +03:00
b550a776a9
Web: People: added logo icons
2020-02-14 16:05:12 +03:00
42171afc48
Web: People: fixed updated filter after selecting a group
2020-02-14 14:51:08 +03:00
b48d80b2b3
Web: People: fixed datepicker disable prop
2020-02-14 12:47:07 +03:00
65b2d25520
Web: People: fixed profile menu blocks alignment
2020-02-14 11:46:37 +03:00
5791c1bcf5
Web: People: fixed profile text color and fields size
2020-02-14 11:26:29 +03:00
507cd94e98
Merge branch 'master' into feature/redesign
...
# Conflicts:
# web/ASC.Web.Common/package.json
2020-02-13 11:09:37 +03:00
Ilya Oleshko
e99d1acc3c
Web: Common: Layout: Added use of icons from module
2020-02-12 16:18:23 +03:00
43f662acd1
Merge branch 'feature/redesign' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/redesign
2020-02-12 13:07:45 +03:00
8298a77717
Web: Client: fixed tree icons
2020-02-12 13:03:23 +03:00
Ilya Oleshko
1d7bdb03b0
People.Client: Home: Fixed GroupButtonsMenu size with pined Aside on mobile
2020-02-12 11:40:56 +03:00
159bdc1a72
Merge branch 'master' into feature/redesign
...
# Conflicts:
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/package.json
2020-02-12 09:40:56 +03:00
c900a319de
Added update user list after remove disabled user
2020-02-11 15:28:18 +03:00
Ilya Oleshko
ebceb3b346
People.Client: Home: Fixed default DropDown direction for action button
2020-02-11 11:12:39 +03:00
b57007d28b
Web: People: hidden tree icons
2020-02-10 15:49:50 +03:00
1e833b4ecd
Web: People: fixed people group colors and font
2020-02-10 15:21:05 +03:00
Daniil Senkiv
1b9700aa19
removed comment
2020-02-07 19:48:13 +03:00
Daniil Senkiv
343b836fb0
People.Client: fixed ( e5cc1558cd
)
2020-02-07 11:39:29 +03:00
Daniil Senkiv
ff5d59b0c8
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
2020-02-06 16:31:35 +03:00
Daniil Senkiv
e5cc1558cd
People.Client: Profile: added updating profile after changing user status or avatar
2020-02-06 16:31:27 +03:00
NikolayRechkin
db5cddf7db
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
2020-02-06 15:55:46 +03:00
NikolayRechkin
8b1f5ea1cb
web: People: small fix a loader
2020-02-06 15:55:34 +03:00
b150f93f85
web: People: Added error handling in GroupAction
2020-02-06 15:28:42 +03:00
Daniil Senkiv
5245058257
People.Client: Profile: added toast and translations
2020-02-06 14:50:24 +03:00
Daniil Senkiv
8efd3217df
People.Client: Home: fixed showing toast
2020-02-06 14:49:35 +03:00
Daniil Senkiv
949e8e44b8
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
2020-02-06 14:29:29 +03:00
Daniil Senkiv
89d06ae478
People.Client: Home: fixed problem with fetching people after changing user status
2020-02-06 14:29:20 +03:00
Ilya Oleshko
dfc9c0250a
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
2020-02-06 11:17:28 +03:00
Ilya Oleshko
6e3553bee2
People.Client: Home: Fixed position for actions menu on tablet devices, small code styling
2020-02-06 11:17:11 +03:00
Daniil Senkiv
77f0d160ac
People.Client: Profile: cleaning profile info in redux after unmounting component
2020-02-06 10:17:28 +03:00
Daniil Senkiv
362f8021f1
People.Client: ProfileAction: added translations
2020-02-05 17:57:49 +03:00
Daniil Senkiv
0e4fca3274
People.Client: Profile: added translations
2020-02-05 17:57:34 +03:00
Daniil Senkiv
6ca37b22b9
People.Client: Home: userContent: fixed color
2020-02-05 17:03:18 +03:00
Daniil Senkiv
53b0de8704
People.Client: Profile: Header: fixed icon style
2020-02-05 16:08:26 +03:00
Daniil Senkiv
5ae02954e3
People.Client: Home: removed blue border on tap from touch devices
2020-02-05 15:57:35 +03:00
Daniil Senkiv
874b24c4be
People.Client: i18n config: debug only in development mode
2020-02-05 15:44:48 +03:00
Daniil Senkiv
dec059457c
People.Client: Import, Reassign:fixed i18n config
2020-02-05 12:33:31 +03:00
Daniil Senkiv
23b278e644
People.Client: Home: changed color for disabled and pending users, removed useless import
2020-02-05 11:56:33 +03:00
f43761a3d4
web: People: Added trim for url param "search"
2020-02-05 10:41:56 +03:00
Daniil Senkiv
f481452dec
People.Client: ProfileAction: createUserForm: added translations to PasswordField components
2020-02-03 18:49:27 +03:00
Daniil Senkiv
8c5b825e17
People.Client: ProfileActions: updateUserForm: added translations
2020-02-03 17:58:29 +03:00
Daniil Senkiv
2afc96bcc1
People.Client: Profile: fixed translations
2020-02-03 16:09:53 +03:00
Daniil Senkiv
fc8dbcb9cb
People.Client: Profile: helpbutton: fixed area for tapping on touch devices
2020-02-03 16:09:29 +03:00
8c2b39406f
Merge branch 'master' into feature/merge
2020-02-03 14:29:41 +03:00
f0cec97c3e
web: common: Added ErrorBoundary component with componentDidCatch and new Error520Container show
2020-02-03 11:36:25 +03:00
Daniil Senkiv
d657d59556
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
2020-02-03 08:50:05 +03:00
f3e670e393
web: Common: Extended PeopleSelector component with Me option
2020-02-02 17:33:44 +03:00
Daniil Senkiv
6f2bf3986d
People.Client: Profile: increased area for tapping IconButton
2020-01-31 18:26:21 +03:00
Daniil Senkiv
1a54529d34
People.Client: Home: increased area for tapping IconButton
2020-01-31 18:26:08 +03:00
Daniil Senkiv
5469f0698e
People.Client: InviteDialog: fixed problem with changing language
2020-01-31 15:25:15 +03:00
acde301b26
Merge branch 'master' into feature/merge
2020-01-31 10:59:00 +03:00
Daniil Senkiv
83e965841f
Merge branch 'master' into feature/translations
2020-01-30 17:46:06 +03:00
Daniil Senkiv
6419c9b588
People.Client: Profile: fixed icon size in contact info and social profiles
2020-01-30 17:24:48 +03:00
Daniil Senkiv
ebe0323d77
People.Client: Home: Header: fixed style
2020-01-30 16:30:00 +03:00
Daniil Senkiv
49d6a4d049
People.Client: MainButton: replaced icons
2020-01-30 13:50:05 +03:00
Daniil Senkiv
693d8d63b5
People.Client: Home: changed translations according to new design
2020-01-30 11:31:57 +03:00
Daniil Senkiv
f78f0cd374
i18n.reloadResources: fixed for reducing reloading translations
2020-01-29 13:15:46 +03:00
Daniil Senkiv
f7f93a2712
People.Client: Dialogs: Added props to base constructor
2020-01-28 18:55:45 +03:00
Daniil Senkiv
2f953e4de9
Merge branch 'master' into feature/translations
2020-01-28 17:13:00 +03:00
Daniil Senkiv
556577061b
People.Client: ProfileActon: added maxLength prop to firstname and lastname field
2020-01-28 16:38:11 +03:00
Daniil Senkiv
3902daafa6
People.Client: GroupAction: removed useless container for header
2020-01-28 14:56:01 +03:00
Daniil Senkiv
8e9cad46c9
People.Client: fixed width of GroupButtonsMenu
2020-01-28 14:43:28 +03:00
Daniil Senkiv
c969609db9
People.Client: Profile: changed order of requests after changing language
2020-01-28 14:08:27 +03:00
Daniil Senkiv
6e0fe3023e
People.Client: ProfileAction: fixed translations
2020-01-28 13:20:50 +03:00
Daniil Senkiv
f017988679
People.Client: Profile: changed strings to customNames
2020-01-28 12:03:22 +03:00
Daniil Senkiv
f66edbb2bf
People.Client: fixed translation keys
2020-01-28 11:44:22 +03:00
Daniil Senkiv
30bc717afa
People.Client: ProfileAction: added new translations, fixed i18n config
2020-01-27 18:42:56 +03:00
Daniil Senkiv
433c993c4b
People.Client: Home: added new translations, fixed i18n config
2020-01-27 18:24:31 +03:00
Daniil Senkiv
648ff6361d
People.Client: Article: added new translations, fixed i18n config
2020-01-27 17:58:10 +03:00
Daniil Senkiv
06a25d69a4
People.Client/Web.Component: fixed render after changing user language
2020-01-27 17:46:11 +03:00
Daniil Senkiv
63afd6d962
People.Client: GroupAction: fixed translations, added new
2020-01-27 14:47:18 +03:00
Daniil Senkiv
998ea6f320
People.Client: removed useless i18n config
2020-01-26 15:32:40 +03:00
Daniil Senkiv
9d82e657ed
Merge branch 'master' into feature/translations
...
# Conflicts:
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Common/src/constants/index.js
2020-01-26 14:12:37 +03:00
Daniil Senkiv
960e9bdcb7
fix ( c5e1dd8aa5
)
2020-01-24 16:16:41 +03:00
Daniil Senkiv
c5e1dd8aa5
People.Client: Home: Body: fixed applying translations for ContextMenuButton after first load of translation file
2020-01-24 16:02:58 +03:00
5edc461090
People.Client: Home: fixed empty screen when go back button clicked from another pages
2020-01-24 14:57:05 +03:00
Daniil Senkiv
73f52b630d
People.Client: InviteDialog: fixed ( 01459d0968
) for Mozilla browser
2020-01-24 14:12:26 +03:00
9763b8aa87
People.Client: Home: fixed empty screen when go back button clicked from another pages
2020-01-24 11:54:22 +03:00
cf0bad86c2
People.Client: Home, Profile: using props withBodyAutoFocus from PageLayout
2020-01-24 11:25:54 +03:00
Daniil Senkiv
01459d0968
People.Client: InviteDialog: fixed: first copy toast had wrong language, if language changed earlier
2020-01-23 18:38:35 +03:00
Daniil Senkiv
b39e6ff690
People.Client: Profile: fixed ( ac592c599a
) and ( 0cb31bfa24
)
2020-01-23 15:51:14 +03:00
38f5c93172
People.Client: Home: fixed empty screen when go back button clicked from another pages
2020-01-23 15:38:11 +03:00
Daniil Senkiv
17db173fc8
People.Client: ProfileActions: added lowercase config, commented unused translation
2020-01-23 11:12:40 +03:00
Daniil Senkiv
0cb31bfa24
Web.Common, People.Client: triggered updating modules language after changing user language
2020-01-23 10:58:08 +03:00
Daniil Senkiv
ac592c599a
People.Client: triggered updating customNames after changing user language
2020-01-22 16:23:47 +03:00
Daniil Senkiv
1abb45a2ba
People.Client: removed fake custom names
2020-01-22 13:46:19 +03:00
Daniil Senkiv
2c09e6cf10
People.Client: ProfileAction: applied real custom names
2020-01-22 13:45:43 +03:00
Daniil Senkiv
ead82ac91e
People.Client: Profile: applied real custom names
2020-01-22 13:40:06 +03:00
Daniil Senkiv
48218df13b
People.Client: Home: applied real custom names
2020-01-22 10:17:05 +03:00
Daniil Senkiv
68a6e7261a
People.Client: GroupAction: fixed translations
2020-01-22 09:54:49 +03:00
Daniil Senkiv
46fc0397df
People.Client: GroupAction: applied real custom names
2020-01-22 09:47:44 +03:00
Daniil Senkiv
57db4e467f
People.Client: InviteDialog: applied real custom names
2020-01-21 18:20:12 +03:00
Daniil Senkiv
fe9131eed3
People.Client: DeleteProfileEverDialog: applied real custom names
2020-01-21 18:17:41 +03:00
Daniil Senkiv
bfc06bb1f3
People.Client: Article: applied real custom names
2020-01-21 18:13:57 +03:00
Daniil Senkiv
e4fff6db08
People.Client: ProfileAction: changed redux to localStorage for storing language value
2020-01-21 11:16:51 +03:00
Daniil Senkiv
be4c362a3e
People.Client: Profile: changed redux to localStorage for storing language value
2020-01-21 11:13:20 +03:00
Daniil Senkiv
e6835a3722
People.Client: Home: changed redux to localStorage for storing language value
2020-01-21 11:08:41 +03:00
Daniil Senkiv
9db003053d
People.Client: GroupAction: changed redux to localStorage for storing language value
2020-01-21 10:22:00 +03:00
Daniil Senkiv
a0d88bf43b
People.Client: InviteDialog: removed withRouter HOC
2020-01-21 10:14:46 +03:00
Daniil Senkiv
79ac4d7075
People.Client: DeleteProfileEverDialog: added withRouter HOC
2020-01-21 10:13:46 +03:00
Daniil Senkiv
26f51e714c
People.Client: DeleteSelfProfileDialog: changed redux to localStorage for storing language value
2020-01-21 10:03:19 +03:00
Daniil Senkiv
556d2f19b1
People.Client: DeleteProfileEver: changed redux to localStorage for storing language value
2020-01-21 10:01:21 +03:00
Daniil Senkiv
7ea8ef114e
People.Client: ChangePhoneDialog: changed redux to localStorage for storing language value
2020-01-21 09:55:55 +03:00
Daniil Senkiv
5ad8c8237c
People.Client: ChangeEmailDialog: removed withRouter HOC
2020-01-21 09:46:50 +03:00
Daniil Senkiv
5f486e0c01
People.Client: ChangePasswordDialog: changed redux to localStorage for storing language value
2020-01-21 09:44:21 +03:00
Daniil Senkiv
2b961dd144
People.Client: ChangeEmailDialog: changed redux to localStorage for storing language value
2020-01-21 09:36:08 +03:00
Daniil Senkiv
83559706af
People.Client: Article: changed redux to localStorage for storing language value
2020-01-21 09:11:58 +03:00
Daniil Senkiv
255d5c5784
People.Client: InviteDialog:changed redux to localStorage for storing language value
2020-01-21 08:59:05 +03:00
Daniil Senkiv
8e772cce97
People.Client: Home: fixed: initial language value is getting from localStorage
2020-01-20 18:39:08 +03:00
Daniil Senkiv
28b0eced9d
People/Web.Client: selecting portal language, if user language not defined
2020-01-20 14:17:39 +03:00
4bad85defe
moved from hotfix/10.5.2
2020-01-17 16:58:26 +03:00
Daniil Senkiv
c6439b6026
People.Client: ProfileAction: fixed showing long departments name
2020-01-16 16:39:54 +03:00
Daniil Senkiv
b53defb734
People.Client: Profile: fixed showing long text
2020-01-16 16:39:10 +03:00
Daniil Senkiv
ff47af27b9
People.Client: ProfileInfo: deleted unused ModalDialog component
2020-01-16 14:09:08 +03:00
Daniil Senkiv
de54bcf86b
Web.Common: PageLayout: fixed section-header style for content
2020-01-16 12:25:28 +03:00
Daniil Senkiv
258ec92046
People.Client: Home: deleted unused ModalDialog component
2020-01-15 18:40:50 +03:00
Daniil Senkiv
3212a46035
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
2020-01-15 17:48:04 +03:00
Daniil Senkiv
31dd1e903f
Web.Common: PageLayout: fixed section header style
2020-01-15 17:38:40 +03:00
09426943b2
web: People: Update all dependencies
2020-01-15 11:59:25 +03:00
Daniil Senkiv
0a09aaaa07
Web.Common: AdvancedSelector: fixed styles, reverted ( c6fbf51389
)
2020-01-13 16:27:18 +03:00
Daniil Senkiv
c6fbf51389
People.Client: DepartmentField: fixed border-color style for input
2020-01-13 15:24:43 +03:00
Daniil Senkiv
4a0deedd7d
People.Client: fixed placeholder, fixed GroupSelector component
2020-01-13 12:48:07 +03:00
Daniil Senkiv
2011543224
People.Client: added link to social profiles and contact information
2020-01-10 20:31:04 +03:00
Daniil Senkiv
1b78e52321
People.Client: GroupAction: added Enter handling for creating department
2020-01-10 16:41:35 +03:00
Daniil Senkiv
e7779cdec2
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
2020-01-09 17:42:18 +03:00
Daniil Senkiv
dea42683cf
People.Client: InviteDialog: deleted unused translations
2020-01-09 17:42:05 +03:00
25fc0669f7
web: Fixed handleAnyClick for DropDown
2020-01-09 16:27:49 +03:00
Ilya Oleshko
d22352e75e
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
2019-12-27 15:59:47 +03:00
a63abfc9b7
ASC.People: AvatarEditor: added file selection text for mobile devices
2019-12-27 15:56:12 +03:00
Ilya Oleshko
b1e289ebb9
Web: People: Home: Fixed filter sorting style
2019-12-27 15:55:57 +03:00
4f1080da05
ASC.People: ProfileAction: enlarged button area
2019-12-27 15:31:12 +03:00
8dcff0883d
ASC.People: Home: fixed fontWeight in user list
2019-12-27 14:26:46 +03:00
b3e65be930
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
2019-12-27 14:03:42 +03:00
692279b4b0
ASC.People: GroupAction, ProfileAction: using combobox default option
2019-12-27 14:03:35 +03:00
06afd70b7f
web: People: Fixed font-weight in Group Name TextInput
2019-12-27 13:59:41 +03:00
Daniil Senkiv
fe044697d3
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
2019-12-27 13:41:46 +03:00
48e56d462a
Api: people. Fixed "Sequence contains no elements" error while saving empty contacts list
2019-12-27 13:19:35 +03:00
ddb222fd86
ASC.People: GroupAction: search block is hidden because it requires clarification of its work on large lists
2019-12-27 11:43:55 +03:00
Daniil Senkiv
9850473222
People.Client:dialogs: fixed email style
2019-12-27 11:42:44 +03:00
10918fe9e1
Web: People: fixed merge
2019-12-27 11:05:06 +03:00
87e17ff100
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
...
# Conflicts:
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Header/index.js
2019-12-27 10:53:11 +03:00
5430f8c734
Web: People: fixed icon arrow clickability
2019-12-27 10:49:14 +03:00
Daniil Senkiv
8a65ac9cec
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
2019-12-27 10:19:18 +03:00
1f15f4f1e2
ASC.People: GroupAction: truncate header text
2019-12-27 10:17:17 +03:00
Daniil Senkiv
e87b17e6c9
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
2019-12-27 10:14:31 +03:00
d94d386f57
ASC.People: GroupAction: max-width: 1024px
2019-12-27 09:49:05 +03:00
fcdf0a0f97
ASC.People: GroupAction: Grid styled selected-items
2019-12-26 18:34:19 +03:00
a8d4d0b6a9
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
2019-12-26 17:08:36 +03:00
e0a9fabb0b
Web: Common: fixed help-button styles
2019-12-26 17:08:24 +03:00
d1099fdb79
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
2019-12-26 16:55:30 +03:00
386fa9df6e
ASC.People: ProfileAction: Fixed header text
2019-12-26 16:55:06 +03:00
3f69ca4860
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
2019-12-26 16:23:52 +03:00
47f0428931
web: People: Replaced bind to separated methods
2019-12-26 16:23:42 +03:00
a7ad25fee5
ASC.People: GroupAction: Fixed translations
2019-12-26 16:08:24 +03:00
193651b382
Web: People: fixed profile arrow clickability
2019-12-26 15:41:26 +03:00
a6aed107fc
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
2019-12-26 15:26:14 +03:00
87bfe9ffbe
ASC.People: GroupAction: indentation fixed
2019-12-26 15:26:07 +03:00
82023841f4
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
2019-12-26 15:12:23 +03:00
cca92425d0
ASC.People: GroupAction: Fixed translations
2019-12-26 15:11:38 +03:00
1aff07e97f
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
2019-12-26 15:11:33 +03:00
91c528a8e3
web: People: Hidden not implemented InviteAgain action
2019-12-26 15:11:24 +03:00
edd654a2a4
web: People: Change IconButton to ContextMenuButton with more actions
2019-12-26 15:10:39 +03:00
619615a2ad
ASC.People: customNames: Fixed translations
2019-12-26 14:51:14 +03:00
46dce238b2
Web: People: fixed help-button clickability
2019-12-26 13:49:41 +03:00
1870e125f9
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
2019-12-26 12:24:00 +03:00
a45db44549
Web: People: fixed clickability of department icon
2019-12-26 12:23:54 +03:00
763136b4b3
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
2019-12-26 12:12:20 +03:00
3241a4f25c
web: People: Fixed goBack actions
2019-12-26 12:12:13 +03:00
Daniil Senkiv
54121b1323
People.Client: fixed TreeMenu colors
2019-12-26 12:00:15 +03:00
NikolayRechkin
779e04eb5b
web: people: added placeholder for filter input field
2019-12-26 11:46:05 +03:00
Daniil Senkiv
19f391bf0d
Merge branch 'master' into feature/separated-modal-dialogs
2019-12-26 10:15:09 +03:00
Daniil Senkiv
567f006285
People.Client: Profile: createUserForm: added hasError prop to EmailInput
2019-12-25 18:23:46 +03:00
aea429a0ad
Api: people. Fixed saving contacts
2019-12-25 18:16:29 +03:00
Daniil Senkiv
9b480c349b
Merge branch 'master' into feature/separated-modal-dialogs
...
# Conflicts:
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
# web/ASC.Web.Components/package.json
2019-12-25 17:44:37 +03:00
Daniil Senkiv
b739b15c77
People.Client: dialogs: replaced functions to arrow functions
2019-12-25 17:28:38 +03:00
Daniil Senkiv
14b88b8d56
People.client: changeEmailDialog: fixed translations
2019-12-25 17:21:04 +03:00
Daniil Senkiv
bb39cb5611
people.client: changeEmailDialog: added prop user instead of 2 props
2019-12-25 17:18:49 +03:00
Daniil Senkiv
7bc8e59172
people.client: fixed conflict
2019-12-25 16:43:03 +03:00
ff5de59b3e
ASC.People: ProfileAction: Fixed translations
2019-12-25 15:58:12 +03:00
Ilya Oleshko
6f969da694
Web: People: Fixed profile info order on Profile page
2019-12-25 13:37:11 +03:00
Ilya Oleshko
e44a78a94b
Web: People: Fixed translations on Profile page
2019-12-25 13:36:32 +03:00
Ilya Oleshko
ca1eb07e8c
Web: People: Fixed max-width CSS property for User page
2019-12-25 12:47:44 +03:00
Daniil Senkiv
177b50909e
Merge branch 'master' into feature/separated-modal-dialogs
...
# Conflicts:
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
2019-12-25 11:37:34 +03:00
10739ad361
ASC.People: ProfileAction: createUserForm: unnecessary code removed
2019-12-25 11:24:43 +03:00
51e9f790b4
ASC.People: ProfileAction: Added remove button for contact information
2019-12-25 09:57:57 +03:00
38cffb5471
ASC.People: ProfileAction: CSS styles and translations changed
2019-12-24 14:15:49 +03:00
47d4ba6f17
ASC.People: ProfileAction: InfoFieldContainer: using Heading from asc-web-components
2019-12-24 12:48:35 +03:00
Nikolay Rechkin
9e0995ac00
Merge pull request #17 from ONLYOFFICE/feature/ef
...
Feature/ef
2019-12-24 10:54:47 +03:00
10e9a07c18
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
2019-12-24 09:56:14 +03:00
ddf5a606a1
web: Update yarn.lock files
2019-12-24 09:56:03 +03:00
6a4e992c70
ASC.People: Home page: user link fontWeight changed
2019-12-24 09:52:54 +03:00
a8f8b63414
EF: removed old classes
2019-12-23 17:57:21 +03:00
2782d9f64c
Merge branch 'master' into feature/ef
...
# Conflicts:
# common/ASC.VoipService/Dao/CachedVoipDao.cs
# common/ASC.VoipService/Dao/VoipDao.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
2019-12-23 16:25:33 +03:00
224e6adc45
Merge branch 'master' into feature/consumers
2019-12-23 15:57:49 +03:00
2b5dd8b3cf
Merge branch 'master' into feature/ef
2019-12-23 15:47:10 +03:00
Ilya Oleshko
122b315a5a
Web: People: Fixed Import button visibility at Article component
2019-12-23 14:06:29 +03:00
Daniil Senkiv
fca6ed2675
People.Client: dialogs: ChangeEmailDialog: fixed error "Can't perform a React state update on an unmounted component."
2019-12-23 14:01:01 +03:00
Daniil Senkiv
157f1c7d10
web.components: EmailInput: changed util for validating email, applied changes to EmailInput component. Applied EmailInput changes for all using places. Fixed readme.
...
Added new translations for validation errors.
2019-12-23 12:02:03 +03:00
Daniil Senkiv
2b74c0c4b5
People.Client: dialogs: ChangeEmailDialog: added keyup Enter handling
2019-12-20 15:24:17 +03:00
Daniil Senkiv
68b0afe9ad
People.Client: dialogs: ChangeEmailDialog: added translations
2019-12-20 15:23:07 +03:00
Daniil Senkiv
5a472bb41b
Merge branch 'master' into feature/separated-modal-dialogs
2019-12-20 15:06:13 +03:00
Daniil Senkiv
dd182088cc
People.Client: dialogs: ChangeEmailDialog: applied FieldContainer, deleted disabling send button
2019-12-20 14:46:51 +03:00
b686e99f16
web: Common: Moved Layout and PageLayout to asc-web-common
2019-12-20 14:35:53 +03:00
89efaf9d26
Consumers: added config
2019-12-20 14:17:01 +03:00
Ilya Oleshko
0552ee6673
Web: People: Fixed row side info truncate for Text component at People row
2019-12-20 11:58:08 +03:00
Daniil Senkiv
40bbe9a0d9
Merge branch 'master' into feature/separated-modal-dialogs
...
# Conflicts:
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
2019-12-20 11:37:11 +03:00
Daniil Senkiv
c16cd68f8f
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
2019-12-20 10:50:45 +03:00
Daniil Senkiv
9933f626b3
People.Client: Home: added translations
2019-12-19 15:21:24 +03:00
Daniil Senkiv
85cd5c41ba
People.Client: dialogs: ModalDialogContainer: fixed styles
2019-12-19 14:05:08 +03:00
Daniil Senkiv
305a3b229f
People.Client: dialogs: InviteDialog: added ru translations
2019-12-19 14:03:40 +03:00
Daniil Senkiv
b3e17009d4
People.Client: dialogs: deleted cancel button
2019-12-19 13:38:32 +03:00
ead6333081
Web: People: fixed help-button position
2019-12-19 12:27:45 +03:00
Daniil Senkiv
729f681411
Merge branch 'master' into feature/separated-modal-dialogs
2019-12-19 12:05:50 +03:00
ed66ce7dc4
Merge pull request #18 from ONLYOFFICE/feature/advanced-selector-v2
...
Feature/advanced selector v2
2019-12-19 12:02:42 +03:00
Ilya Oleshko
774edf4485
Web: People: Fixed info containers width for Profile page
2019-12-19 11:48:09 +03:00
Daniil Senkiv
239dfe56c0
Merge branch 'master' into feature/separated-modal-dialogs
...
# Conflicts:
# products/ASC.People/Client/src/components/pages/Profile/Section/Header/index.js
2019-12-19 11:36:00 +03:00
Daniil Senkiv
021541c7a3
People.Client: dialogs: ChangeEmailDialog: fixed, added new lifecycle method
2019-12-19 10:36:35 +03:00
218ece84e4
Merge branch 'master' into feature/advanced-selector-v2
...
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
2019-12-19 10:15:25 +03:00
Ilya Oleshko
c52c2ead85
Web: People: Fixed truncate user with single group on Home page
2019-12-19 09:48:46 +03:00
Ilya Oleshko
a08a8a89d1
Web: People: Fixed color of side information about user on Home page
2019-12-18 16:40:16 +03:00
84c159c73d
Merge branch 'master' into feature/ef
2019-12-18 16:36:36 +03:00
Daniil Senkiv
f787b010ee
People.Client: dialogs: changeEmailDialog: fixed disabling button
2019-12-18 16:30:51 +03:00
9ac0e2c8c9
web: People: Refactoring of GroupAction + fixed onCancelSelector by self click
2019-12-18 16:24:09 +03:00
Daniil Senkiv
3aad0ff8e3
People.Client: Home: changeEmailDialog: fixed error after finishing request
2019-12-18 16:14:27 +03:00
Ilya Oleshko
c82216951d
Web: People: Fixed header actions buttons for Reassign page
2019-12-18 15:14:27 +03:00
Ilya Oleshko
e685a143ad
Web: People: Fixed header actions buttons for ProfileAction page
2019-12-18 15:14:12 +03:00
Ilya Oleshko
cc6022f7b8
Web: People: Fixed header actions buttons for Profile page
2019-12-18 15:13:56 +03:00
Ilya Oleshko
60d02cb4a6
Web: People: Fixed header actions buttons for Import page
2019-12-18 15:13:37 +03:00
Ilya Oleshko
f8a2ca1884
Web: People: Fixed header actions buttons for Home page
2019-12-18 15:13:21 +03:00
Ilya Oleshko
74f3a9dc6d
Web: People: Fixed header actions buttons for GroupAction page
2019-12-18 15:12:49 +03:00
4079f59b1e
Merge branch 'master' into feature/advanced-selector-v2
...
# Conflicts:
# web/ASC.Web.Components/src/components/advanced-selector/index.js
# Modified:
# web/ASC.Web.Components/src/components/AdvancedSelector/AdvancedSelector.js
2019-12-18 15:11:09 +03:00
5379b1b7eb
web: People: Added onCancel handler for selectors
2019-12-18 14:41:36 +03:00
Daniil Senkiv
1681a0698f
People.Client: dialogs: removed unused translation wrapper, renamed components
2019-12-17 10:58:42 +03:00
Daniil Senkiv
5aec0beba5
People.Client: dialogs: added ModalDialogContainer with common parts, applied to dialogs
2019-12-17 09:46:10 +03:00
Daniil Senkiv
16b6ba47e5
People.Client: dialog: ChangePhoneDialog: added Todo description for future replacement
2019-12-17 09:10:25 +03:00
Daniil Senkiv
760c6b3110
People.Client: dialog: ChangeEmailDialog: rename prop newEmail to email
2019-12-17 09:06:02 +03:00
Daniil Senkiv
ad6f1c3e46
People.Client: dialog: ChangeEmailDialog: moved id from state to props
2019-12-17 08:52:56 +03:00
157dc1c7d6
Merge branch 'master' into feature/ef
2019-12-16 17:58:49 +03:00
Daniil Senkiv
69896e85fe
Merge branch 'master' into feature/separated-modal-dialogs
2019-12-16 17:19:44 +03:00
Daniil Senkiv
921bf871ba
People.Client: ProfileAction: added dataDialog prop for handling any dialog through one function
2019-12-16 17:08:44 +03:00
Daniil Senkiv
40923113ea
People.Client: changed names of state variables
2019-12-16 16:16:36 +03:00
Daniil Senkiv
c5ba56b370
People.Client: refactoring, changed state structure for applied ModalDialogs
2019-12-16 16:08:00 +03:00
Ilya Oleshko
31fd91d5f4
Web: People: Fixed Link truncate for People row
2019-12-16 15:20:18 +03:00
Daniil Senkiv
c350a2429c
People.Client: Dialogs: changed import, renamed Invite component
2019-12-16 14:34:18 +03:00
Daniil Senkiv
a601f8f93d
People.Client: Dialogs: added ChangePhoneDialog component, applied to Profile component
2019-12-16 14:15:52 +03:00
Daniil Senkiv
3177aa5026
People.Client: Dialogs: added DeleteProfileEverDialog component, applied to Home and Profile component
2019-12-16 13:23:32 +03:00
Ilya Oleshko
dcf9c3ec2c
Web: People: Increased space between contacts
2019-12-16 12:24:12 +03:00
77b1f2b252
web: Update yarn.lock files
2019-12-15 18:26:17 +03:00
Daniil Senkiv
8a9788c61c
Merge branch 'master' into feature/separated-modal-dialogs
2019-12-14 13:46:24 +03:00
Daniil Senkiv
db13e239b2
People.Client: applied changeEmailDialog, changePasswordDialog to Profile component
2019-12-14 13:12:43 +03:00
Daniil Senkiv
49da1505b3
People.Client: Dialogs: added DeleteSelfProfileDialog component, applied to Home and Profile component
2019-12-14 12:45:31 +03:00
3b88c07178
Merge branch 'master' into feature/advanced-selector-v2
...
# Conflicts:
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/src/components/index.js
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/src/components/advanced-selector/index.js
# web/ASC.Web.Components/src/components/help-button/index.js
# web/ASC.Web.Components/src/index.js
# web/ASC.Web.Components/src/components/examples/people.selectors.stories.js [removed]
#
2019-12-14 12:32:31 +03:00
Daniil Senkiv
62d87d2625
People.Client: Dialogs: added ChangePasswordDialog component, applied to Home and ProfileAction component
2019-12-13 20:34:57 +03:00
5eeff88737
web: New packages fixes
2019-12-13 16:58:09 +03:00
Daniil Senkiv
1f82fe7ea7
People.Client: ChangeEmailDialog: deleted unused button
2019-12-13 13:29:49 +03:00
NikolayRechkin
3fb01e78ac
web: forbade a scalability
2019-12-13 13:25:09 +03:00
Daniil Senkiv
61c9ad6e3e
People.Client: ChangeEmailDialog: added new propTypes
2019-12-13 12:24:52 +03:00
Daniil Senkiv
ad77105f83
PeopleClient: ChangeEmailDialog: added new parameter for disabling buttons
2019-12-13 12:19:45 +03:00
Daniil Senkiv
a0f40567d9
People.Client:Dialogs: added ChangeEmailDialog component, applied to Home and ProfileAction component
2019-12-13 12:01:16 +03:00
Daniil Senkiv
c9bf214df8
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
2019-12-13 10:31:48 +03:00
NikolayRechkin
07e3cefb5c
web: use Service Worker in production
2019-12-13 10:19:03 +03:00
2758fb1dfb
Merge branch 'master' into feature/ef
2019-12-12 17:53:54 +03:00
Daniil Senkiv
1d084ab4e1
People: applied EmailInput component to ProfileAction component
2019-12-12 15:59:18 +03:00
Ilya Oleshko
b0023c3f14
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
2019-12-11 15:30:35 +03:00
Ilya Oleshko
f7aca727ac
Web: People: Fixed usage ComboButton on GroupAction page
2019-12-11 15:25:44 +03:00
9ddbbdc52e
Merge pull request #15 from ONLYOFFICE/feature/pwa
...
Feature/pwa
2019-12-11 15:23:38 +03:00
Daniil Senkiv
babb7875d5
Merge branch 'master' into refactoring/text-heading
...
# Conflicts:
# products/ASC.People/Client/src/components/pages/Import/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Import/Section/Header/index.js
# web/ASC.Web.Components/src/components/text/index.js
2019-12-11 13:45:04 +03:00
Ilya Oleshko
ff1d6a0603
Web: People: Fixed import page
2019-12-11 11:18:48 +03:00
Daniil Senkiv
d62de9827e
1. Web.Components: Text: change proptype fontSize from [number, string] to string. Applied to other components.
...
2. Web.Components: Link: fixed isTextOverflow prop working
3. Web.Components: RadioButtonGroup, RadioButton: fixed readme
2019-12-10 17:12:38 +03:00
Daniil Senkiv
440c4cb528
Merge branch 'master' into refactoring/text-heading
...
# Conflicts:
# web/ASC.Web.Components/src/components/modal-dialog/index.js
2019-12-10 12:20:26 +03:00
NikolayRechkin
4bb2b08d2e
Merge branch 'master' into feature/pwa
2019-12-10 10:37:41 +03:00
26d3e3d29d
Merge pull request #13 from ONLYOFFICE/Refactoring/remove-react-bootstrap
...
Refactoring/remove react bootstrap
2019-12-10 10:26:08 +03:00
Daniil Senkiv
6b6c4569cf
Merge branch 'master' into refactoring/text-heading
2019-12-10 09:36:05 +03:00
Daniil Senkiv
b0b1b45127
Web.components: RadioButtonGroup: added new props: width, orientation, changed proptype spacing from number to string, applied changes to other components
2019-12-10 09:28:45 +03:00
NikolayRechkin
f6f12dea46
web: people: small fix
2019-12-10 09:16:21 +03:00
33c35b1177
Merge branch 'master' into feature/ef
2019-12-09 21:46:43 +03:00
8c0fc47251
web: Client: Changed AdvancedSelector to PeopleSelector
2019-12-09 17:20:42 +03:00
NikolayRechkin
ca5e501e2b
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
2019-12-09 16:08:48 +03:00
NikolayRechkin
29433b0232
web: people: changed the use of the avatar editor
2019-12-09 16:07:04 +03:00
NikolayRechkin
94581bdd39
People: deleted unused code
2019-12-09 15:59:34 +03:00
f0ce75cf7d
Web: People: remove bootstrap peer dependency jquery
2019-12-09 15:36:30 +03:00
a77aef1970
Merge branch 'master' into Refactoring/remove-react-bootstrap
...
# Conflicts:
# products/ASC.People/Client/package.json
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
2019-12-09 15:29:04 +03:00
Daniil Senkiv
d3f06c8d3e
Merge branch 'master' into refactoring/text-heading
2019-12-09 15:24:23 +03:00
Daniil Senkiv
f275c5b258
web.common: renamed Heading component to Headline
2019-12-09 15:12:25 +03:00
452a3ebc4a
Merge branch 'master' into feature/advanced-selector-v2
...
# Conflicts:
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
2019-12-09 15:10:01 +03:00
714e8af2b5
web: People: Update packages
2019-12-09 14:26:42 +03:00
750bd11adf
web: Update packages React, Redux
2019-12-09 13:46:20 +03:00
7ded8ae4cd
web: Components: Update packages (storybook, babel, jest, css-loader, postcss)
2019-12-09 12:33:39 +03:00
3f9ec420be
web: Update yarn.lock files
2019-12-09 11:47:14 +03:00
c477b3b61b
web: Update yarn.lock files
2019-12-09 09:19:26 +03:00
cfccfd4093
Merge branch 'master' into feature/advanced-selector-v2
...
# Conflicts:
# web/ASC.Web.Common/package.json
2019-12-09 09:16:18 +03:00
45f94155ab
web: Common: Added and applied new displayType "auto" for AdvancedSelector v2
2019-12-08 21:47:45 +03:00
4fd452e603
web: People: Replaced AdvancedSelector to GroupSelector
2019-12-06 16:47:22 +03:00
Daniil Senkiv
24d06b6fbe
Web.common: added Heading component, applied to web.client and people modules
2019-12-06 16:13:48 +03:00
4b51e4ad4f
Merge branch 'master' into Refactoring/remove-react-bootstrap
...
# Conflicts:
# products/ASC.People/Client/src/custom.scss
# web/ASC.Web.Client/src/custom.scss
# web/ASC.Web.Common/.storybook/styles.scss
# web/ASC.Web.Components/.storybook/styles.scss
2019-12-06 15:58:10 +03:00
8c289784a8
Web: People: removed ReactToastify styles
2019-12-06 15:49:45 +03:00
08db3b32b3
Merge branch 'master' into feature/ef
...
# Conflicts:
# common/ASC.Common/ASC.Common.csproj
# common/ASC.Core.Common/ASC.Core.Common.csproj
# common/ASC.Resource.Manager/ASC.Resource.Manager.csproj
# web/ASC.Web.Api/ASC.Web.Api.csproj
2019-12-06 12:25:18 +03:00
fc5ea3d5fa
Merge branch 'master' into Refactoring/remove-react-bootstrap
2019-12-06 12:15:53 +03:00
c9939b0da1
.net core up to 3.1
2019-12-06 12:12:51 +03:00
2652c02add
Web: People: removed bootstrap from people module
2019-12-06 12:03:29 +03:00
86a0a6b48c
Merge branch 'master' into Refactoring/remove-react-bootstrap
2019-12-06 10:51:04 +03:00
6fbaee10f5
Web: People: added People base styles
2019-12-06 10:43:11 +03:00
Daniil Senkiv
3f7a026c36
People: deleted unused code
2019-12-05 20:01:34 +03:00
Daniil Senkiv
781833d38d
moved actions from web.common to web.client and people modules
2019-12-05 20:00:53 +03:00
8bd3c86d2b
Merge branch 'master' into feature/advanced-selector-v2
...
# Conflicts:
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/src/components/advanced-selector/index.js
# web/ASC.Web.Components/src/components/help-button/index.js
# web/ASC.Web.Components/src/components/icon-button/index.js
# Changed (by Text component changes):
# web/ASC.Web.Components/src/components/advanced-selector2/sub-components/selector.js
# web/ASC.Web.Components/src/components/advanced-selector2/advanced-selector2.stories.js
# web/ASC.Web.Components/src/components/advanced-selector/sub-components/groups/header.js
# web/ASC.Web.Components/src/components/advanced-selector/sub-components/options/body.js
# web/ASC.Web.Components/src/components/advanced-selector/sub-components/selector.js
# web/ASC.Web.Common/src/components/people-selector/index.js
2019-12-05 14:17:45 +03:00
d564e6d9be
web: People: Changed AdvancedSelector to PeopleSelector
2019-12-04 17:53:01 +03:00
a047332f9c
Merge branch 'master' into feature/ef
2019-12-04 13:42:31 +03:00
ea60dbe63f
DI: AccountLinker
2019-12-04 13:39:18 +03:00
Daniil Senkiv
fac36adde8
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
2019-12-04 12:38:54 +03:00
Daniil Senkiv
3ec6c287c0
web.components: Text: refactoring, separating component to 3 components, apply changes
2019-12-04 12:36:13 +03:00
17f99fb6f1
Web: People: removed reactstrap from people module
2019-12-04 10:11:13 +03:00
73d9ad590e
Web: People: removed README.md
2019-12-04 10:09:36 +03:00
3dc8c87a94
EF: DbTenantService
2019-12-03 18:20:21 +03:00
NikolayRechkin
c0c69badf3
first version of a progressive web application
2019-12-03 17:04:40 +03:00
7b66b23686
Merge branch 'master' into feature/advanced-selector-v2
...
# Conflicts:
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/yarn.lock
2019-12-03 16:41:03 +03:00
4128d43d89
web: Update yarn.lock files
2019-12-03 16:24:13 +03:00
6b357c1bc8
Merge branch 'master' into feature/advanced-selector-v2
2019-12-03 15:35:39 +03:00
Daniil Senkiv
ece2a12763
People.Client: Article: MainButton: fixed after ( 1ccb08b70d
), fixed copying after displaying dialog
2019-12-02 16:55:16 +03:00
997cfa5fda
EF: Updated Dependencies. Optimized logging and userPhotoManager
2019-11-29 12:22:20 +03:00
d44f0ea5f0
Merge branch 'master' into feature/advanced-selector-v2
...
# Conflicts:
# web/ASC.Web.Components/src/components/help-button/index.js
2019-11-29 12:22:14 +03:00
ae4a3af443
ASC.Web.Common: made a general layout for all clients
2019-11-28 16:36:55 +03:00
f46c12cc32
Update yarn.lock files
2019-11-27 14:26:20 +03:00
506704c54a
Merge branch 'master' into feature/advanced-selector-v2
...
# Conflicts:
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Components/src/components/help-button/index.js
2019-11-27 14:14:07 +03:00
a6a28a4a72
Merge pull request #10 from ONLYOFFICE/feature/asc-web-common
...
Feature/asc web common
2019-11-27 10:04:51 +03:00
4e69ebebd2
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
...
# Conflicts:
# web/ASC.Web.Components/src/components/field-container/README.md
# web/ASC.Web.Components/src/components/field-container/index.js
2019-11-26 14:20:14 +03:00
74a624a8b9
update yarn.lock files
2019-11-26 14:04:37 +03:00
19fcc09e25
People.Client: ProfileAction: fix warnings:
...
- Warning: validateDOMNesting(...): <p> cannot appear as a descendant of <p>.
- Warning: validateDOMNesting(...): <table> cannot appear as a descendant of <p>.
2019-11-26 11:56:51 +03:00
14f92deedb
Merge branch 'master' into feature/asc-web-common
2019-11-26 11:42:57 +03:00
a2c8fae6a4
web: People: Fixed broken logo on login from People page
2019-11-26 09:52:34 +03:00
3fdf474e25
web: People: Fixed login from People page
2019-11-26 09:48:27 +03:00
0639865df0
Web: People: fixed toolitp font on create user page
2019-11-25 16:34:33 +03:00
d13e729282
Merge branch 'master' into feature/asc-web-common
...
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/Layout/index.js
2019-11-25 15:18:34 +03:00
538511a4dc
EF: options
2019-11-25 14:49:21 +03:00
de2603bea9
Web: People: fixed tooltip text on edit profile page
2019-11-25 14:16:19 +03:00
af3a819b1a
Web: People: fixed tooltips font on profile edit page
2019-11-25 13:31:37 +03:00
3586867429
EF: DbUserService
2019-11-25 12:49:12 +03:00
e1b8682025
global replace HelpButtonHeaderContent with helpButtonHeaderContent
2019-11-25 12:00:40 +03:00
10fd09750d
Merge branch 'master' into feature/asc-web-common
2019-11-22 16:49:04 +03:00
1043cbc68b
web: Common: Removed old not used code
2019-11-22 15:40:51 +03:00
7976dfdb77
web: Components: Added export PublicRoute, PublicRoute
2019-11-22 14:52:04 +03:00
59d4674885
web: Common: Added PrivateRoute
2019-11-22 14:41:57 +03:00
9052dae3ca
People.Client: GroupAction: responsive design
2019-11-22 12:14:50 +03:00
02d853dbff
web: components: link: fix warnings
...
Warning: Failed prop type: Invalid prop `children` of type `array` supplied to `<<anonymous>>`, expected `string`.
in Unknown (at customization.js:158)
in Trans (at customization.js:155)
Warning: Failed prop type: Invalid prop `children` of type `array` supplied to `<<anonymous>>`, expected `string`.
in Unknown (at ProfileInfo.js:214)
in Trans (at ProfileInfo.js:211)
2019-11-21 18:24:58 +03:00
035d729c9c
web: People: Replaced PrivateRoute to ASC.Web.Common realization
2019-11-21 17:34:17 +03:00
63b839ef3a
People.Client: ProfileAction: validate trimmed field values
2019-11-21 13:53:01 +03:00
2a0812c8c5
People.Client: ProfileAction: added scroll to fields with errors
2019-11-21 13:40:34 +03:00
7cb2262837
Merge branch 'master' into feature/asc-web-common
...
# Conflicts:
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/store/people/actions.js
2019-11-20 14:29:52 +03:00
4d2db41258
Merge branch 'master' into feature/layout-scrolling
2019-11-20 11:41:10 +03:00
3080756461
web: People: Hide paging if total count less then pageCount
2019-11-20 11:37:17 +03:00
96a3a60c1c
web: People: Fixed mass re-render on group-buttons actions
2019-11-20 11:27:33 +03:00
df767e3849
web: People: Fixed setSelected value
2019-11-20 10:44:24 +03:00
83f7201bfa
Web: People: added help-button header content to people pages
2019-11-20 09:45:39 +03:00
85bcc75f16
web: People: Moved some common utils to ASC.Web.Common
2019-11-19 15:35:56 +03:00
325a42f66b
web: components: row: added custom shouldComponentUpdate function
2019-11-19 14:33:33 +03:00
ef0d51ab47
web: People: Moved some common constants to ASC.Web.Common
2019-11-19 14:10:56 +03:00
74530bfa76
Merge branch 'master' into feature/asc-web-common
...
# Conflicts:
# products/ASC.People/Client/src/App.js
# web/ASC.Web.Client/src/store/settings/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
2019-11-19 13:34:36 +03:00
2a9e3d1870
web: People: Replaced services folder to ASC.Web.Common realization
2019-11-19 12:40:33 +03:00
18b0cdab2d
web: People: Moved api methods: resendUserInvites and getShortenedLink into ASC.Web.Common
2019-11-18 13:52:37 +03:00
Ilya Oleshko
502060e4b2
web: People: Fixed rendering of data preview before import.
2019-11-18 11:57:54 +03:00
d05565107c
EF: init commit
2019-11-15 18:04:05 +03:00
23e3d28857
web: Replaced history to asc-web-common variant
2019-11-15 16:44:54 +03:00
Ilya Oleshko
98ed6e94d3
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
2019-11-15 16:33:41 +03:00
a75d6e7ecc
web: Removed auth folder from store (after change to asc-web-common variant)
2019-11-15 16:29:49 +03:00
cac19cc75e
Merge remote-tracking branch 'remotes/origin/master' into feature/layout-scrolling
2019-11-15 15:36:21 +03:00
49d5000cd2
Merge branch 'master' into feature/asc-web-common
2019-11-15 15:29:57 +03:00
2d47d639dd
web: People: Replaced auth store to ASC.Web.Common realization
2019-11-15 12:38:31 +03:00
fcc4e4605f
Common nlog config
2019-11-15 11:47:56 +03:00
Ilya Oleshko
66d13c6750
web: People: Added Import page
2019-11-15 11:18:00 +03:00
cb057a35ea
Merge branch 'master' into feature/asc-web-common
2019-11-14 16:39:54 +03:00
1b3e977d0e
People.Client: GroupAction page has common layout scroll
2019-11-14 15:37:22 +03:00
f8ef4275c7
People.Client: Home page: RowContainer without ReactWindow
2019-11-14 15:28:42 +03:00
02dde786af
People.Client: Home page has common layout scroll
2019-11-14 15:15:33 +03:00
04464d52ad
Add "AddEnvironmentVariables" setting
2019-11-14 12:21:15 +03:00
175c86fb49
People: auth fixed
2019-11-13 18:11:30 +03:00
17ef3569ee
Merge branch 'master' into feature/asc-web-common
2019-11-13 16:14:32 +03:00
c12141897f
web: Added check of isAxiosError ("Network error" for example)
2019-11-13 16:12:46 +03:00
242c544557
web: Changed redirect methods to error pages
2019-11-13 15:35:56 +03:00
e69d2900ef
Merge branch 'master' into feature/asc-web-common
...
# Conflicts:
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
2019-11-13 10:55:42 +03:00
14a87d86ff
web: Applied server changes in login/logout for all clients
2019-11-13 09:52:03 +03:00
074b8b7f61
People: optimized get all people method
2019-11-12 15:24:59 +03:00
19acdd4a6e
web: Common: Init commit of new js library for common code of any App in AppServer
2019-11-12 14:55:22 +03:00
118bc9e2dd
Merge pull request #7 from ONLYOFFICE/refactoring/di
...
Refactoring/di
2019-11-12 11:10:31 +03:00
Ilya Oleshko
36471bca55
web: People: Fixed [object Object] error with user title at PeopleRow
2019-11-12 10:19:41 +03:00
26c8d56219
DI: refactoring. Added EmployeeWraperHelper
2019-11-11 18:42:07 +03:00
e9b6976187
Renamed all "*factory" classes to "*Extension"
2019-11-11 14:50:46 +03:00
df36ffbf68
Merge branch 'master' into feature/advanced-selector-v2
2019-11-11 09:45:41 +03:00
50f06898d7
Merge branch 'master' into refactoring/di
...
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
2019-11-10 18:22:02 +03:00
32781a87e2
DI: refactoring. Extract settings helpers
2019-11-08 15:21:51 +03:00
Ilya Oleshko
cf402ced13
web: People: Removed unused function from PeopleRow
2019-11-08 15:03:30 +03:00
Ilya Oleshko
d14d647efb
web: People: Addition for commit ( 029b8f94d1
)
2019-11-08 14:51:48 +03:00
Ilya Oleshko
029b8f94d1
web: People: Hide Settings for People module administrator
2019-11-08 14:48:54 +03:00
Ilya Oleshko
90059f4c8b
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
2019-11-08 08:48:12 +03:00
Ilya Oleshko
4fe4ce164d
web: People: Fixed isAdmin selector, now checking module admin
2019-11-07 17:07:55 +03:00
Daniil Senkiv
1ccb08b70d
People.Client: Article: MainButton: added conditional rendering for InviteDialog component
2019-11-07 16:29:57 +03:00
Ilya Oleshko
b7428a2fa6
web: People: Fixed delete profile and self delete profile actions at profile view page
2019-11-07 15:08:01 +03:00
0ca200bdea
Merge branch 'master' into feature/advanced-selector-v2
2019-11-07 14:01:59 +03:00
Ilya Oleshko
b984a8cbcb
web: People: Redesigned display of list of user groups.
2019-11-07 12:12:08 +03:00
Ilya Oleshko
decd932548
web: People: Fixed fetching profile after avatar saving action at profile view page
2019-11-07 09:50:52 +03:00
Ilya Oleshko
793a008a49
web: People: Reworked email actions at profile view page
2019-11-07 09:49:50 +03:00
db4ef4a17a
DI: Log. refactoring.
2019-11-06 18:03:09 +03:00
Ilya Oleshko
8e2ff9f218
web: People: Reworked profile view page from functional approach to class
2019-11-06 14:51:31 +03:00
559c87a450
Merge branch 'master' into feature/advanced-selector-v2
...
# Conflicts:
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
2019-11-06 10:50:05 +03:00
Ilya Oleshko
b07a6eb570
web: People: Added ru translations at profile page.
2019-11-06 09:54:00 +03:00
77085f7510
web: People: Fixed api getUser refactoring bug
2019-11-05 13:31:03 +03:00
d7a4dd7fed
Merge branch 'master' into refactoring/di
2019-11-01 12:41:30 +03:00
0be2995e83
DI: filters and handlers
2019-11-01 12:37:02 +03:00
a35a457f6e
DI: refactoring. Web.Api
2019-10-31 16:54:43 +03:00
402c4d908d
DI: refactoring
2019-10-31 14:28:30 +03:00
Ilya Oleshko
23ae30ce13
web: People: Fixed display of parameters of contextual options depending on user status
2019-10-31 13:24:21 +03:00
Ilya Oleshko
3d5d7f24f1
web: People: Added edit avatar action and translates at profile view page.
2019-10-30 14:16:56 +03:00
0bbc383266
Merge branch 'master' into refactoring/di
...
# Conflicts:
# common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Core/Notify/StudioNotifyService.cs
2019-10-30 11:45:55 +03:00
Ilya Oleshko
7f6fff7836
web: People: Fixed context button options. Added actions for change email and change password.
2019-10-29 17:04:55 +03:00
Ilya Oleshko
a67a2e0951
web: People: Redesigned display of list of user groups. Added display of Title and actions on elements.
2019-10-29 13:29:44 +03:00
Ilya Oleshko
3cf0782f89
web: People: Fixed duplication of parameters at profile view component
2019-10-29 13:27:33 +03:00
Daniil Senkiv
b9faf28210
Web.Client: Settings: passed right prop currentModuleId to Layout, changed prop currentModuleId from Settings
2019-10-29 09:14:12 +03:00
c43ce99a9b
web: Components: Added loading for options parts
2019-10-28 17:45:47 +03:00
d2cca81175
web: Components: Split AdvancedSelector to several parts + added InfinitLoader
2019-10-27 21:30:04 +03:00
Daniil Senkiv
272a79286e
People.Client: added settings link in modules
2019-10-25 21:20:11 +03:00
Ilya Oleshko
2f238700b2
web: People: Profile view page divided into subcomponents
2019-10-24 14:27:05 +03:00
8ca3a63e24
DI: refactoring
2019-10-22 19:08:37 +03:00
726ca634e4
Revert "removed ConfigurationManager"
...
This reverts commit c03be150f4
.
ProgressQueue init
2019-10-22 16:48:48 +03:00
Ilya Oleshko
611da8e80a
web: People: Fixed style errors at EditButton and TooltipIcon
2019-10-22 14:54:44 +03:00
78584b78a3
DI: removed LogManager
2019-10-22 14:21:44 +03:00
Ilya Oleshko
ad5f58a81f
web: People: Added update of user information when changing status
2019-10-22 13:52:48 +03:00
337238c87c
Removed CommonServiceProvider
2019-10-21 18:05:36 +03:00
53d2aaa4e3
DI: DbManager
2019-10-21 16:50:20 +03:00
29c235b5a1
Web: People: fixed email tooltip translation
2019-10-21 16:22:37 +03:00
e0b5661188
DI: dbManager
2019-10-21 15:52:16 +03:00
e82366a2cd
DI: dbManager
2019-10-21 15:33:02 +03:00
6e332d6804
Web: People: added email tooltip to createUserForm, updated translations
2019-10-21 15:01:17 +03:00
f11ed0ceef
Web: People: fixed tooltipLanguage position on profile
2019-10-21 12:07:30 +03:00
10855fe3be
Web: People: fixed "NotFoundLanguage" translation link
2019-10-21 09:00:43 +03:00
247a3b787f
DI: DbManager
2019-10-18 17:22:40 +03:00
09881619b8
DI: DbManager
2019-10-18 16:29:24 +03:00
5b117629f3
Web: People: added help-button to language on profile page
2019-10-18 15:15:12 +03:00
219036d4a4
DI: HttpContext
2019-10-18 11:48:27 +03:00
2135c01d88
Web: People: deleted unused tooltip code
2019-10-18 09:53:06 +03:00
6b2f6b0a7b
DI: log
2019-10-17 18:55:35 +03:00
0b52757164
Web: People: remove tooltip from profile
2019-10-17 16:15:04 +03:00
0f4c3bec04
Web: People: replace tooltip
2019-10-17 13:54:06 +03:00
dea3e9eff3
Web: People: fixed tooltip, fixed translations to tooltip
2019-10-14 15:43:59 +03:00
5ec41ccaff
DI: removed appSettings
2019-10-14 11:23:45 +03:00
9759b54104
web: People: Fixed translation "NotFoundLanguage" key (issue: custom links in translation)
2019-10-14 10:31:50 +03:00
7c05ba927b
DI: KafkaCache
2019-10-11 18:03:03 +03:00
a9c1b5411b
Web: People: added tooltip icon with translations to profile
2019-10-11 11:57:22 +03:00
28b44eb6a0
Web: Client: fixed tooltip position
2019-10-11 10:16:45 +03:00
eb39c52754
Web: People: fix tooltip errors
2019-10-11 09:16:45 +03:00
37a0f05a3a
Web: People: added tooltip to fields "email" and "type" with translations to updateUserForm
2019-10-10 15:12:37 +03:00
2ebe431c98
DI: configuration
2019-10-10 11:52:21 +03:00
74d8709f62
DI: configuration
2019-10-09 19:08:37 +03:00
515f7de555
DI: Configuration
2019-10-09 18:04:46 +03:00
38bfd6e5d6
Web: People: fixed calendar style, added new translations
2019-10-09 16:15:19 +03:00
687199cebf
Web: People: fixed date-picker on "updateUserForm" page, added calendar header
2019-10-09 14:22:07 +03:00
cd63121dc7
web: People: Added api client with common settings for all requests
2019-10-08 10:59:45 +03:00
67c9a08604
web: Added api client with common settings for all requests
2019-10-07 14:34:10 +03:00
ea71ac3f3c
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
2019-10-04 09:22:56 +03:00
521abaada9
web: People: Refactoring:
...
+ Moved checkResponseError to utils.js;
+ Fixed actions after saving group;
+ Re-written fetchPeople action
2019-10-04 09:22:46 +03:00
Daniil Senkiv
2ed3ee4905
Web.Client/Core: added method of deleting self profile
2019-10-04 07:58:38 +03:00
86215bd06c
web: People: Fixed actions after saving group
2019-10-03 14:55:04 +03:00
5a362b47e7
web: People: Fixed view/edit self profile on Guest
2019-10-02 14:57:58 +03:00
af48c52ad0
web: People: Restored PlusIcon
2019-10-02 14:25:36 +03:00
7ec76d083c
web: People: Added local Error page translate resource path
2019-10-02 12:25:59 +03:00
Daniil Senkiv
188443f49f
Web.Client: confirmRoute: refactoring
2019-10-02 11:31:50 +03:00
534cd98d24
web: People: Hide PlusIcon
2019-10-01 14:28:20 +03:00
51566c29ea
web: Change storing token from cookie to localstorage
2019-10-01 12:37:06 +03:00
bfd930b84b
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
2019-10-01 11:47:56 +03:00
NikolayRechkin
99a9e6d156
web: people: fixed the style of the menu
2019-10-01 11:46:22 +03:00
99ba2483c8
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
2019-10-01 11:37:59 +03:00
f089f50372
web: People: Added translations for People Error
2019-10-01 11:37:51 +03:00
NikolayRechkin
acd456b8a0
web: people: fix headers
2019-10-01 10:07:39 +03:00
b3deacd821
web: People: Applied changes in AdvancedSelector
2019-09-30 15:54:41 +03:00
NikolayRechkin
82e0066fc7
web: people: fix
2019-09-30 15:40:28 +03:00
NikolayRechkin
4493418a12
web: people: small fix header
2019-09-30 15:37:06 +03:00
b8b0692f85
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
2019-09-30 12:21:09 +03:00
3288fb3b84
web: Added translation of Layout for People/Web clients
2019-09-30 12:20:56 +03:00
NikolayRechkin
cc72feb99a
web: people: added translations
2019-09-30 11:30:39 +03:00
NikolayRechkin
4fe6fac93f
web: components: small fix avatar editor
2019-09-30 11:29:33 +03:00
NikolayRechkin
a6fc4580c5
web: people: changed translations to ProfileAction
2019-09-30 10:45:45 +03:00
26427e5de6
web: People: Styled SectionHeaderContent
2019-09-29 17:35:34 +03:00
576ec16dab
web: People: Fixed translation
2019-09-29 17:34:43 +03:00
402d56691b
web: People: Applied translations to Home
2019-09-29 16:36:35 +03:00
6fb0c4a9f5
web: People: Applied translations to Article
2019-09-29 16:09:54 +03:00
1e7d1610fc
web: People: Changed language state mapping
2019-09-29 15:29:19 +03:00
e0578eb7d4
web: People: Applied translations to GroupAction
2019-09-29 15:15:55 +03:00
6f760e47f0
web: People: Applied translations to ProfileAction
2019-09-29 15:04:52 +03:00
a2279296ee
web: People: Removed useless code
2019-09-29 14:49:50 +03:00
77cec30c75
web: People: Fixed displaying edit button label
2019-09-29 14:48:19 +03:00
63c730e7fd
web: People: Fixed showing socialContacts
2019-09-29 14:45:09 +03:00
cdf09b4272
web: People: Fixed translation.json
2019-09-29 14:40:03 +03:00
983270b8a6
web: People: Changed fakeLanguages to translations
2019-09-29 14:24:13 +03:00
d3b208b6a5
Web: People: Implemented opportunity to change culture in Profile
2019-09-29 13:50:18 +03:00
0f97fb0653
web: People: Added loading cultures and changing profile language
2019-09-29 12:09:57 +03:00
5e2823974e
DI: configuration
2019-09-27 18:12:13 +03:00
Ilya Oleshko
d29383b0a4
web: People: Fixed error if empty departments in view profile.
2019-09-27 17:26:04 +03:00
4f5b3af681
web: People: Changed setup filter EmployeeStatus
2019-09-27 17:06:14 +03:00
2d0ca402c8
web: People: Changed group link click (issue: styled Link router errors)
2019-09-27 17:01:44 +03:00
9583b5e1f7
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
2019-09-27 15:45:22 +03:00
Ilya Oleshko
575c85437a
web: People: Added transition to user groups in the view profile.
2019-09-27 15:44:48 +03:00
35d19ddcf5
web: People: Fixed history go back
2019-09-27 15:38:27 +03:00
387ce4e9ad
DI: configuration
2019-09-27 14:51:09 +03:00
1b293c6112
web: People: Fixed set filter by url
2019-09-27 14:42:17 +03:00
NikolayRechkin
00d17e2c38
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
2019-09-27 14:05:51 +03:00
NikolayRechkin
507a78c0e3
web: people: create an avatar for a new user
2019-09-27 14:05:35 +03:00
d8fb67f683
Merge branch 'master' into refactoring/di
...
# Conflicts:
# common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
# common/ASC.Core.Common/Context/SecurityContext.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# web/ASC.Web.Api/Controllers/AuthenticationController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Core/Notify/StudioNotifyService.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
# web/ASC.Web.Core/Utility/CommonLinkUtility.cs
2019-09-27 13:45:37 +03:00
Ilya Oleshko
ac8c69821e
web: People: Fixed empty culture at profile viewer.
2019-09-27 12:36:31 +03:00
Ilya Oleshko
9512c0b9c8
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
2019-09-27 12:20:32 +03:00
48b2726d78
Confirm: added uid to activation link
2019-09-27 12:20:10 +03:00
Ilya Oleshko
bae91ab561
web: People: Fixed email link errors and locale selector width at profile viewer.
2019-09-27 12:20:05 +03:00
NikolayRechkin
1d8e175089
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
2019-09-27 11:52:26 +03:00
NikolayRechkin
9a2a659430
web: people: fixed create user
2019-09-27 11:52:17 +03:00
30f9612eec
web: People: Fixed paging by filter url
2019-09-27 10:06:47 +03:00
74c5873c5d
web: People: Changed DEFAULT_EMPLOYEE_STATUS to Active
2019-09-27 10:06:12 +03:00
Ilya Oleshko
4ff81ac474
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
2019-09-27 08:57:49 +03:00
925a584b63
web: People: Added loading filter by url on first loading
2019-09-26 17:01:21 +03:00
Ilya Oleshko
c29a18dba6
web: People: Fixed fields at profile viewer.
2019-09-26 16:36:47 +03:00
9ba5348863
web: People: Moved setup of filter url to people/actions.js
2019-09-26 16:36:33 +03:00
Ilya Oleshko
fb88adaa5c
web: People: Fixed ComboBox property at profile actions.
2019-09-26 16:35:02 +03:00
586ee3b2f7
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
...
Conflicts:
products/ASC.People/Client/src/components/pages/Home/Section/Filter/index.js
2019-09-26 15:45:30 +03:00
c8b909b156
web: People: Filter Section re-written to class with setup of url by filter
2019-09-26 15:43:21 +03:00
Daniil Senkiv
fd08ae9039
Web.Client: Confirm: added changeEmail sub-component
2019-09-26 12:45:10 +03:00
710a3f62fa
Merge branch 'master' into refactoring/di
...
# Conflicts:
# common/ASC.Common/ASC.Common.csproj
# common/ASC.Core.Common/ASC.Core.Common.csproj
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-25 18:56:28 +03:00
NikolayRechkin
206e4bedc1
web: people: added a default selection text for a filter
2019-09-25 13:51:40 +03:00
NikolayRechkin
65c0f21416
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
2019-09-25 12:35:16 +03:00
NikolayRechkin
097b44b47f
web: people: added translations
2019-09-25 12:34:28 +03:00
5f0f148394
web: People: Change getSelectorUserList url to optimazed
2019-09-25 11:52:39 +03:00
d4cc3f0c78
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
2019-09-25 10:48:07 +03:00
Daniil Senkiv
a6e7f5ab8d
People.Client: separated getting invite links
2019-09-25 10:43:14 +03:00
1e274cc63f
web: People: Added opportunity to delete group
2019-09-25 09:46:45 +03:00
17616763af
web: People: Added isDisabled for inputs with inLoading
2019-09-25 09:46:12 +03:00
396b08527f
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
2019-09-25 09:13:11 +03:00
NikolayRechkin
7bcf2a6bf8
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
2019-09-25 09:04:30 +03:00
NikolayRechkin
14f654d10c
web: people: new avatar editor
2019-09-24 17:17:10 +03:00
NikolayRechkin
1a98489513
People: changed photo upload function
2019-09-24 17:07:24 +03:00
6d815608a0
ConfirmAuth: PasswordChange
2019-09-24 15:27:13 +03:00
11fc9d2a01
web: People: Added fetchPeopleByFilter after save group
2019-09-24 15:27:06 +03:00
f6af4ed7e0
web: People: Refactoring: moved all inline functions; Renamed state props and methods;
...
Added onSelectedItemClose
2019-09-24 14:24:00 +03:00
dec4bb266e
DI: configuration
2019-09-24 13:32:12 +03:00
85abad1f94
web: People: Added condition for fetchSelectorUsers call
2019-09-24 11:01:02 +03:00
8ffe04e518
web: People: Fixed groupManager id set
2019-09-24 10:59:46 +03:00
4543a739e6
web: People: Added display selected groupManager
2019-09-24 10:02:08 +03:00
8ab67fffa7
web: People: Added resetGroup call after save group
2019-09-24 09:37:46 +03:00
00849598f0
Merge branch 'master' into refactoring/di
...
# Conflicts:
# common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
# common/ASC.Core.Common/Context/SecurityContext.cs
# products/ASC.People/Server/Controllers/GroupController.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-23 19:27:36 +03:00
23c00b458b
Auth: added additional roles
2019-09-23 18:36:22 +03:00
ac924cd5b7
web: People: Fixed updateGroup
2019-09-23 17:44:50 +03:00
855fce1380
web: People: Added fetchSelectorUsers()
2019-09-23 17:44:27 +03:00
4ede6be2fc
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
2019-09-23 17:31:11 +03:00
188fe16feb
web: People: Added fetchSelectorUsers()
2019-09-23 17:30:58 +03:00
fb933d113a
People: fixed update group method
2019-09-23 15:46:42 +03:00
6de13b9d50
DI: configuration
2019-09-23 15:20:08 +03:00
48678ba02d
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
2019-09-23 12:48:02 +03:00
a3b1846e41
web: People: Fixed Failed prop type: Invalid prop size
of value base
supplied to SearchIcon
, expected one of ["small","medium","big","scale"].
2019-09-23 12:47:51 +03:00
Daniil Senkiv
5d5f923add
People.Client: Reassign: fixed warnings
2019-09-23 12:11:45 +03:00
a4b9be2438
web: People: Fixed Failed prop type: Invalid prop size
of value base
supplied to SearchIcon
, expected one of ["small","medium","big","scale"].
2019-09-23 12:01:45 +03:00
e119b7a333
web: People: Fixed showing of groupMember
2019-09-23 12:01:24 +03:00
cf2fe0107d
Web: People: added "about" page routing
2019-09-23 10:42:15 +03:00
84d4cda3c5
web: People: Fixed reset of targerGroup by ArrowPathIcon click
2019-09-23 10:22:28 +03:00
3e0f946372
DI: PathUtils
2019-09-21 19:39:17 +03:00
1e946b19b6
DI: refactoring
2019-09-20 18:53:27 +03:00
8184492a4f
DI: ConfigurationManager
2019-09-20 18:08:45 +03:00
7bb42748b7
DI TenantManager
2019-09-20 15:20:03 +03:00
df9b6efa92
Merge branch 'master' into refactoring/di
...
# Conflicts:
# products/ASC.People/Server/Controllers/GroupController.cs
2019-09-20 14:27:03 +03:00
a6c8ad75f0
People: check date
2019-09-20 14:07:57 +03:00
85cfe85252
People: added group model
2019-09-20 13:43:13 +03:00
d37120a7e8
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
2019-09-20 13:42:13 +03:00
6fef43210d
web: People: Added dirty hack for displaying SearchIcon in GroupAction
2019-09-20 13:40:59 +03:00
Daniil Senkiv
4fc450d8e8
People.Client: added Reassign empty page, added translations
2019-09-20 12:28:18 +03:00
e5753d5131
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
2019-09-20 11:22:40 +03:00
2839b5e131
web: People: Added api for create/update group
2019-09-20 11:21:40 +03:00
e13049c21f
DI: CommonLinkUtility
2019-09-19 18:55:44 +03:00
409da28d4b
DI: SubscriptionManager
2019-09-19 16:43:28 +03:00
e4a54eadf1
web: People: Styled GroupAction page
2019-09-19 16:14:35 +03:00
7a9635ec2c
web: components: Turn off custom scroll on GroupAction (issue: cur render AdvancedSelector)
2019-09-19 16:13:51 +03:00
Daniil Senkiv
1fb77a6606
People.Client: Invite dialog: used redux, localStorage, reduced re-rendering
2019-09-19 15:30:53 +03:00
Daniil Senkiv
1d6d7baa91
People.Client: added new package
2019-09-19 15:27:26 +03:00
7ceb117690
DI: CoreConfiguration
2019-09-19 14:34:54 +03:00
a3dfbb6fbf
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
2019-09-19 09:53:39 +03:00
Daniil Senkiv
a541a3b187
People.Client: Invite dialog: reduced the number of requests
2019-09-18 18:31:30 +03:00
a07cbe30f4
DI: CoreSettings
2019-09-18 18:19:30 +03:00
Daniil Senkiv
27672cbbd4
People.Client: Invite dialog: added copying after opening
2019-09-18 18:18:18 +03:00
4489d01b82
DI: PaymentManager, AuthorizationManager
2019-09-18 17:18:44 +03:00
c9311e53c8
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
2019-09-18 16:55:54 +03:00
6ab71a7b65
DI: tenantManager
2019-09-18 16:33:01 +03:00
Ilya Oleshko
d98353d43c
web: People: Fixed ComboBox usage at GroupActions component
2019-09-18 16:29:03 +03:00
c171e2c903
Merge branch 'master' into refactoring/di
...
# Conflicts:
# common/ASC.Api.Core/ASC.Api.Core.csproj
# common/ASC.Common/ASC.Common.csproj
# common/ASC.Core.Common/ASC.Core.Common.csproj
# common/ASC.Data.Storage/ASC.Data.Storage.csproj
# common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
# common/ASC.IPSecurity/ASC.IPSecurity.csproj
# common/ASC.Resource.Manager/ASC.Resource.Manager.csproj
# common/ASC.VoipService/ASC.VoipService.csproj
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Core/ASC.Web.Core.csproj
# web/ASC.Web.Studio/ASC.Web.Studio.csproj
2019-09-18 13:32:39 +03:00
7c3217f506
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
2019-09-18 13:22:25 +03:00
165cba3a0a
Web: update yarn lock files
2019-09-18 11:30:38 +03:00
bcdbcf5ccc
DI: TenantManager
2019-09-18 11:25:57 +03:00
c54fb37203
Web: removed react-datepicker.css
2019-09-18 11:20:09 +03:00
b07f0fd623
web: People: Added styled-components to GroupAction + added SearchInput
2019-09-18 11:17:56 +03:00
b45fcbbe0e
web: People: GroupAction re-written to class and connected to real data in redux
2019-09-18 10:23:11 +03:00
f34dca4ebb
DI: ApiDateTime
2019-09-17 18:38:06 +03:00
4e2c04c9f7
DI: TenantManager
2019-09-17 15:42:32 +03:00
Daniil Senkiv
093c786b86
People.Client: Invite dialog: fix
2019-09-17 10:09:14 +03:00
Ilya Oleshko
e62511f472
web: People: Fixed edit button scale property for profile viewer.
2019-09-17 09:42:00 +03:00
Ilya Oleshko
6bb228ef27
web: People: Added context options for disabled, enabled and email activation at profile viewer.
2019-09-17 09:27:45 +03:00
Daniil Senkiv
84c2f3faed
People.Client: added Invite dialog component
2019-09-17 09:16:42 +03:00
547e589420
Removed TenantProvider
2019-09-16 17:51:39 +03:00
Ilya Oleshko
2d33072d9d
web: People: Added modal dialogs for changing email, phone and email activation. Rewritten ProfileInfo component as a class.
2019-09-16 15:43:19 +03:00
de16476542
Merge branch 'master' into refactoring/di
...
# Conflicts:
# common/ASC.Api.Core/Core/ApiContext.cs
# common/ASC.Core.Common/Context/SecurityContext.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Core/Users/UserPhotoManager.cs
2019-09-16 15:35:44 +03:00
NikolayRechkin
83b1c13ef1
web: People: create an avatar for a new user
2019-09-16 15:20:24 +03:00
81394a6f1e
revert 431fb76773
2019-09-16 12:24:06 +03:00
86c5e64b20
added AuthByClaim
2019-09-16 12:21:10 +03:00
98daea7115
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
...
# Conflicts:
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
2019-09-13 17:47:23 +03:00
bdb5b05748
ASC.People: ProfileAction: sending email change instructions
2019-09-13 17:45:22 +03:00
431fb76773
PeopleController: removed CheckImgFormat
2019-09-13 16:33:01 +03:00
NikolayRechkin
d0521e0321
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
2019-09-13 14:58:37 +03:00
NikolayRechkin
8923113f11
web: People: small fix
2019-09-13 14:57:02 +03:00
NikolayRechkin
f84c88e090
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
2019-09-13 14:43:51 +03:00
NikolayRechkin
25ae6b8b05
web: People: creating a user avatar
2019-09-13 14:41:15 +03:00
473207f9a4
DI: BaseSettings
2019-09-13 14:18:27 +03:00
2f3729e1ee
ASC.People: ProfileAction: sending password change instructions
2019-09-13 13:59:11 +03:00
3a0231504b
ASC.People: ProfileAction: added GroupSelector
2019-09-13 12:47:25 +03:00
c188a32bfe
ASC.People: ProfileAction: added GroupSelector
2019-09-13 12:42:05 +03:00
13644338b7
ASC.People: ProfileAction: translation
2019-09-13 12:17:14 +03:00
d8cd5f7b9e
ASC.People: ProfileAction: added GroupSelector
2019-09-13 12:08:07 +03:00
0c9c1b41b7
ASC.People: ProfileAction: added GroupSelector
2019-09-12 18:39:54 +03:00
deb8231f26
revert f85711b736
2019-09-12 14:34:58 +03:00
308455265a
ASC.People: ProfileAction: translation
2019-09-12 11:49:59 +03:00
d24c5bd54b
grammar fix
2019-09-12 11:38:04 +03:00
776516ec0a
DI: people
2019-09-12 10:57:59 +03:00
a566c63195
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
2019-09-12 10:08:51 +03:00
936e7cbb40
ASC.People: selectors: added deep clone at toEmployeeWrapper
2019-09-12 10:04:22 +03:00
e0cb81adc4
Merge branch 'master' into refactoring/di
...
# Conflicts:
# products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-11 21:21:21 +03:00
dd1cd3aee4
Api: added confirm auth scheme
2019-09-11 18:53:40 +03:00
5492cad9f5
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
2019-09-11 16:59:08 +03:00
aa7efdaf2e
ASC.People: ProfileAction: changed fields to class components + using new DatePicker
2019-09-11 16:53:09 +03:00
1530ec842e
DI: WebImageSupplier,WebItemSettings, SettingsManager
2019-09-11 13:42:52 +03:00
2dd1b4c29f
Restored and update yarn.lock files
2019-09-11 12:23:23 +03:00
63cabe4c8a
web: components: Applied temp fix for security vulnerabilities js-yaml used by babel-plugin-inline-react-svg ( https://github.com/airbnb/babel-plugin-inline-react-svg/issues/45 )
2019-09-11 12:10:20 +03:00
c34db98d6b
suppress warning: NU1701 for release configuration
2019-09-10 18:20:17 +03:00
491ee035a2
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
2019-09-10 18:03:33 +03:00
d128720a6f
ASC.People: ProfileAction: fix departments field
2019-09-10 18:02:12 +03:00
c50b5b0fc9
csproj: remove pdb file from release build configuration
2019-09-10 16:38:20 +03:00
Ilya Oleshko
4d71432f44
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
2019-09-10 16:18:26 +03:00
7cd8e53d2c
Merge branch 'master' into refactoring/di
2019-09-10 16:15:15 +03:00
02efce033f
Api: added confirm auth scheme
2019-09-10 15:42:15 +03:00
a45e348b61
ASC.People: ProfileAction: add department button added
2019-09-10 15:21:00 +03:00
Ilya Oleshko
c66c8fd078
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
2019-09-10 15:13:25 +03:00
Ilya Oleshko
5ec4564f5e
web: People: Fixed containerWidth property and translation usage for userContent component.
2019-09-10 15:13:02 +03:00
3e5bcc9d02
ASC.People: ProfileAction: render fixed
2019-09-10 13:51:48 +03:00
118da8c35a
ASC.People: ProfileAction: responsive fields
2019-09-10 12:50:45 +03:00