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 |
|
|
|
5c42b9d04e
|
Merge branch 'master' into feature/remove-FileOperationsManagerHelper
|
2020-10-13 15:50:51 +03:00 |
|
|
|
668cb3e893
|
Merge branch 'master' into feature/files
|
2020-10-13 15:27:31 +03:00 |
|
|
|
bcbefb8f26
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Settings/index.js
# 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-10-13 15:08:22 +03:00 |
|
Vladislav Makhov
|
632f83927b
|
Merge branch 'feature/files' into feature/files-favorites
|
2020-10-13 14:26: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 |
|
Artem Tarasov
|
2623c91e80
|
Web: Files: fixed render loader
|
2020-10-13 13:42:28 +03:00 |
|
|
|
3d34978bf0
|
Merge branch 'feature/files' into feature/selectors-refactoring
|
2020-10-13 13:39:10 +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 |
|
|
|
1d4b3785bb
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-10-13 13:31:24 +03:00 |
|
|
|
0712677297
|
Web: Common: fixed MediaViewer close, fixed share dropdown styles
|
2020-10-13 13:30:26 +03:00 |
|
Vladislav Makhov
|
6bcfcc4987
|
Merge branch 'feature/files' into feature/files-recent
|
2020-10-13 13:16:37 +03:00 |
|
Artem Tarasov
|
e2bb4a8405
|
Web: Files: TreeSettings: fixed render of settings before receiving a response from the server
|
2020-10-13 13:15:17 +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 |
|
Artem Tarasov
|
33d0322fb4
|
Web: Files: TreeSettings: refactoring
|
2020-10-13 12:50:39 +03:00 |
|
TatianaLopaeva
|
579d543292
|
Merge branch 'feature/files' into feature/fix-changing-language
|
2020-10-13 12:38:46 +03:00 |
|
TatianaLopaeva
|
4ef2db2ed0
|
Web: Update yarn.lock
|
2020-10-13 12:37:34 +03:00 |
|
Ilya Oleshko
|
abee1c8a8e
|
Merge branch 'feature/files' into feature/selectors-refactoring
|
2020-10-13 12:10:55 +03:00 |
|
Ilya Oleshko
|
2f88af1137
|
Web: Files : Home : Added isEdit condition for render share button
|
2020-10-13 11:58:28 +03:00 |
|
|
|
a1bcf2eb3e
|
Merge branch 'master' into feature/fix-messages
|
2020-10-13 11:28:19 +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 |
|
|
|
b4a0a302e6
|
Files: fix di
|
2020-10-13 10:28:13 +03:00 |
|
|
|
cefc64422e
|
Files: fix di
|
2020-10-13 10:23:53 +03:00 |
|
|
|
ae8fd12b35
|
Files: fix di
|
2020-10-13 10:21:02 +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 |
|
|
|
5e11f96a0c
|
fix
|
2020-10-12 22:15:27 +03:00 |
|
|
|
a8b838b4ce
|
fix
|
2020-10-12 22:12:03 +03:00 |
|
|
|
43b9c33979
|
fix formating
|
2020-10-12 19:23:15 +03:00 |
|
TatianaLopaeva
|
a01b1e6430
|
Web: Files: Added data-format
|
2020-10-12 18:25:39 +03:00 |
|
Ilya Oleshko
|
989a854d32
|
Web: Files : Home : Fixed ShareButton after merge
|
2020-10-12 17:40:26 +03:00 |
|
TatianaLopaeva
|
7fef9285ce
|
Web: Files: Added data-format
|
2020-10-12 17:20:36 +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 |
|
Ilya Oleshko
|
cdaef9e76f
|
Web: Files : Home : Fixed MediaViewer collection with selectors
|
2020-10-12 16:40:11 +03:00 |
|
TatianaLopaeva
|
6557261ac8
|
Web: Files: Changed margin by layout
|
2020-10-12 16:20:06 +03:00 |
|
TatianaLopaeva
|
4b81c0adfd
|
Web: Files: Added images by layout
|
2020-10-12 16:15:35 +03:00 |
|
Alexey Kostenko
|
54f68cb02a
|
Web: People: Fixed adding avatar then create user
|
2020-10-12 16:13:14 +03:00 |
|
Vladislav Makhov
|
cdddef441a
|
merge fix
|
2020-10-12 15:50:46 +03:00 |
|
Artem Tarasov
|
a6257d7006
|
Web: Files: Settings: fixed blinking of Settings page when jump from Folders page
|
2020-10-12 15:40:11 +03:00 |
|
|
|
577fc5ac70
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/pages/DocEditor/index.js
|
2020-10-12 15:36:26 +03:00 |
|
Artem Tarasov
|
ba8564ffe5
|
Web: Files: Settings: applied SettingsFiles loader
|
2020-10-12 15:34:46 +03:00 |
|
|
|
824961ddec
|
Web: Files: added upload files-converter, fixed upload filer for tree folders, refactoring
|
2020-10-12 15:28:36 +03:00 |
|
Vladislav Makhov
|
a179ae0e6c
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-12 14:45:53 +03:00 |
|
Vladislav Makhov
|
7aaeddedb2
|
Add pushing to recently viewed
|
2020-10-12 14:37:52 +03:00 |
|
Artem Tarasov
|
8621f9f321
|
Web: People: profileView: fixed loader
|
2020-10-12 13:06:00 +03:00 |
|
|
|
17e0de56da
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2020-10-12 11:31:24 +03:00 |
|
|
|
344acefa9b
|
Files: fix filter
|
2020-10-12 11:26:15 +03:00 |
|
Vladislav Makhov
|
9ea5a648e9
|
Fix code after merge
|
2020-10-12 11:02:22 +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 |
|
Vladislav Makhov
|
2476b306f9
|
Merge branch 'feature/files' into feature/files-recent
# Conflicts:
# web/ASC.Web.Common/src/api/files/index.js
# web/ASC.Web.Components/package.json
|
2020-10-12 10:04:24 +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 |
|
SuhorukovAnton
|
917493f397
|
fix-messages: IDE0058
|
2020-10-10 14:35:05 +03:00 |
|
|
|
15f4b38a03
|
Web: Files: Remove hack
|
2020-10-09 21:39:34 +03:00 |
|
|
|
ee6307e288
|
Web: People: Added hack for build machine only
|
2020-10-09 19:14:48 +03:00 |
|
|
|
9f6f7b4bff
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-09 18:11:11 +03:00 |
|
|
|
e25c59fb09
|
Web: Files: Changed initialization of DocsAPI
|
2020-10-09 18:11:02 +03:00 |
|
|
|
615f514bfd
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# web/ASC.Web.Common/src/store/auth/selectors.js
|
2020-10-09 17:24:50 +03:00 |
|
SuhorukovAnton
|
72fbf6b81e
|
remove-FileOperationsManagerHelper: first version
|
2020-10-09 17:13:44 +03:00 |
|
Ilya Oleshko
|
a129bda5ee
|
Web: Files : Home : Added share button at row
|
2020-10-09 17:08:29 +03:00 |
|
Vladislav Makhov
|
f4abe419db
|
Fix bug with add/remove from Share folder
|
2020-10-09 17:03:08 +03:00 |
|
|
|
a71fd1208b
|
Web: Files: fixed Home render, added new select logic
|
2020-10-09 16:43:50 +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 |
|
|
|
290f7649f1
|
Web: Files: fixed updating of the tree after operations with folders
|
2020-10-09 15:55:30 +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 |
|
|
|
4cbaad0dfc
|
Web: Files: fixed tree drag
|
2020-10-09 14:36:38 +03:00 |
|
|
|
226d4c6cc5
|
Web: Files: Add and applied Filter loader
|
2020-10-09 14:23:40 +03:00 |
|
|
|
215e33d053
|
Web: Files: Replaced hard-coded link for DocsAPI
|
2020-10-09 13:39:22 +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 |
|
|
|
68d32c7335
|
Web: Files: removed useless loopFilesOperations prop
|
2020-10-09 12:32:06 +03:00 |
|
|
|
dbfc5a6a96
|
Web: Files: fixed Home render
|
2020-10-09 11:57:40 +03:00 |
|
Ilya Oleshko
|
a1e696f6ae
|
Web: Files : Selectors : Added property to selector
|
2020-10-09 11:46:53 +03:00 |
|
Ilya Oleshko
|
76c09fb7ee
|
Web: Files : Actions : Fixed selectors
|
2020-10-09 11:46:22 +03:00 |
|
Ilya Oleshko
|
333b3f1e79
|
Web: Files : Panels : Fixed selectors
|
2020-10-09 11:46:03 +03:00 |
|
Ilya Oleshko
|
8440737f70
|
Web: Files : Home : Fixed selector for create url
|
2020-10-09 11:45:29 +03:00 |
|
Ilya Oleshko
|
8f4b6dd021
|
Web: Files : Home : Fixed selectors for tile content
|
2020-10-09 11:44:28 +03:00 |
|
Ilya Oleshko
|
404b775303
|
Web: Files : Home : Fixed selectors for tile badges
|
2020-10-09 11:44:06 +03:00 |
|
|
|
3385d0b2f5
|
Web: Files: fixed files operations
|
2020-10-08 23:58:21 +03:00 |
|
|
|
3ca0990715
|
Merge branch 'master' into feature/files
# Conflicts:
# common/ASC.Core.Common/EF/Model/FilesConverts.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2020-10-08 19:01:09 +03:00 |
|
|
|
b95816a388
|
Merge branch 'feature/selectors-refactoring' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/selectors-refactoring
|
2020-10-08 17:54:14 +03:00 |
|
|
|
718dc8cc5a
|
Web: Files: fixed dragging
|
2020-10-08 17:54:04 +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 |
|
Ilya Oleshko
|
fa0c649fe2
|
Web: Files : Home : Added icon for temp item on create
|
2020-10-08 17:13:49 +03:00 |
|
Ilya Oleshko
|
0e4698b8f0
|
Merge branch 'feature/selectors-refactoring' of github.com:ONLYOFFICE/AppServer into feature/selectors-refactoring
|
2020-10-08 16:58:39 +03:00 |
|
|
|
4e84d5f5ae
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# web/ASC.Web.Common/package.json
|
2020-10-08 16:58:09 +03:00 |
|
Ilya Oleshko
|
033a67863e
|
Web: Files : Selectors : Fixed isMediaOrImage usage for context menu
|
2020-10-08 16:56:01 +03:00 |
|
Vladislav Makhov
|
b4d3dc0114
|
Fix code after merge
|
2020-10-08 16:23:57 +03:00 |
|
Ilya Oleshko
|
1d79a2709f
|
Web: Files : Home : Added selectors for formats and media viewer
|
2020-10-08 16:03:37 +03:00 |
|
Ilya Oleshko
|
a0a680aa7e
|
Web: Files : Home : Added selectors for formats
|
2020-10-08 16:02:52 +03:00 |
|
Ilya Oleshko
|
79b6f43df0
|
Web: Files : Selectors : Added file format selectors, fixed fileList params
|
2020-10-08 16:02:03 +03:00 |
|
Ilya Oleshko
|
16cbf4436a
|
Web: Files : Reducer : Added default formats
|
2020-10-08 16:01:08 +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 |
|
|
|
b4675941f6
|
Web: Files: fixed selectors
|
2020-10-08 13:54:34 +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 |
|
|
|
bc1438ba92
|
EF: rename
|
2020-10-08 12:07:05 +03:00 |
|
TatianaLopaeva
|
43dbd9e511
|
Web: People: Changed margin-right by layout
|
2020-10-08 12:04:35 +03:00 |
|
|
|
573dc8922b
|
Merge branch 'master' into feature/schema
# Conflicts:
# common/ASC.Common/DIHelper.cs
|
2020-10-08 11:42:57 +03:00 |
|
|
|
e8061d10bd
|
DI: refactoring
|
2020-10-08 11:36:47 +03:00 |
|
Vladislav Makhov
|
aef6e4035f
|
Fix code after merge
|
2020-10-08 11:16:08 +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 |
|
|
|
6cf7358b92
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-08 10:25:37 +03:00 |
|
Vladislav Makhov
|
a72c087e2a
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-08 10:18:06 +03:00 |
|
Vladislav Makhov
|
716a9f387e
|
Fix code after merge
|
2020-10-08 10:14:38 +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
|
5806daa594
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-07 18:23:34 +03:00 |
|
|
|
954fe70035
|
Web: Files: fixed isCanCreate and isCanBeDeleted selectors
|
2020-10-07 18:09:08 +03:00 |
|
Ilya Oleshko
|
be48e703b9
|
Web: Files : Home : Fixed context menu separator key
|
2020-10-07 17:31:59 +03:00 |
|
|
|
41eaf5d885
|
Files: api. AddToRecent
|
2020-10-07 17:31:17 +03:00 |
|
|
|
cbcf6bef85
|
Web: Files: removed auth selectors from files
|
2020-10-07 17:23:02 +03:00 |
|
Artem Tarasov
|
17daf4e847
|
Web: Files: settings: fix warning
|
2020-10-07 17:15:40 +03:00 |
|
Vladislav Makhov
|
b24bc1f05a
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
|
2020-10-07 17:11:40 +03:00 |
|
Artem Tarasov
|
c5dfb870b3
|
Web: People: deleted unusaed variables
|
2020-10-07 17:09:14 +03:00 |
|
|
|
fdd0b945b0
|
Web: Files: fixed SectionHeaderContent selectors
|
2020-10-07 17:05:50 +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 |
|
|
|
9d87b8de09
|
Merge pull request #94 from ONLYOFFICE/feature/empty-screen
Feature/empty screen
|
2020-10-07 16:52:54 +03:00 |
|
|
|
b375463d02
|
Web: Files: added getRootFolderId, fixed sharing panel
|
2020-10-07 16:42:37 +03:00 |
|
|
|
3bf8bd5103
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-07 16:41:24 +03:00 |
|
|
|
ca37d2134d
|
Web: Files: Applied API changes on server in files filtering
|
2020-10-07 16:41:05 +03:00 |
|
TatianaLopaeva
|
da23f36f09
|
Merge branch 'feature/files' into feature/empty-screen
|
2020-10-07 16:02:18 +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 |
|
TatianaLopaeva
|
449bc0e0b2
|
Web: Files: Deleted unnecessary fontSize
|
2020-10-07 15:32:03 +03:00 |
|
Alexey Kostenko
|
d5b62f7bb2
|
Merge branch 'feature/files' into feature/avatar-editor-redesign
|
2020-10-07 15:30:56 +03:00 |
|
TatianaLopaeva
|
17b8a00a62
|
Web: Files: Deleted unnecessary box
|
2020-10-07 15:21:46 +03:00 |
|
|
|
fc71716044
|
Web: Files: fixed SectionFilter import
|
2020-10-07 15:21:26 +03:00 |
|
TatianaLopaeva
|
de7e4fe062
|
Merge branch 'feature/files' into feature/empty-screen
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
|
2020-10-07 15:14:54 +03:00 |
|
Artem Tarasov
|
84bb49c0e3
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-07 15:14:26 +03:00 |
|
Ilya Oleshko
|
94d2ae1d07
|
Web: Files : Selectors : Added missing property
|
2020-10-07 14:46:59 +03:00 |
|
TatianaLopaeva
|
9ac0d6f73a
|
Web: Files: Changed margin
|
2020-10-07 14:42:09 +03:00 |
|
Vladislav Makhov
|
e7fc2fef13
|
Add Recent to the tree node.
|
2020-10-07 14:26:08 +03:00 |
|
Artem Tarasov
|
36158ded1d
|
Web: Files: fixed inability to navigate from TreeSettings to TreeFolders
|
2020-10-07 14:12:45 +03:00 |
|
|
|
c879c55009
|
Web: Files: fixed SharingPanel selectors
|
2020-10-07 14:05:14 +03:00 |
|
|
|
3fd94c1db9
|
Web: Files: fixed OperationsPanel selectors
|
2020-10-07 14:04:48 +03:00 |
|
|
|
ddc953bcf5
|
Web: Files: fixed NewFilesPanel selectors
|
2020-10-07 14:04:31 +03:00 |
|
|
|
9a87a89d0c
|
Web: Files: fixed VersionHistory selectors
|
2020-10-07 14:04:13 +03:00 |
|
|
|
f737bb1deb
|
Web: Files: fixed SectionHeaderContent selectors
|
2020-10-07 14:03:56 +03:00 |
|
|
|
254c158bef
|
Web: Files: fixed VersionRow selectors
|
2020-10-07 14:03:40 +03:00 |
|
|
|
ea11614b86
|
Web: Files: fixed Settings selectors
|
2020-10-07 14:03:22 +03:00 |
|
|
|
0d2eec0647
|
Web: Files: fixed SectionBodyContent selectors
|
2020-10-07 14:03:03 +03:00 |
|
|
|
06bc431f3e
|
Web: Files: fixed Home selectors
|
2020-10-07 14:02:42 +03:00 |
|
|
|
c789743835
|
Web: Files: fixed SectionPagingContent selectors
|
2020-10-07 14:02:19 +03:00 |
|
|
|
da1249cf4a
|
Web: Files: fixed SectionHeaderContent selectors
|
2020-10-07 14:00:46 +03:00 |
|
|
|
190460a797
|
Web: Files: fixed SectionFilterContent selectors
|
2020-10-07 14:00:28 +03:00 |
|
|
|
74dda40b90
|
Web: Files: fixed SectionBodyContent selectors
|
2020-10-07 14:00:05 +03:00 |
|
|
|
b265a01603
|
Web: Files: fixed FilesTileContent selectors
|
2020-10-07 13:59:36 +03:00 |
|
|
|
446c4575d3
|
Web: Files: fixed FilesRowContent selectors
|
2020-10-07 13:59:15 +03:00 |
|
|
|
2667c4928c
|
Web: Files: fixed DocEditor selectors
|
2020-10-07 13:58:54 +03:00 |
|
|
|
d5ed8c78e1
|
Web: Files: fixed EmptyTrashDialog selectors
|
2020-10-07 13:58:37 +03:00 |
|
|
|
8ee8bc2369
|
Web: Files: fixed DownloadDialog selectors
|
2020-10-07 13:58:16 +03:00 |
|
|
|
10fcad6c0e
|
Web: Files: fixed DeleteDialog selectors
|
2020-10-07 13:57:47 +03:00 |
|
|
|
44b525a042
|
Web: Files: fixed MainButton selectors
|
2020-10-07 13:57:19 +03:00 |
|
|
|
8a132dbd62
|
Web: Files: fixed TreeSettings selectors
|
2020-10-07 13:56:47 +03:00 |
|
|
|
478a7909fc
|
Web: Files: fixed TreeFolders selectors
|
2020-10-07 13:55:56 +03:00 |
|
|
|
ba3c40634d
|
Web: Files: added new selectors
|
2020-10-07 13:55:05 +03:00 |
|
|
|
e76e50dc79
|
Web: ServiceWorkers: Turned off debug mode
|
2020-10-07 13:43:51 +03:00 |
|
|
|
7d958b7f9b
|
Web: Files: Restored Suspense
|
2020-10-07 13:39:07 +03:00 |
|
Artem Tarasov
|
a49b2581d9
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/store/files/reducers.js
|
2020-10-07 13:24:20 +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 |
|
Ilya Oleshko
|
19f5206e3f
|
Web: Files : Home : Fixed existing items check on add temp item on create
|
2020-10-07 11:45:20 +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 |
|
Ilya Oleshko
|
066a396dbd
|
Web: Files : Home : Fixed double add temp item on create
|
2020-10-07 11:33:10 +03:00 |
|
TatianaLopaeva
|
ee6f71d6ae
|
Web: Files: Refactoring
|
2020-10-07 11:03:19 +03:00 |
|
TatianaLopaeva
|
da9611bd4b
|
Merge branch 'feature/files' into feature/empty-screen
|
2020-10-07 10:58:27 +03:00 |
|
TatianaLopaeva
|
650b5d076a
|
Web: Files: Refactoring
|
2020-10-07 10:57:05 +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 |
|
|
|
ac7eda1b93
|
Web: Files: fixed filter
|
2020-10-06 22:56:22 +03:00 |
|
Ilya Oleshko
|
2632a0d3da
|
Web: Files : Home : Fixed loopTree after create or update items at row
|
2020-10-06 21:48:55 +03:00 |
|
|
|
b8d2407530
|
Merge branch 'feature/loading-acceleration' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/loading-acceleration
|
2020-10-06 19:33:57 +03:00 |
|
|
|
201126834f
|
Web: Files: fixed url filter, fixed selectedFolder error
|
2020-10-06 19:33:41 +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 |
|
