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 |
|
Artem Tarasov
|
c68b6d6b7f
|
update yarn.lock
|
2020-09-30 10:53:51 +03:00 |
|
|
|
4b302d1634
|
Web: People: Replaced RequestLoader to showLoader/hideLoader function calls
|
2020-09-29 17:43:13 +03:00 |
|
Alexey Kostenko
|
c8374e3fa8
|
Web: People: Added a template for the avatar editor page
|
2020-09-29 16:46:27 +03:00 |
|
|
|
ad4b28d1f2
|
Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Common/src/components/index.js
|
2020-09-29 11:48:36 +03:00 |
|
|
|
5ad8730c46
|
Web: People: Fixed open @self profile
|
2020-09-28 16:20:16 +03:00 |
|
|
|
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 |
|
|
|
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 |
|
