Commit Graph

10527 Commits

Author SHA1 Message Date
9b22d27306 Files: added keys check 2022-08-25 11:55:54 +03:00
1b158e1e5e Merge branch 'develop' into feature/push 2022-08-25 11:22:07 +03:00
ca8b4f9b54 Merge branch 'develop' into feature/private-virtual-rooms 2022-08-25 10:36:39 +03:00
6ee5cdb0c3 Merge branch 'develop' into feature/room-filter 2022-08-25 10:23:24 +03:00
e2472b392e Files: fix doceditor link 2022-08-24 20:27:20 +03:00
cce276ed20 Files: fix 2022-08-24 18:07:36 +03:00
ccea188dd4 Merge branch 'develop' into feature/create-room 2022-08-24 17:55:37 +03:00
7f4838901a fix after merge 2022-08-24 17:30:06 +03:00
0daea49132 Merge branch 'develop' into feature/private-virtual-rooms 2022-08-24 17:12:13 +03:00
00e580438f Files: fix rename room 2022-08-24 16:13:20 +03:00
3d706635f5 Files: fix rename room 2022-08-24 16:09:43 +03:00
6d3a6cb58e Merge branch 'develop' into feature/create-room 2022-08-23 18:06:58 +03:00
0e9099017a
Merge branch 'develop' into bugfix/room-logo 2022-08-23 18:05:14 +03:00
58b48df3ab Files: added folders only filter for rooms 2022-08-23 17:22:50 +03:00
b633dcb4e6 update DocStore 2022-08-23 17:19:21 +03:00
718d87c7d6 Files: forms. remove caching 2022-08-23 17:16:15 +03:00
34232bc735 Files: removed oformservice 2022-08-23 16:34:54 +03:00
e7fa60d13c Merge branch 'develop' into feature/push 2022-08-23 15:32:06 +03:00
53ee8e9e15 Files: fix security 2022-08-23 15:18:37 +03:00
4c923b5117 Files: fix access 2022-08-23 14:54:51 +03:00
4278dbbf13 Merge branch 'develop' into feature/create-room 2022-08-23 14:23:45 +03:00
20dcd59616 Merge branch 'develop' into feature/push 2022-08-23 13:24:36 +03:00
5375ad19c5 Files: fix logo for SharePoint 2022-08-23 13:20:26 +03:00
95fa372f8a Files: fix update path for SharePoint 2022-08-23 13:15:24 +03:00
f649ee0292 Files: fix room logo 2022-08-23 13:07:30 +03:00
aa0a31e2f6 Files: quota* tables removed from filesDbContext 2022-08-23 12:57:20 +03:00
7c579fbd28 Files: fix thirdparty room deletion 2022-08-23 12:08:26 +03:00
737359b21a Merge branch 'develop' into feature/stripe 2022-08-23 12:05:06 +03:00
a7ce34d4ce Files: fix for SharpBox 2022-08-23 11:37:18 +03:00
670fd4952a Files: fix security priority 2022-08-23 10:54:55 +03:00
953faf550e Quota: user quota init 2022-08-23 09:44:07 +03:00
0be56bdc15 Files: refactor 2022-08-22 18:57:10 +03:00
b36abf5c0c Files: fix renaming thirdparty room 2022-08-22 18:57:03 +03:00
61d8ed822a Files: fix path updating 2022-08-22 18:56:27 +03:00
dd2ec8082c Files: fix renaming thirdparty room 2022-08-22 18:55:03 +03:00
5ede1f3069 Merge branch 'develop' into feature/create-room 2022-08-22 16:14:48 +03:00
099e7058a7 Files: fix thirdparty id mapping 2022-08-22 11:06:16 +03:00
d4eefc6145 Files: fixed optional params 2022-08-19 15:47:11 +03:00
8b6821d410 Files: fixed .format folders methods 2022-08-19 14:57:51 +03:00
2b6c4b127a Merge branch 'develop' into feature/docspace-backup
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Server/Api/ThirdpartyController.cs
2022-08-17 13:58:00 +03:00
mushka
4379a34bcf Merge branch 'develop' into feature/create-room 2022-08-15 16:01:20 +03:00
92942fbcf6 People: fix 2022-08-15 14:30:50 +03:00
ce5009d0c6 Push: fixes 2022-08-15 14:27:54 +03:00
0973f4e8d1 Files: removed .result 2022-08-12 16:26:57 +03:00
90c19508ea CoreCommon: tariff contains a list of quotas 2022-08-12 15:57:31 +03:00
6c2b49470c WEb: Fixed after merge. 2022-08-12 13:25:29 +03:00
2314d6fc47 Merge branch 'develop' into feature/async-fix
# Conflicts:
#	common/ASC.Socket.IO/.yarn/install-state.gz
#	common/ASC.SsoAuth/.yarn/install-state.gz
#	common/ASC.UrlShortener/.yarn/install-state.gz
#	common/ASC.WebDav/.yarn/install-state.gz
2022-08-11 22:33:13 +03:00
5b613b8078 Files: async fix 2022-08-11 22:25:29 +03:00
7d32616524 Files: fix 2022-08-11 19:02:52 +03:00
020fa7dcda Merge branch 'develop' into feature/push 2022-08-11 17:15:37 +03:00
4463fc6e8f Merge branch 'develop' into feature/docspace-backup
# Conflicts:
#	packages/asc-web-common/api/settings/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/sub-components/ButtonContainer.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/DirectConnectionContainer.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/DirectThirdPartyConnection.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/FormConnection.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/GetThirdPartyStoragesOptions.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/consumer-storage-settings/InputsMethods.js
#	packages/common/components/Loaders/AutoBackupLoader/StyledAutoBackup.js
#	packages/common/components/Loaders/AutoBackupLoader/index.js
#	packages/common/components/Loaders/DataBackupLoader/StyledDataBackup.js
#	packages/common/components/Loaders/DataBackupLoader/index.js
#	packages/common/components/Loaders/RestoreBackupLoader/StyledRestoreBackup.js
#	packages/common/components/Loaders/RestoreBackupLoader/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
#	products/ASC.Files/Client/src/components/panels/SelectionPanel/SelectionPanelBody.js
#	products/ASC.Files/Server/GlobalUsings.cs
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/StyledBackup.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/DocumentsModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/ThirdPartyModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/ThirdPartyStorageModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/AmazonSettings.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/GoogleCloudSettings.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/RackspaceSettings.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/SelectelSettings.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/DocumentsModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/ThirdPartyModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/ThirdPartyStorageModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/AmazonStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/GoogleCloudStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/RackspaceStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/SelectelStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/DocumentsModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/ThirdPartyResourcesModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/ThirdPartyStoragesModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/AmazonStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/GoogleCloudStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/RackspaceStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/SelectelStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
#	web/ASC.Web.Client/src/store/BackupStore.js
2022-08-11 17:10:37 +03:00
44bd9f1d6d Files: fix 2022-08-11 16:55:35 +03:00
2936cb4ca2 Files: fix 2022-08-11 16:44:08 +03:00
e54617c275 Files: fix 2022-08-11 16:37:18 +03:00
c3252df9ec Web: Added prop type. 2022-08-11 15:55:46 +03:00
c39451a531 Web: Added room selection. 2022-08-11 15:54:12 +03:00
0ad8be0d1a Files: fix 2022-08-11 14:30:01 +03:00
c0bf10af9e Files: fix 2022-08-10 22:27:44 +03:00
a63ee39d36 Files: removed unused method 2022-08-10 21:23:46 +03:00
69e5665763 Files: async fix 2022-08-10 19:45:59 +03:00
39c7a8ac2c Files: fix 2022-08-09 23:23:36 +03:00
ea2f03331b refactoring 2022-08-09 19:13:07 +03:00
mushka
8f5f597c5f Merge branch 'develop' into feature/create-room 2022-08-09 19:12:47 +03:00
05d5421ebc fix 2022-08-09 17:11:40 +03:00
baaec9dcef Merge branch 'develop' into feature/async-fix
# Conflicts:
#	common/ASC.Socket.IO/.yarn/install-state.gz
#	common/ASC.SsoAuth/.yarn/install-state.gz
#	common/ASC.UrlShortener/.yarn/install-state.gz
#	common/ASC.WebDav/.yarn/install-state.gz
2022-08-09 16:27:35 +03:00
d679a3d9a7 Files: async fix 2022-08-09 16:09:14 +03:00
a73b9cf2e4 Files: async fix 2022-08-08 23:03:58 +03:00
870c3cf3c4 warm up services 2022-08-08 19:25:22 +03:00
mushka
5cd4263b38 Merge branch 'develop' into feature/doc-space-info-panel 2022-08-04 15:21:06 +03:00
9149d08937 Files: async 2022-08-04 13:47:18 +03:00
mushka
9a0d61b0ff Merge branch 'develop' into feature/create-room 2022-08-04 13:33:37 +03:00
ce1917c77f Async: refactoring 2022-08-03 17:29:20 +03:00
7b40920552 Chinese (Traditional, Taiwan) empty file templates 2022-08-02 17:41:42 +03:00
3d531e653d Files: update docstore submodule (b8a2cf5292)
- update en demo templates
- update empty az
- added gl-ES, eu-ES, hy-AM, ms-MY
2022-08-02 17:41:04 +03:00
bb80d28945 Merge branch 'develop' into feature/async-fix
# Conflicts:
#	products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/AbstractDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/LinkDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
2022-08-02 17:03:50 +03:00
mushka
ea8aa736c4 merge with develop 2022-08-02 14:11:41 +03:00
mushka
33a334f08b empty room title translation fix 2022-08-02 12:17:17 +03:00
mushka
25176ecdc1 thirdparty gray label fix 2022-08-02 12:16:53 +03:00
9d3bc076b9
Merge pull request #747 from ONLYOFFICE/feature/fix-api
Feature/fix api
2022-08-02 11:59:47 +03:00
a4ea50c760 split AuditReportCreator 2022-08-01 17:23:50 +03:00
7000cd55f6 Merge branch 'develop' into refactoring/client 2022-08-01 15:59:18 +03:00
ceae4ff07d packages updated 2022-08-01 13:58:12 +03:00
3c3234b6c2 Merge branch 'develop' into feature/fix-api 2022-08-01 13:51:05 +03:00
4559942c30 fix confrim links 2022-08-01 13:50:31 +03:00
d406e8deb5 Merge branch 'develop' into feature/pool-context 2022-08-01 13:14:47 +03:00
b03f8bc1dc Merge branch 'develop' into feature/pool-context 2022-08-01 11:49:11 +03:00
mushka
f2112365b8 Merge branch 'develop' into feature/create-room 2022-08-01 09:59:21 +03:00
mushka
0173586cb4 component structure complete split and overlook + fixes 2022-08-01 09:56:25 +03:00
mushka
166ceb308a moved data file 2022-08-01 09:55:36 +03:00
mushka
3277c49da3 added trans keys and changed file name 2022-08-01 09:55:16 +03:00
mushka
c79b1864f7 added edit room event and splitted dialog to 2 parts 2022-08-01 09:54:52 +03:00
mushka
97c83a1d30 added api calls for room editing 2022-08-01 09:51:55 +03:00
af8ebef56e Web: Removed ASC.Projects/Client 2022-07-31 13:16:31 +03:00
2c5da93540 Web: Removed ASC.Mail/Client 2022-07-31 13:15:59 +03:00
30031a8b52 Web: Removed ASC.CRM/Client 2022-07-31 13:15:29 +03:00
0a3ddbdb10 Web: Removed ASC.Calendar/Client 2022-07-31 13:14:59 +03:00
fe5c8b0b13 fixed tests and tools 2022-07-29 20:23:19 +03:00
6fd385e026 Merge branch 'develop' into feature/docspace-backup 2022-07-29 11:13:42 +03:00
dba122eb96 Common, files: added dbcontext pool 2022-07-28 21:00:49 +03:00
5651d3645e Web: Refactoring. 2022-07-28 15:50:09 +03:00
8d89d8e8f2 Common: added dbcontext pool 2022-07-28 15:29:03 +03:00
53737a06e8 Merge branch 'develop' into refactoring/client
# Conflicts:
#	packages/editor/src/client/components/DynamicComponent.js
#	packages/editor/src/client/components/Editor.js
#	packages/editor/src/client/components/SelectFileDialog.js
#	packages/editor/src/client/components/SelectFolderDialog.js
#	packages/editor/src/client/components/SharingDialog.js
#	packages/editor/src/client/helpers/utils.js
#	packages/editor/src/client/helpers/withDialogs.js
#	packages/editor/src/server/lib/helpers/index.js
2022-07-28 10:38:29 +03:00
ddcde5f7ed Web: Backup: Added error handlers, filtered the list of accounts in the correct order, removed base folder selection . 2022-07-27 18:29:27 +03:00
0c1ff6ffd7 union tests GetLink and ShareRoomByLink 2022-07-27 18:22:51 +03:00
12e167ca84 Files: fix archive folder for WebDav 2022-07-27 17:34:10 +03:00
mushka
0bfd5a321e imported new translation keys 2022-07-26 20:34:26 +03:00
mushka
f93bf38f82 added translation keys and values on ru 2022-07-26 20:33:36 +03:00
mushka
d8fac9f0cc disabled iconEditor 2022-07-26 19:49:24 +03:00
mushka
67020f4fbf thirdparty dropdown can now go top direction automatically 2022-07-26 19:48:56 +03:00
mushka
f8067d87ff enlarged height for dropdownon tablet and > 2022-07-26 19:47:51 +03:00
mushka
416bb477ef added loader for creareRoomEvent 2022-07-26 19:46:24 +03:00
321e44cb94 fix SetFilterByTypes 2022-07-26 14:55:19 +03:00
9a8caeb951 backup: update thirdparty 2022-07-26 13:50:37 +03:00
Artem Tarasov
2988838060 Merge branch 'develop' into bugfix/doceditor-fix 2022-07-26 12:32:41 +03:00
5dccd8f52c Web: Backup: Added direct third-party connection component. 2022-07-26 12:03:35 +03:00
Artem Tarasov
294cdf4881 Web: Files/Doceditor: fixed method call SharingPanel.convertSharingUsers (ssr) 2022-07-26 11:19:01 +03:00
mushka
7a5fd36201 removed unnecessary inject from CreateRoomDialog 2022-07-25 18:26:35 +03:00
mushka
400efbcec6 added and updated api calls in Files and Tags Stores 2022-07-25 18:21:50 +03:00
mushka
63829f01eb integrated new CreateRoomDialog in CreateRoomEvent and added tag functionality 2022-07-25 18:20:11 +03:00
mushka
2ce7d29466 added clearing output on addTag in TagInput 2022-07-25 18:19:24 +03:00
mushka
ccb737f19f new addNewTag and set up for real tag fetching in TagHandler 2022-07-25 18:18:11 +03:00
mushka
d9689fd6f9 revert of modal callout back to Event method 2022-07-25 18:17:22 +03:00
Artem Tarasov
9dcff71504 Web: Doceditor/Client: fixed share settings request (ssr) 2022-07-25 14:52:18 +03:00
8ba9be1208 deleted commonfilesdbcontext 2022-07-25 14:14:03 +03:00
8acb550b08 files helpers moved to ASC.Files.Core 2022-07-25 14:03:31 +03:00
57f797ab24 Merge branch 'develop' into feature/migrations-fix 2022-07-25 12:59:19 +03:00
mushka
5311ebff5d some fixes and style tweaks in TagInput 2022-07-25 04:49:40 +03:00
mushka
720559c759 moved checkbox to ThirdpartyComboBox 2022-07-25 04:48:58 +03:00
mushka
34aa614127 added new components for thirdpartyFolderName param 2022-07-25 04:48:27 +03:00
mushka
57c72955b3 added thirdpartyFolderName to component state 2022-07-25 04:47:20 +03:00
mushka
fc6db0e215 overall component structure rebuild + some fixes 2022-07-25 03:31:43 +03:00
mushka
80db7bdb0f fixed importing issues 2022-07-24 23:46:24 +03:00
mushka
7ba028a12e upwork of tagInput dropdown 2022-07-24 23:46:02 +03:00
mushka
e8fec2ada1 moved StyledParam to its own file 2022-07-24 23:45:09 +03:00
mushka
01ce1e5316 fixes on own styled dropdown 2022-07-24 23:44:52 +03:00
mushka
55e841a016 redo of storage location to a single component 2022-07-24 23:44:29 +03:00
mushka
f37ff610b4 added rememberStorageLocation to component state 2022-07-24 23:42:59 +03:00
5877abf2e1 thirdparty backup: single connect 2022-07-24 22:19:36 +03:00
mushka
42a2ce2292 Merge branch 'develop' into feature/create-room 2022-07-24 19:03:23 +03:00
mushka
7d7bfb7d03 started updating tgiInput with new dropdown component 2022-07-24 18:58:11 +03:00
mushka
77f4f6be99 imported new styled-component to ThirpartyComboBox 2022-07-24 18:57:23 +03:00
mushka
4206f596f6 coded out integration with new ModalDialog isScrollLocked prop 2022-07-24 18:56:43 +03:00
mushka
fa883c967c moved dropdown styles to its own styled-component 2022-07-24 18:55:41 +03:00
61ec4a18da migrations moved to external projects 2022-07-24 16:02:00 +03:00
mushka
ae78f66b81 import fixes 2022-07-23 02:09:15 +03:00
mushka
37ade0870f scroll fixation tryouts 2022-07-23 02:08:55 +03:00
mushka
83f958ec43 changed thirparty param from existing component to my own with custom dropdown 2022-07-23 02:08:24 +03:00
mushka
2e54549353 fixed styles in TagInput 2022-07-23 02:06:28 +03:00
mushka
41ac0b7dfc moved thirparty data to its own file 2022-07-23 02:05:57 +03:00
Vashchuk Nikita
db9eaa3b08 fix 2022-07-22 23:09:16 +03:00
Vashchuk Nikita
b336eafa37 Merge branch 'feature/migrations-fix' of github.com:ONLYOFFICE/AppServer into feature/migrations-fix
# Conflicts:
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220722192649_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
2022-07-22 22:40:58 +03:00
Vashchuk Nikita
94ca41011b recreate migrations 2022-07-22 22:34:48 +03:00
e7252c4bc4 Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00
mushka
f5a7b7f6f8 finished with TagInput and TagList sub-components 2022-07-22 18:16:55 +03:00
mushka
7c39d55118 finished ThirpartComboBox 2022-07-22 18:14:34 +03:00
mushka
0bbf615c8b added mock fetched tags to tagHandler 2022-07-22 18:14:03 +03:00
mushka
f24f2c6bee temporarily disabled room creation api call 2022-07-22 18:13:11 +03:00
5762bf1b04 Files: openedit method extended 2022-07-22 17:54:14 +03:00
b269b23db3 Files: fix initial sharing for private rooms 2022-07-22 16:10:57 +03:00
beb5628768 Files: fix rooms share filter 2022-07-22 16:10:27 +03:00
0a203dd532 Files: added new methods to api 2022-07-22 15:55:32 +03:00
mushka
003dc33ba8 Merge branch 'develop' into feature/create-room 2022-07-22 14:35:47 +03:00
7f7b636d9b fix get thirdparty/backup 2022-07-22 13:01:23 +03:00
mushka
07e6ccbcf7 overall fixes and Image editor tryouts 2022-07-22 12:31:26 +03:00
mushka
bf4f2d5bad add ThirpartyComboBox 2022-07-22 12:30:53 +03:00
df1344b6c1 Merge branch 'develop' into feature/private-virtual-rooms 2022-07-22 11:57:05 +03:00
67f5146d3e Merge branch 'develop' into feature/private-virtual-rooms 2022-07-22 11:10:23 +03:00
TimofeyBoyko
d15e4be920 Web:Files:TableView: fix table columns for rooms 2022-07-22 05:20:30 +03:00
Artem Tarasov
345dad709c Merge branch 'develop' into feature/doceditor-ssr 2022-07-21 16:02:48 +03:00
mushka
682b256cbe Merge branch 'develop' into feature/create-room 2022-07-21 15:49:10 +03:00
TimofeyBoyko
5d327f39e4 Web:Files:FilesStore: remove delete context menu item for room 2022-07-21 14:00:14 +03:00
31b8cd121e Files: fix 2022-07-21 13:40:35 +03:00
TimofeyBoyko
c954aa7f8d Web:Files:FilesStore: fix updateRoomPin for idx === -1 2022-07-21 13:09:40 +03:00
TimofeyBoyko
750ecd9e8e Web:Files:ContextOptionsStore: hide delete item from group context menu for rooms 2022-07-21 13:04:57 +03:00
987788bab7 Files: added creating private thirdparty room 2022-07-21 12:38:23 +03:00
TimofeyBoyko
77f8eecf78 Web:Files: fix header of context menu for rooms 2022-07-21 12:01:38 +03:00
f92144d9df Files: optimization, refactor 2022-07-21 11:49:44 +03:00
95323b7fc2 Files: added private 2022-07-21 11:42:01 +03:00
77d311b636
Merge branch 'develop' into feature/doceditor-ssr 2022-07-21 11:41:42 +03:00
TimofeyBoyko
35cb3027b9 Web:Files: fix open archived room 2022-07-21 11:34:41 +03:00
TimofeyBoyko
1633d0782a Web:Files:TableView: fix view at room folder when info panel is open 2022-07-21 11:24:24 +03:00
TimofeyBoyko
af9011620d Web:People: update filter selected items 2022-07-21 10:43:08 +03:00
TimofeyBoyko
5926b22dbb Web:Files:Store: remove pin option from archived folder 2022-07-21 10:22:51 +03:00
mushka
98172fc5c9 changed overall file structure and improved several components 2022-07-21 00:02:42 +03:00
mushka
0ce9f0befa create TagList sub-component for CreateRoom dialog 2022-07-21 00:01:16 +03:00
mushka
5b69d83a87 coded out interaction with new TagHandler for CreateRoom dialog 2022-07-21 00:00:08 +03:00
mushka
30e111c661 moved room types data outide of index.js file for CreateRoom dialog 2022-07-20 23:59:15 +03:00
mushka
2976b08232 created TagHandler form CreateRoom dialog 2022-07-20 23:58:19 +03:00
mushka
2cf298bd7d added more translation keys for CreatRoomDialog 2022-07-20 23:57:22 +03:00
TimofeyBoyko
602e4af0bb Web:Files: add group delete operation 2022-07-20 20:12:08 +03:00
TimofeyBoyko
799d1e7e81 Web:Files:Store: after click on pin/unpin update room icon before request is ready 2022-07-20 19:18:51 +03:00
TimofeyBoyko
59fb67d3d2 Web:Files:Filter: fix clear filter 2022-07-20 19:10:27 +03:00
TimofeyBoyko
8c1e727383 Web:Files: add default tag 'No tag' for empty tags list of rooms 2022-07-20 18:42:42 +03:00
TimofeyBoyko
73598dd0cd Web:Files:Article: fix translate key 'NewRoom' 2022-07-20 17:53:20 +03:00
a065d9771e Files: added private 2022-07-20 17:22:31 +03:00
TimofeyBoyko
6a2f6ff790 Web:Files:Filter: fix rooms search 2022-07-20 17:04:29 +03:00
TimofeyBoyko
c17aafd658 Web:Files:GlobalEvents: restore disabled buttons after onSave click 2022-07-20 16:45:50 +03:00
TimofeyBoyko
d2e3bd62f2 Web:Files:EmptyContainer: add onCreateRoom func 2022-07-20 16:36:06 +03:00
TimofeyBoyko
e505e0f812 Web:Files:TilesView: fix position of pin icon for rooms 2022-07-20 15:48:26 +03:00
TimofeyBoyko
1495775250 Web:Files: add new translation key 'NoTag' 2022-07-20 15:25:35 +03:00
TimofeyBoyko
3c199e43be Web:Files:Filter: add withoutMe logic for owner group and fix rooms filter type 2022-07-20 15:11:50 +03:00
TimofeyBoyko
7a9114f562 Merge branch 'develop' into feature/virtual-rooms-page 2022-07-20 14:29:04 +03:00
07425ded19
Merge pull request #728 from ONLYOFFICE/feature/rooms-filter
Feature/rooms filter
2022-07-20 15:17:12 +04:00
6ffa21a919 fix 2022-07-20 14:12:08 +03:00
TimofeyBoyko
6c47a7609d Web:Files:HOCs: disable create files and folders at rooms page 2022-07-20 12:49:33 +03:00
TimofeyBoyko
70948c081c Web:Files: add temp creating room dialog 2022-07-20 12:45:52 +03:00
TimofeyBoyko
54cf2a5ce4 Web:Files:ContextOptionsStore: add group context menu for rooms 2022-07-20 09:40:40 +03:00
TimofeyBoyko
3945c50662 Web:Files:FilesActionsStore: add changing pin to unpin item for group menu 2022-07-20 09:31:17 +03:00
TimofeyBoyko
04daf2b098 Web:Files:FilesActionsStore: add group operations for pin and archive rooms 2022-07-20 09:24:24 +03:00
TimofeyBoyko
58bbfb4d58 Web:Files: add new translation keys for pin/unpin and archive operations 2022-07-20 09:23:58 +03:00
TimofeyBoyko
0782af817f Merge branch 'develop' into feature/virtual-rooms-page 2022-07-20 08:36:31 +03:00
mushka
fa264ed6f9 coded out ChooseRoomDialog and almost finished with ChooseRoomTypeDropdown 2022-07-20 02:11:23 +03:00
mushka
370d804ea2 added translation keys for header, room titles and descriptions 2022-07-20 02:09:31 +03:00
mushka
c8b10fed16 updated api requests 2022-07-20 02:08:51 +03:00
3123ba7993 Web: People: fix redirect 2022-07-20 00:49:11 +03:00
247bd5770f Merge branch 'develop' into feature/async-fix 2022-07-19 20:40:52 +03:00
TimofeyBoyko
7d13d8a81a Web:Files: add new translation key 'Owner' 2022-07-19 20:36:16 +03:00
TimofeyBoyko
d491829475 Web:Files:TableView: fix switch from room list to file list 2022-07-19 20:34:00 +03:00
mushka
d99a5b6c5a finished coding interactions of new dialog with other components 2022-07-19 20:11:55 +03:00
mushka
3b2d496909 Merge branch 'develop' into feature/create-room 2022-07-19 19:51:06 +03:00
mushka
1a6f88fcfb added CreateRoomDialog and uipdated dialogsStore 2022-07-19 19:50:03 +03:00
TimofeyBoyko
3f8502ab8b Web:Files: add new translation keys for rooms 2022-07-19 18:39:44 +03:00
Artem Tarasov
4ddffad7b2 Merge branch 'develop' into feature/doceditor-ssr 2022-07-19 18:22:16 +03:00
66b0e8c303
Merge branch 'develop' into bugfix/tfa 2022-07-19 18:17:22 +03:00
mushka
676934f4d0 commented out print button in BackupCodes dialog 2022-07-19 17:54:15 +03:00
mushka
628959b1c4 Merge branch 'feature/modal-redesign' of github.com:ONLYOFFICE/AppServer into feature/modal-redesign 2022-07-19 17:47:54 +03:00
TimofeyBoyko
4f7a8e2074 Web:Files: update rooms translations keys 2022-07-19 17:47:42 +03:00
mushka
2f774803f4 added close button to Connecting account dialog 2022-07-19 17:47:17 +03:00
TimofeyBoyko
d6dd1c4639 Web:Files: add new translate keys for checked items of group menu 2022-07-19 17:41:26 +03:00
067e105814 Merge branch 'develop' into feature/modal-redesign 2022-07-19 16:58:02 +03:00
TimofeyBoyko
b19839cd9c Web:Files:Header: fix back to parent room 2022-07-19 16:47:09 +03:00
TimofeyBoyko
e3aac59cb1 Web:Files: fix bug after delete useless page 2022-07-19 16:33:12 +03:00
TimofeyBoyko
5a3ec004bd Web:Files: delete useless virtual rooms page and useless store 2022-07-19 16:32:02 +03:00
TimofeyBoyko
29f3603703 Web:Files:Article: hide buttons for main button mobile for rooms page 2022-07-19 16:30:47 +03:00
b98524532f Merge branch 'develop' into feature/migrations-fix
# Conflicts:
#	common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
#	common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220711152836_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/20220711152837_VoipDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
2022-07-19 16:04:29 +03:00
TimofeyBoyko
49825e7c7d Web:Files:Filter: remove filter search withSubfolders and searchInContent for rooms filter 2022-07-19 16:02:00 +03:00
TimofeyBoyko
21e641291f Web:Files:Article: delete useless code 2022-07-19 15:48:06 +03:00
TimofeyBoyko
228c8ae3fa Web:Files: add new translation key 'NewRoom' 2022-07-19 15:43:02 +03:00
mushka
ff24d3f9d3 fixed name truncation and restyled dropdown 2022-07-19 15:40:06 +03:00
0250a43ba6 thirdparty backup 2022-07-19 14:56:22 +03:00
TimofeyBoyko
614502c888 Web:Files:TilesView: fix margin bottom after rooms list 2022-07-19 14:02:58 +03:00
TimofeyBoyko
bfada1a415 Web:Files:RowsView: disable quickButtons for files and folder at rooms list 2022-07-19 13:57:29 +03:00
TimofeyBoyko
f51f2fbb9c Web:Files:TableView: fix displaying rooms with subfolders 2022-07-19 13:49:46 +03:00
TimofeyBoyko
7a7e2a2858 Web:Files:FilesStore: add sorting folder to filesList 2022-07-19 13:39:13 +03:00
TimofeyBoyko
46363072c5 Web:Files:Paging: update logic for rooms 2022-07-19 12:58:31 +03:00
mushka
e5fa0d399d fixed members tab and added dropdowns 2022-07-19 12:54:34 +03:00
TimofeyBoyko
18bc69774a Web:Files:Header: update action menu for rooms 2022-07-19 12:37:47 +03:00
TimofeyBoyko
50ac0f5add Web:Files:Article: update main button for rooms 2022-07-19 12:22:57 +03:00
TimofeyBoyko
9b7df9abb4 Web:Files:Images: add icon for create room action 2022-07-19 12:21:57 +03:00
TimofeyBoyko
c5d47efeaf Web:Files:FilesStore: update canCreate for rooms 2022-07-19 12:21:36 +03:00
TimofeyBoyko
a5b57add2a Web:Files:Filter: add withSubfolder and searchInContent for filter 2022-07-18 20:26:46 +03:00
TimofeyBoyko
96f3c74f00 Web:Files:Utils: add new helpers getDefaultRoomsName 2022-07-18 20:08:09 +03:00
TimofeyBoyko
f305990514 Web:Files:Constants: add new constatns for filter keys and groups 2022-07-18 20:07:45 +03:00
a2037eb91d fix build 2022-07-18 18:30:08 +03:00
1d0db523a8 Merge branch 'develop' into feature/rooms-filter 2022-07-18 17:27:57 +03:00
mushka
b72b24beb3 fixed InfoPanel header 2022-07-18 17:19:26 +03:00
e849ccd635 Files: refactor 2022-07-18 17:15:17 +03:00
cab55d68f3 Files: fix filter, refactor, removed unnecessary 2022-07-18 17:11:50 +03:00
Artem Tarasov
10f2cde731 Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	.gitignore
2022-07-18 17:05:53 +03:00
mushka
f77d424526 Merge branch 'develop' into feature/doc-space-info-panel 2022-07-18 14:58:18 +03:00
3bde5f83c9 removed ASC.Thumbnails.Svc
fix ASC.Data.Storage.Encryption
fixed ASC.Projects
2022-07-18 14:25:25 +03:00
ccbac1d3fa consolidated packages 2022-07-18 13:50:05 +03:00
TimofeyBoyko
cd6c60c5d7 Web:Files:Home: update filter for selected items under filter row 2022-07-18 13:33:59 +03:00
d94904b6af removed voip 2022-07-18 12:24:12 +03:00
TimofeyBoyko
fb05e22bb7 Web:Files:Store: add new tagsStore 2022-07-17 14:29:24 +03:00
TimofeyBoyko
8832aece23 Web:Files: move logic from virtual room page to home page 2022-07-16 09:50:32 +03:00
TimofeyBoyko
5074451a98 Web:Files:add room logo 2022-07-16 09:49:22 +03:00
c713d909b3 Files: added sharing for admins 2022-07-15 16:37:05 +03:00
2da8d83a8a add new keys 2022-07-15 16:34:46 +03:00
1c682bf162 Files: refactor 2022-07-15 16:33:42 +03:00
fe993907ad Merge branch 'feature/modal-redesign' of https://github.com/ONLYOFFICE/AppServer into feature/add-17keys 2022-07-15 15:09:49 +03:00
bb51d53cc4 add new keys-17 2022-07-15 15:02:07 +03:00
d8980cc3a7 fix 57917 2022-07-14 20:00:43 +03:00
mushka
d106647ecf tweaked DownloadDialog and fixed overall aside body scroll 2022-07-14 17:45:18 +03:00
mushka
1b895976f5 fixed DownloadAs panel 2022-07-14 17:26:21 +03:00
Vashchuk Nikita
6507c4b999 Merge branch 'develop' into feature/migrations-fix
# Conflicts:
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
#	web/ASC.Web.Core/GlobalUsings.cs
2022-07-14 11:56:07 +03:00
TimofeyBoyko
7532dc199f Web:Files:Article: remove useless 'type' from onClick and work with folder id 2022-07-14 07:12:31 +03:00
TimofeyBoyko
bfc1422ba7 Merge branch 'develop' into feature/virtual-rooms-page 2022-07-14 06:01:51 +03:00
dfcc00995a Web: People: fix redirect tfa reset 2022-07-13 21:52:09 +03:00
389ae00068
Merge branch 'develop' into bugfix/tfa 2022-07-13 21:09:12 +03:00
ee9e381b26 fixed async 2022-07-13 20:09:43 +03:00
943895e6b7 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/tfa 2022-07-13 19:54:13 +03:00
cccbf540dd Web: People: ResetApplicationDialog: fix redirect and close 2022-07-13 19:48:11 +03:00
34e4f2e47f Merge branch 'develop' into feature/async-fix
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
2022-07-13 19:39:05 +03:00
mushka
41731b9b36 removed Move translation key 2022-07-13 18:07:41 +03:00
mushka
f02c9445c4 removed NotBeUndone translation key 2022-07-13 18:05:57 +03:00
mushka
f63c570349 fixed ConvertDialog translations 2022-07-13 17:55:30 +03:00
1c491af30c Files: refactor 2022-07-13 17:11:06 +03:00
5116642b95 Files: added private 2022-07-13 17:10:51 +03:00
c03e1a443a Files: added restrictions on sharing for private rooms 2022-07-13 16:33:44 +03:00
mushka
25941ceb50 fixed missed translation key bug in ConflictResolve dialog 2022-07-13 16:02:11 +03:00
mushka
523b974fc5 deleted unused translation keys 2022-07-13 15:26:52 +03:00
552d2adda8 Files: deleted unnecessary 2022-07-13 13:42:40 +03:00
256885f4e3 Files: fix, deleted unnecessary 2022-07-13 13:42:17 +03:00
ea00433ff1 Files: tests. refactoring 2022-07-13 13:00:08 +03:00
Vashchuk Nikita
9348ad1a46 fix files tests 2022-07-13 12:52:13 +03:00
cad67a6f57 Web: RestoreBackup: Refactoring. 2022-07-13 12:20:33 +03:00
b0eb883e20 Web: Fixed saving settings, refactoring. 2022-07-13 12:20:33 +03:00
51418fc141 WEb: AutoBackup: Added new option for third-party accounts. 2022-07-13 12:20:30 +03:00
05db277f00 Web: AutoBackup: Added disable input if folder was deleted, added removing folder when switch between options. 2022-07-13 12:20:30 +03:00