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 |
|
