|
|
e169266b8f
|
Merge branch 'develop' into feature/rooms-feed
|
2022-09-05 11:02:17 +03:00 |
|
|
|
7b623c4e30
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/utils/settingsTree.js
# packages/common/store/AuthStore.js
# packages/components/slider/index.js
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
|
2022-09-05 10:19:52 +03:00 |
|
|
|
4ddfe898f5
|
File.Service: refactor
|
2022-09-02 18:59:30 +03:00 |
|
|
|
4a50770792
|
Feed: refactor
|
2022-09-02 18:58:53 +03:00 |
|
|
|
3bf145c123
|
Files: added security filter
|
2022-09-02 18:58:36 +03:00 |
|
|
|
16722854df
|
Files: canshare =false for files in personal room in docspace
|
2022-09-02 10:44:37 +03:00 |
|
|
|
88e38e82e2
|
Merge branch 'develop' into feature/rooms-feed
|
2022-09-01 20:25:11 +03:00 |
|
|
|
7895a214c9
|
Merge pull request #780 from ONLYOFFICE/feature/private-virtual-rooms
Feature/private virtual rooms
|
2022-09-01 19:34:12 +04:00 |
|
|
|
9477006b9f
|
Api: method without payment.
|
2022-09-01 14:02:04 +03:00 |
|
|
|
8e82656e57
|
Files.Service: added context id for folders inside the room
|
2022-08-31 20:06:57 +03:00 |
|
|
|
257693d3f6
|
Files.Service: added context id for files inside the room
|
2022-08-31 20:06:49 +03:00 |
|
|
|
99f62b936d
|
Files: added getting parent room IDs for the folder list
|
2022-08-31 20:04:52 +03:00 |
|
|
|
c35d51bd8e
|
Files.Service: added rooms module
|
2022-08-31 16:11:51 +03:00 |
|
|
|
e811c0e496
|
Files.Service: refactor
|
2022-08-31 16:10:42 +03:00 |
|
|
|
7a7ae03b0e
|
Files: fix security
|
2022-08-31 16:10:20 +03:00 |
|
|
|
8110048220
|
Files: added rooms feeds, refactor, fix
|
2022-08-31 16:10:10 +03:00 |
|
|
|
f8a2b8caef
|
Files: fix cast
|
2022-08-31 13:02:22 +03:00 |
|
|
|
ea2d97b6f5
|
Api: removed unused columns
|
2022-08-30 19:01:12 +03:00 |
|
|
|
54ff8de78b
|
Quota: moved UserQuotaSettings
|
2022-08-30 16:03:14 +03:00 |
|
|
|
33d3520505
|
Quota: fix
|
2022-08-30 14:16:10 +03:00 |
|
mushka
|
a1db010869
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-30 14:06:55 +03:00 |
|
|
|
da7bea6736
|
Files: refactor
|
2022-08-30 13:01:27 +03:00 |
|
|
|
4092c567b6
|
Files: fix
|
2022-08-30 12:59:39 +03:00 |
|
|
|
13a1da0b04
|
Files: added private
|
2022-08-30 12:59:20 +03:00 |
|
|
|
c162a56834
|
Quota: fix
|
2022-08-30 12:00:44 +03:00 |
|
|
|
bf7f4f04da
|
Merge branch 'develop' into feature/user-quota
|
2022-08-30 11:04:49 +03:00 |
|
|
|
7e74d4efaa
|
Quota: set default quota
|
2022-08-30 10:26:55 +03:00 |
|
|
|
605aee5529
|
Merge branch 'develop' into feature/security-history-audit
|
2022-08-30 11:55:19 +05:00 |
|
|
|
8e5fcfc3c8
|
Quota: errors
|
2022-08-29 23:35:25 +03:00 |
|
|
|
74a2006420
|
Quota: no quota
|
2022-08-29 22:15:06 +03:00 |
|
|
|
08832f005c
|
Files: refactor
|
2022-08-29 22:10:27 +03:00 |
|
|
|
933a4129fa
|
Quota: string representation of quota
|
2022-08-29 20:20:58 +03:00 |
|
|
|
3db342ffec
|
Merge branch 'develop' into feature/private-virtual-rooms
|
2022-08-29 17:39:57 +03:00 |
|
|
|
ff8cfa3737
|
Quota: api
|
2022-08-29 15:03:36 +03:00 |
|
|
|
9154b971c0
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/pages/PortalSettings/index.js
# packages/common/api/settings/index.js
# packages/common/components/Loaders/index.js
|
2022-08-29 13:06:44 +03:00 |
|
mushka
|
18b56dbc3e
|
Merge branch 'develop' into feature/create-room
|
2022-08-29 12:36:47 +03:00 |
|
|
|
16c7d80398
|
Files: fix root files
|
2022-08-29 11:57:48 +03:00 |
|
|
|
e3e47364e0
|
Merge branch 'develop' into feature/security-history-audit
|
2022-08-29 13:36:09 +05:00 |
|
|
|
a8972c7cba
|
Files: fix rooms sorting
|
2022-08-29 10:47:54 +03:00 |
|
|
|
d11e228792
|
Merge branch 'develop' into bugfix/sharpbox
|
2022-08-29 10:27:50 +03:00 |
|
mushka
|
56c2cd64c5
|
Merge branch 'develop' into feature/create-room
|
2022-08-26 19:28:06 +03:00 |
|
|
|
4797576a0c
|
Files: fix open in editor
|
2022-08-26 13:54:22 +03:00 |
|
|
|
b4a5fb253f
|
Files: fix rename for SharpBox, SharePoint providers
|
2022-08-26 13:08:03 +03:00 |
|
|
|
1be967fe3f
|
Files: added id conversion in base64 string
|
2022-08-26 13:07:27 +03:00 |
|
|
|
641695ec51
|
Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController
|
2022-08-25 23:09:12 +03:00 |
|
mushka
|
50eb4cf072
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-25 21:38:52 +03:00 |
|
|
|
d8ff05f7c6
|
Merge branch 'develop' into feature/docspace-backup
|
2022-08-25 16:34:59 +03:00 |
|
mushka
|
64f899fbbf
|
Merge branch 'develop' into feature/create-room
|
2022-08-25 15:36:52 +03:00 |
|
|
|
0c596956f6
|
Merge branch 'develop' into feautre/private-virtual-rooms
|
2022-08-25 15:30:11 +03:00 |
|
|
|
4dcd9be041
|
fix: removed IOptionsSnapshot
|
2022-08-25 13:29:08 +03:00 |
|
|
|
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 |
|
