|
|
54da881340
|
Web: fix translates
|
2023-11-29 03:17:07 +03:00 |
|
|
|
e9e96102cf
|
Merge branch 'feature/updating_translations' of https://github.com/ONLYOFFICE/DocSpace-client into feature/updating_translations
# Conflicts:
# packages/client/public/locales/ja-JP/DeleteProfileEverDialog.json
# packages/client/public/locales/ko-KR/DeleteProfileEverDialog.json
# packages/client/public/locales/lv/DeleteProfileEverDialog.json
# packages/client/public/locales/nl/DeleteProfileEverDialog.json
# packages/client/public/locales/pl/DeleteProfileEverDialog.json
# packages/client/public/locales/pt-BR/DeleteProfileEverDialog.json
# packages/client/public/locales/pt/DeleteProfileEverDialog.json
# packages/client/public/locales/ro/DeleteProfileEverDialog.json
# packages/client/public/locales/ru/DeleteProfileEverDialog.json
# packages/client/public/locales/sk/DeleteProfileEverDialog.json
# packages/client/public/locales/sl/DeleteProfileEverDialog.json
# packages/client/public/locales/tr/DeleteProfileEverDialog.json
# packages/client/public/locales/uk-UA/DeleteProfileEverDialog.json
# packages/client/public/locales/vi/DeleteProfileEverDialog.json
# packages/client/public/locales/zh-CN/DeleteProfileEverDialog.json
|
2023-11-28 17:49:56 +03:00 |
|
|
|
4c3057c645
|
Add translations of multiple languages (ar, ja, ko, lo, lv, nl, pl, pt, ro, ru, sk, sl, tr, uk, vi, zh)
|
2023-11-28 16:53:55 +03:00 |
|
|
|
8a27ce1f9a
|
Merge branch 'develop' into feature/management
|
2023-11-28 18:51:13 +05:00 |
|
|
|
aa8c3adddf
|
Web: add translates
|
2023-11-28 14:37:07 +03:00 |
|
|
|
1e87bc0eac
|
Public: translation fixed
|
2023-11-27 20:07:28 +05:00 |
|
Akmal Isomadinov
|
2d0407d43e
|
Merge branch 'release/v2.0.0' into feature/form-room
|
2023-11-27 17:54:46 +05:00 |
|
|
|
f56b0ff5d9
|
Add new workspace, update yarn.lock
|
2023-11-27 09:58:46 +03:00 |
|
|
|
7657988e60
|
Merge branch 'release/v2.0.0' into feature/updating_translations
|
2023-11-24 17:32:43 +04:00 |
|
|
|
eb66c33e5e
|
Fixed Bug 65217: Fixed detecting chrome based mobile browsers
|
2023-11-24 14:55:17 +03:00 |
|
Vladimir Khvan
|
f6c78f3ad8
|
20x20 data import icon was added
|
2023-11-23 21:03:14 +05:00 |
|
|
|
3425c04044
|
Merge branch 'release/v2.0.0' into feature/updating_translations
# Conflicts:
# packages/client/public/locales/az/DeleteProfileEverDialog.json
# packages/client/public/locales/bg/DeleteProfileEverDialog.json
# packages/client/public/locales/cs/DeleteProfileEverDialog.json
# packages/client/public/locales/de/DeleteProfileEverDialog.json
# packages/client/public/locales/el-GR/DeleteProfileEverDialog.json
# packages/client/public/locales/es/DeleteProfileEverDialog.json
# packages/client/public/locales/fi/DeleteProfileEverDialog.json
# packages/client/public/locales/fr/DeleteProfileEverDialog.json
# packages/client/public/locales/hy-AM/DeleteProfileEverDialog.json
# packages/client/public/locales/it/DeleteProfileEverDialog.json
|
2023-11-23 15:52:14 +04:00 |
|
Vladimir Khvan
|
caa7c632c4
|
Merge branch 'develop' into feature/data-migration
Conflicts:
packages/client/public/locales/en/Settings.json
packages/client/public/locales/ru/Settings.json
packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
packages/client/src/pages/PortalSettings/utils/settingsTree.js
packages/client/src/routes/portalSettings.js
packages/client/src/store/DialogsStore.js
packages/client/src/store/index.js
packages/components/table-container/TableHeaderCell.js
public/locales/en/Common.json
|
2023-11-22 19:45:10 +05:00 |
|
|
|
5a1216759c
|
Disable domain check by default
|
2023-11-21 15:24:46 +04:00 |
|
|
|
57a9de7746
|
Merge branch 'develop' into feature/my-documents-share
|
2023-11-21 12:56:27 +03:00 |
|
|
|
e347aacf11
|
Merge branch 'develop' into feature/management
# Conflicts:
# package.json
# yarn.lock
|
2023-11-21 12:40:25 +04:00 |
|
|
|
37b82fd7a2
|
fix Bug 65174 - Docs. Desktop. The version number in the translation has been removed.
|
2023-11-20 17:44:13 +03:00 |
|
|
|
8bbe0deb53
|
Merge branch 'release/v2.0.0' into feature/updating_translations
# Conflicts:
# i18next/client.babel
# i18next/common.babel
# packages/client/public/locales/az/Files.json
# packages/client/public/locales/az/FormGallery.json
# packages/client/public/locales/az/InfoPanel.json
# packages/client/public/locales/az/JavascriptSdk.json
# packages/client/public/locales/az/Settings.json
# packages/client/public/locales/bg/Files.json
# packages/client/public/locales/bg/FormGallery.json
# packages/client/public/locales/bg/InfoPanel.json
# packages/client/public/locales/bg/JavascriptSdk.json
# packages/client/public/locales/bg/Settings.json
# packages/client/public/locales/cs/Files.json
# packages/client/public/locales/cs/FormGallery.json
# packages/client/public/locales/cs/InfoPanel.json
# packages/client/public/locales/cs/JavascriptSdk.json
# packages/client/public/locales/cs/Settings.json
# packages/client/public/locales/de/Files.json
# packages/client/public/locales/de/FormGallery.json
# packages/client/public/locales/de/InfoPanel.json
# packages/client/public/locales/de/JavascriptSdk.json
# packages/client/public/locales/de/Settings.json
# packages/client/public/locales/el-GR/Files.json
# packages/client/public/locales/el-GR/FormGallery.json
# packages/client/public/locales/el-GR/InfoPanel.json
# packages/client/public/locales/el-GR/JavascriptSdk.json
# packages/client/public/locales/el-GR/Settings.json
# packages/client/public/locales/en/Files.json
# packages/client/public/locales/es/Files.json
# packages/client/public/locales/es/FormGallery.json
# packages/client/public/locales/es/InfoPanel.json
# packages/client/public/locales/es/JavascriptSdk.json
# packages/client/public/locales/es/Settings.json
# packages/client/public/locales/fi/Files.json
# packages/client/public/locales/fi/FormGallery.json
# packages/client/public/locales/fi/InfoPanel.json
# packages/client/public/locales/fi/JavascriptSdk.json
# packages/client/public/locales/fi/Settings.json
# packages/client/public/locales/fr/Files.json
# packages/client/public/locales/fr/FormGallery.json
# packages/client/public/locales/fr/InfoPanel.json
# packages/client/public/locales/fr/JavascriptSdk.json
# packages/client/public/locales/fr/Settings.json
# packages/client/public/locales/hy-AM/Files.json
# packages/client/public/locales/hy-AM/FormGallery.json
# packages/client/public/locales/hy-AM/InfoPanel.json
# packages/client/public/locales/hy-AM/JavascriptSdk.json
# packages/client/public/locales/hy-AM/Settings.json
# packages/client/public/locales/it/Files.json
# packages/client/public/locales/it/FormGallery.json
# packages/client/public/locales/it/InfoPanel.json
# packages/client/public/locales/it/JavascriptSdk.json
# packages/client/public/locales/it/Settings.json
# public/locales/az/Common.json
# public/locales/bg/Common.json
# public/locales/cs/Common.json
# public/locales/de/Common.json
# public/locales/el-GR/Common.json
# public/locales/es/Common.json
# public/locales/fi/Common.json
# public/locales/fr/Common.json
# public/locales/hy-AM/Common.json
# public/locales/it/Common.json
|
2023-11-20 15:55:26 +04:00 |
|
|
|
83a670d256
|
Fix UselessTranslationKeysTest (removed old translations)
|
2023-11-20 13:16:33 +04:00 |
|
|
|
01b2f99be9
|
Merge branch 'develop' into feature/my-documents-share
|
2023-11-20 01:50:01 +03:00 |
|
|
|
a284aafe64
|
Merge branch 'develop' into feature/my-documents-share
|
2023-11-17 17:44:38 +03:00 |
|
Akmal Isomadinov
|
73332b8e34
|
Web:Scripts:Config Disabled PDF viewer
|
2023-11-17 19:40:41 +05:00 |
|
|
|
14e8945e20
|
Added missing files
|
2023-11-17 18:32:52 +04:00 |
|
|
|
310cda28b5
|
Merge branch 'release/v2.0.0' into feature/form-room
# Conflicts:
# packages/common/utils/image-helpers.js
|
2023-11-17 18:32:28 +04:00 |
|
|
|
71a496d472
|
Update translations: az, bg, cs, de, el, es, fi, fr, hy, it
|
2023-11-17 16:15:11 +03:00 |
|
|
|
599056a82d
|
Merge branch 'release/v2.0.0' into feature/plugin-sdk
|
2023-11-17 13:33:34 +04:00 |
|
|
|
c41f2e7d14
|
Client:PluginSDK: add plugin list
|
2023-11-17 12:01:59 +03:00 |
|
|
|
07aef4ca41
|
Client:PluginSDK: init
|
2023-11-17 10:01:27 +03:00 |
|
Akmal Isomadinov
|
99b0c90219
|
Merge branch 'release/v2.0.0' into feature/form-room
# Conflicts:
# packages/client/public/locales/en/Files.json
# packages/common/utils/image-helpers.js
|
2023-11-17 11:30:49 +05:00 |
|
|
|
40e941d4db
|
Merge branch 'release/v2.0.0' into feature/form-gallery-error-view
|
2023-11-16 23:03:36 +04:00 |
|
|
|
45d74b5fe2
|
Added icons for file formats: sxc, et, ett, sxi, dps, dpt, sxw, stw, wps, wpt, mhtml
|
2023-11-16 16:35:22 +03:00 |
|
|
|
4659c69625
|
Web: Public: Update thirdparties logos to show them correctly in RTL mode
|
2023-11-16 12:19:39 +01:00 |
|
|
|
ba520a7ad1
|
Merge branch 'release/v2.0.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.0.0
|
2023-11-16 12:33:06 +03:00 |
|
|
|
25bd37eded
|
fix Bug 65122 - Added a warning dialog about saving a backup in a public room.
|
2023-11-16 12:32:40 +03:00 |
|
|
|
68733bd54c
|
Fix UselessTranslationKeysTest (removed useless keys)
|
2023-11-16 13:30:07 +04:00 |
|
|
|
29bbf2c8b1
|
Fix UselessTranslationKeysTest (removed useless AddFilter key)
|
2023-11-16 13:22:03 +04:00 |
|
|
|
86484af409
|
Merge branch 'develop' into feature/my-documents-share
|
2023-11-15 15:44:20 +03:00 |
|
namushka
|
14bdc19485
|
Merge branch 'release/v2.0.0' into feature/form-gallery-error-view
|
2023-11-15 13:53:53 +03:00 |
|
|
|
e9a292004a
|
Fix EnDublicatesByContentTest (moved "Price" and "Free" keys to Common translations)
|
2023-11-15 14:47:32 +04:00 |
|
|
|
3a2c002d72
|
Fix FullEnDublicatesTest (moved "Plugins" key to Common translations)
|
2023-11-15 14:32:58 +04:00 |
|
|
|
87d08a89f8
|
Auto-sorting Common translations
|
2023-11-15 14:09:29 +04:00 |
|
namushka
|
877b32d527
|
added error screen for form gallery
|
2023-11-13 18:29:33 +03:00 |
|
Akmal Isomadinov
|
36bb6da9ce
|
Merge branch 'release/v2.0.0' into feature/form-room
# Conflicts:
# packages/client/src/store/FilesStore.js
|
2023-11-13 10:33:45 +05:00 |
|
|
|
2ea7ee368a
|
Merge branch 'develop' into feature/management
# Conflicts:
# frontend.code-workspace
|
2023-11-10 13:59:36 +04:00 |
|
|
|
8f22be679b
|
Client:Plugins: change default plugin logo, fix path for assets at context menu and dd item
|
2023-11-10 11:39:17 +03:00 |
|
|
|
5be61afd7d
|
Merge branch 'develop' into feature/my-documents-share
|
2023-11-09 19:05:58 +03:00 |
|
|
|
608b3b1260
|
Web: Files: fixed public-room icon
|
2023-11-09 18:46:46 +03:00 |
|
|
|
3170833b98
|
Merge branch 'develop' into feature/management
# Conflicts:
# frontend.macos.code-workspace
# packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/manual-backup/index.js
# yarn.lock
|
2023-11-09 19:13:20 +05:00 |
|
|
|
de5f65b632
|
Public: added ru translation for management
|
2023-11-08 18:56:04 +05:00 |
|
|
|
5fa330c52a
|
Removed deprecated parameter from frame component
|
2023-11-08 15:00:30 +03:00 |
|
|
|
d138608224
|
Web: change image
|
2023-11-08 11:16:00 +03:00 |
|
Akmal Isomadinov
|
50cf68375b
|
Web:Navigation Fixed option icon
|
2023-11-07 14:11:18 +05:00 |
|
Akmal Isomadinov
|
8fd1f5d546
|
Merge branch 'release/v2.0.0' into feature/form-room
# Conflicts:
# packages/client/src/components/Badges.js
# packages/client/src/components/EmptyContainer/EmptyFolderContainer.js
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/pages/Home/InfoPanel/Body/helpers/MembersHelper.js
# packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# packages/client/src/pages/Home/Section/Body/TableView/StyledTable.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/store/FilesStore.js
# packages/client/src/store/SelectedFolderStore.js
|
2023-11-05 22:20:45 +05:00 |
|
Akmal Isomadinov
|
4bad9df7eb
|
Web:FilesSelector Added restore action
|
2023-11-03 15:30:26 +05:00 |
|
|
|
248f0e80b2
|
Web: Added a mute icon in the room, added unmute when clicking on this icon.
|
2023-11-02 15:03:02 +03:00 |
|
mushka-n
|
da4c667afe
|
major code cleanup
|
2023-11-01 12:29:49 +03:00 |
|
|
|
f9dfc3954b
|
Merge branch 'release/v2.0.0' into feature/new-form-gallery
|
2023-10-31 18:18:20 +04:00 |
|
|
|
4262b23031
|
Merge pull request #57 from ONLYOFFICE/bugfix/icons
Bugfix/icons
|
2023-10-30 19:53:47 +04:00 |
|
|
|
febef31883
|
Merge branch 'release/v2.0.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.0.0
|
2023-10-30 17:56:55 +03:00 |
|
|
|
f5c62cbf87
|
Fixed oAuth redirect for opening inside thrid-party container
|
2023-10-30 17:56:44 +03:00 |
|
|
|
c3cd684a0d
|
Merge branch 'release/v2.0.0' into bugfix/icons
|
2023-10-30 18:34:09 +04:00 |
|
|
|
15547dedbb
|
Fix Bug 64908 - Accounts: Profile. The flag of Saudi Arabia is incorrectly specified when selecting the language.
|
2023-10-30 18:27:23 +04:00 |
|
|
|
a84cb1ca92
|
Fixed url for public room in manager mode, apply requestToken parameter
|
2023-10-30 15:46:22 +03:00 |
|
mushka-n
|
fed4bf3235
|
new empty info panel view + translation and styling fixes
|
2023-10-30 15:30:38 +03:00 |
|
mushka-n
|
bc9cbb44c2
|
Merge branch 'release/v2.0.0' into feature/new-form-gallery
|
2023-10-30 13:49:52 +03:00 |
|
|
|
5235b306e9
|
Fixed Bug 64897. Public room embedding not display if embedding via js-sdk
|
2023-10-30 11:59:46 +03:00 |
|
|
|
e0be82a102
|
Merge branch 'release/v2.0.0' into bugfix/icons
|
2023-10-30 12:05:09 +04:00 |
|
|
|
0043f7e5e4
|
Merge branch 'develop' into feature/management
|
2023-10-27 21:41:10 +03:00 |
|
Akmal Isomadinov
|
561f7e6793
|
Web:settings: Fixed the icons of the settings
|
2023-10-27 18:39:46 +05:00 |
|
Vladimir Khvan
|
8abea90a92
|
fix Bug 63907 | first name and last name validation was added
|
2023-10-27 18:12:01 +05:00 |
|
mushka-n
|
6ac7700678
|
merge release + merge fix
|
2023-10-27 15:10:43 +03:00 |
|
Akmal Isomadinov
|
2726113dc0
|
Web:Floating-Button Fixed icons and optimization
|
2023-10-26 18:51:31 +05:00 |
|
Akmal Isomadinov
|
5bd428ce16
|
Web:Modal: Fixed close icon
|
2023-10-26 17:33:16 +05:00 |
|
Akmal Isomadinov
|
8beadcea0d
|
Web:Badges Fixed convert icon
|
2023-10-26 16:58:40 +05:00 |
|
Akmal Isomadinov
|
472c15f629
|
Merge branch 'release/v2.0.0' into bugfix/icons
|
2023-10-26 16:04:44 +05:00 |
|
|
|
ef39f40c44
|
Fixed images for letters
|
2023-10-25 20:57:08 +03:00 |
|
Akmal Isomadinov
|
05ac738d55
|
Web:Article: Fixed the icon of the article menu button
|
2023-10-25 18:33:42 +05:00 |
|
Akmal Isomadinov
|
6743b6a2a5
|
Web:Client:Article: Fixed catalog icons
|
2023-10-25 18:01:39 +05:00 |
|
DmitrySychugov
|
fd250c57da
|
Merge branch 'develop' into feature/management
# Conflicts:
# packages/client/src/components/MainBar/index.js
# packages/client/src/components/NavMenu/index.js
# packages/common/components/Article/index.js
# packages/common/components/Article/sub-components/article-header.js
# packages/common/components/Article/sub-components/article-hide-menu-button.js
# packages/components/context-menu/index.js
# yarn.lock
|
2023-10-25 14:40:50 +05:00 |
|
Akmal Isomadinov
|
9ca10c1fcb
|
Web:Navigation: Fixed the add icon and fixed margin
|
2023-10-25 13:56:57 +05:00 |
|
mushka-n
|
5805f1b995
|
Merge branch 'release/v2.0.0' into feature/new-form-gallery
|
2023-10-20 11:09:31 +03:00 |
|
|
|
563e14d049
|
Web: Files: added copy icon for tablet view
|
2023-10-19 14:28:55 +03:00 |
|
mushka-n
|
65e809cd97
|
merge release + merge resolve
|
2023-10-18 14:26:12 +03:00 |
|
|
|
dfd68e1958
|
Merge pull request #23 from ONLYOFFICE/bugfix/pdf-viewer
Web:PDFViewer Fixed the script URL
|
2023-10-17 19:23:48 +04:00 |
|
Akmal Isomadinov
|
11d013f523
|
Web:PDFViewer Fixed the script URL
|
2023-10-17 20:16:17 +05:00 |
|
Viktor Fomin
|
2251c6f310
|
Merge branch 'develop' into feature/my-documents-share
|
2023-10-16 20:14:33 +03:00 |
|
Vladimir Khvan
|
ea7b067e7f
|
Merge branch 'develop' into 'feature/data-migration' | conflict components/paging/styled-paging.js
|
2023-10-16 20:09:10 +05:00 |
|
|
|
1f6e3aa3a3
|
Merge branch 'develop' into feature/room-primary-link
# Conflicts:
# packages/client/src/components/QuickButtons.js
# packages/client/src/components/panels/EditLinkPanel/index.js
|
2023-10-13 18:27:53 +03:00 |
|
|
|
bfda98546c
|
Merge pull request #9 from ONLYOFFICE/bugfix/ui
Bugfix/UI
|
2023-10-13 19:24:03 +04:00 |
|
|
|
c0ffc3b40e
|
Merge branch 'develop' into feature/redesign-letters
|
2023-10-12 16:17:00 +03:00 |
|
|
|
5eaa5b6108
|
Merge branch 'develop' into bugfix/ui
# Conflicts:
# packages/client/src/components/FilesSelector/FilesSelector.types.ts
# packages/client/src/components/FilesSelector/index.tsx
# packages/client/src/pages/Home/Section/Header/index.js
|
2023-10-11 19:50:58 +04:00 |
|
|
|
482cb80f9d
|
Fixed JS-SDK filter property
|
2023-10-11 17:07:41 +03:00 |
|
Akmal Isomadinov
|
ac13bb8303
|
Client: moved into common translation
|
2023-10-11 16:49:13 +05:00 |
|
|
|
0d4ec93dff
|
Web: Files: fixed link.react icon
|
2023-10-10 12:51:37 +03:00 |
|
|
|
4d11fd7140
|
Added new letters images
|
2023-10-06 12:20:00 +03:00 |
|
|
|
7fd66d88ff
|
Web: Files: added new icons
|
2023-10-05 15:41:19 +03:00 |
|
mushka-n
|
5ec8dec79e
|
merge new develop + merge changes
|
2023-10-05 11:23:00 +03:00 |
|
Akmal Isomadinov
|
b94f4908fd
|
Web:FormRoom Fixed icons
|
2023-10-05 12:29:06 +05:00 |
|
|
|
ebe62b7978
|
Web: Added translations.
|
2023-10-04 18:28:29 +03:00 |
|
Viktor Fomin
|
9b7d2081e7
|
Merge branch 'develop' into feature/my-documents-share
|
2023-10-04 18:28:28 +03:00 |
|
|
|
c43d8c891a
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# common/ASC.ActiveDirectory/Base/Data/LdapObjectExtension.cs
# common/ASC.ActiveDirectory/LdapUserManager.cs
# common/ASC.Api.Core/Model/EmployeeFullDto.cs
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Core/IUserService.cs
# common/ASC.Core.Common/Data/DbUserService.cs
# common/ASC.Core.Common/EF/Context/UserDbContext.cs
# common/ASC.Core.Common/Tenants/TenantUserQuotaSettings.cs
# common/ASC.Core.Common/Users/UserQuotaSettings.cs
# common/ASC.Data.Storage/BaseStorage.cs
# common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSessionHolder.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/IDataStore.cs
# common/ASC.Data.Storage/IQuotaController.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Data.Storage/StorageFactory.cs
# common/ASC.Data.Storage/TenantQuotaController.cs
# migrations/mysql/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
# packages/client/public/locales/en/Settings.json
# packages/client/src/components/FilesPanels/index.js
# packages/client/src/components/GlobalEvents/index.js
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
# packages/client/src/components/dialogs/index.js
# packages/client/src/pages/Home/InfoPanel/Body/helpers/DetailsHelper.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/mobileView.js
# packages/client/src/pages/PortalSettings/components/MobileCategoryWrapper.js
# packages/client/src/store/FilesActionsStore.js
# packages/client/src/store/FilesStore.js
# packages/client/src/store/PeopleStore.js
# packages/common/api/people/index.js
# packages/common/constants/index.js
# products/ASC.Files/Core/ApiModels/RequestDto/CreateRoomRequestDto.cs
# products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.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/DbFolder.cs
# products/ASC.Files/Core/Core/Entries/File.cs
# products/ASC.Files/Core/Core/Entries/FileEntry.cs
# products/ASC.Files/Core/Core/Entries/Folder.cs
# products/ASC.Files/Core/Core/Entries/OrderBy.cs
# products/ASC.Files/Core/Core/Entries/Tag.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/UsersQuotaSyncOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Utils/ChunkedUploadSessionHolder.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Server/Api/VirtualRoomsController.cs
# products/ASC.People/Server/Api/UserController.cs
# public/locales/en/Common.json
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Api/ApiModels/RequestsDto/QuotaSettingsRequestsDto.cs
# web/ASC.Web.Api/ApiModels/ResponseDto/QuotaDto.cs
# web/ASC.Web.Api/Core/QuotaHelper.cs
# web/ASC.Web.Core/PublicResources/Resource.Designer.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
|
2023-10-04 16:56:49 +03:00 |
|
|
|
477976da29
|
Revert "Merge branch 'develop' into feature/oauth2-client"
This reverts commit 9d93525a91.
|
2023-10-04 16:10:13 +03:00 |
|
|
|
148def0bb5
|
Merge branch 'develop' into feature/data-migration
|
2023-10-04 15:23:34 +03:00 |
|
|
|
e091dff386
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-client into develop
|
2023-10-04 15:08:14 +03:00 |
|
DmitrySychugov
|
2fc16bc9ec
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/management
# Conflicts:
# build/build.backend.docker.ps1
# build/build.backend.docker.sh
# build/build.static.bat
# build/clear.backend.docker.ps1
# build/clear.backend.docker.sh
# build/install/docker/Dockerfile
# build/install/docker/Dockerfile.runtime
# build/install/docker/config/nginx/templates/upstream.conf.template
# build/install/docker/docspace.overcome.yml
# build/install/docker/docspace.profiles.yml
# build/start/start.backend.docker.ps1
# build/start/start.backend.docker.sh
# common/ASC.Api.Core/Security/EmailValidationKeyModelHelper.cs
# common/ASC.Core.Common/Caching/CachedTenantService.cs
# common/ASC.Core.Common/Core/TenantRegistrationInfo.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
# common/ASC.Data.Backup.Core/Contracts/BackupServiceModel.cs
# common/ASC.Data.Backup.Core/EF/Model/BackupSchedule.cs
# common/ASC.Data.Backup.Core/IntegrationEvents/Events/BackupRequestIntegrationEvent.cs
# common/ASC.Data.Backup.Core/Service/BackupService.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
# common/services/ASC.ApiSystem/ASC.ApiSystem.csproj
# common/services/ASC.ApiSystem/Classes/CommonMethods.cs
# common/services/ASC.ApiSystem/Controllers/PortalController.cs
# common/services/ASC.ApiSystem/Controllers/SettingsController.cs
# common/services/ASC.ApiSystem/GlobalUsings.cs
# common/services/ASC.ApiSystem/Models/SettingsModel.cs
# common/services/ASC.ApiSystem/Startup.cs
# common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupRequestedIntegrationEventHandler.cs
# common/services/ASC.Data.Backup/Api/BackupController.cs
# common/services/ASC.Data.Backup/ApiModels/BackupDto.cs
# common/services/ASC.Data.Backup/ApiModels/BackupScheduleDto.cs
# common/services/ASC.Data.Backup/GlobalUsings.cs
# config/nginx/onlyoffice.conf
# migrations/mysql/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
# migrations/postgre/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
# package.json
# packages/client/package.json
# packages/client/src/pages/Confirm/sub-components/auth.js
# packages/client/src/pages/PortalSettings/categories/common/Branding/whitelabel.js
# packages/client/src/pages/PortalSettings/categories/common/branding.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/index.js
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/index.js
# packages/client/src/store/ProfileActionsStore.js
# packages/common/api/index.js
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Api/Api/Settings/StorageController.cs
# web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
# web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
# web/ASC.Web.Core/Utility/TenantExtra.cs
# yarn.lock
|
2023-10-04 16:27:12 +05:00 |
|
|
|
bb43dc825c
|
Clear wrongPortalNameUrl (docker issues)
|
2023-10-04 14:50:54 +04:00 |
|
|
|
9d93525a91
|
Merge branch 'develop' into feature/oauth2-client
|
2023-10-04 13:24:59 +03:00 |
|
Vladimir Khvan
|
f261968e95
|
Merge branch 'develop' into feature/data-migration
# Conflicts:
# ASC.Web.sln
# ASC.Web.slnf
# common/ASC.Common/Threading/DistributedTaskProgress.cs
# common/ASC.Data.Storage/DataOperators/DataOperatorFactory.cs
# common/ASC.Data.Storage/DataOperators/IDataOperator.cs
# common/ASC.Data.Storage/DataOperators/ReadOperators/BaseReadOperator.cs
# common/ASC.Data.Storage/DataOperators/ReadOperators/TarReadOperator.cs
# common/ASC.Data.Storage/DataOperators/ReadOperators/ZipReadOperator.cs
# common/ASC.Migration/ASC.Migration.Core.csproj
# common/ASC.Migration/Core/AbstractMigration.cs
# common/ASC.Migration/Core/IMigration.cs
# common/ASC.Migration/Core/ImportableEntity.cs
# common/ASC.Migration/Core/MigrationIntegrationEvent.cs
# common/ASC.Migration/Core/MigrationIntegrationEventHandler.cs
# common/ASC.Migration/Core/MigrationLogger.cs
# common/ASC.Migration/Core/MigrationParseIntegrationEvent.cs
# common/ASC.Migration/Core/Models/Api/ImportableApiEntity.cs
# common/ASC.Migration/Core/Models/Api/MigratingApiFiles.cs
# common/ASC.Migration/Core/Models/Api/MigratingApiGroup.cs
# common/ASC.Migration/Core/Models/Api/MigratingApiUser.cs
# common/ASC.Migration/Core/Models/Api/MigrationApiInfo.cs
# common/ASC.Migration/Core/Models/Api/MigrationCore.cs
# common/ASC.Migration/Core/Models/Api/MigratorMeta.cs
# common/ASC.Migration/Core/Models/MigratingFiles.cs
# common/ASC.Migration/Core/Models/MigratingUser.cs
# common/ASC.Migration/Core/Models/MigrationInfo.cs
# common/ASC.Migration/Core/Providers/ASC/Models/Parse/WorkspaceFiles.cs
# common/ASC.Migration/Core/Providers/ASC/Models/Parse/WorkspaceUser.cs
# common/ASC.Migration/Core/Providers/ASC/Models/WorkspaceMigrationInfo.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/GoogleWorkspaceMigration.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/Models/GWSMigratingFiles.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/Models/GWSMigratingUser.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/Models/GWSMigrationInfo.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/NCMigratingFiles.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/NCMigratingUser.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/NCMigrationInfo.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/Parse/NCUser.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/NextcloudWorkspaceMigration.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/OCMigratingFiles.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/OCMigratingUser.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/OCMigrationinfo.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/Parse/OCUser.cs
# common/ASC.Migration/Core/Providers/OwnCloud/OwnCloudMigration.cs
# common/ASC.Migration/GlobalUsings.cs
# common/ASC.Migration/Resources/MigrationResource.Designer.cs
# common/ASC.Migration/Resources/MigrationResource.resx
# config/nginx/onlyoffice.conf
# config/storage.json
# packages/client/src/components/dialogs/index.js
# packages/client/src/store/index.js
# products/ASC.Files/Core/Core/CountRoomFeature.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Startup.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/ApiModels/RequestsDto/FinishDto.cs
# web/ASC.Web.Api/ApiModels/ResponseDto/MigrationStatusDto.cs
# web/ASC.Web.Api/GlobalUsings.cs
# web/ASC.Web.Api/Startup.cs
# web/ASC.Web.Studio/ASC.Web.Studio.csproj
# web/ASC.Web.Studio/GlobalUsings.cs
# web/ASC.Web.Studio/IntegrationEvents/RemovePortalIntegrationEventHandler.cs
# web/ASC.Web.Studio/Program.cs
# web/ASC.Web.Studio/Startup.cs
|
2023-10-04 14:53:18 +05:00 |
|
Akmal Isomadinov
|
bdddc705bb
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# products/ASC.Files/Core/ApiModels/RequestDto/CreateRoomRequestDto.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Entries/Folder.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/FilterTypeEnum.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyProviderDao.cs
# products/ASC.Files/Server/Api/VirtualRoomsController.cs
# products/ASC.Files/Core/Helpers/DocSpaceHelper.cs
|
2023-10-04 14:34:03 +05:00 |
|
Viktor Fomin
|
f6f3369b8a
|
Merge branch 'develop' into feature/my-documents-share
|
2023-10-02 12:21:15 +03:00 |
|
Viktor Fomin
|
524d1d15f4
|
Web: add icon
|
2023-10-02 12:18:23 +03:00 |
|
|
|
1e8fac378c
|
Web:Client:Plugin: apply new layouts, add delete dialog
|
2023-09-29 15:32:27 +03:00 |
|
|
|
f778106bc4
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-29 10:36:07 +03:00 |
|
Viktor Fomin
|
7a3f743260
|
Web: change images
|
2023-09-28 22:53:34 +03:00 |
|
Viktor Fomin
|
bbdf7f8db7
|
Web: add icon
|
2023-09-28 18:50:29 +03:00 |
|
Elyor Djalilov
|
3116c25d9f
|
Merge branch 'develop' into feature/data-migration
|
2023-09-28 18:17:38 +05:00 |
|
Akmal Isomadinov
|
ec45eebb88
|
Web:FormRoom: Added empty screen
|
2023-09-28 17:21:07 +05:00 |
|
|
|
10f9c009ba
|
Web: Added translation.
|
2023-09-28 14:30:14 +03:00 |
|
|
|
5ba9cf0dc2
|
Web: Added sorting for the users module.
|
2023-09-27 16:51:11 +03:00 |
|
Viktor Fomin
|
8d606c78e7
|
Web: delete useless
|
2023-09-27 14:15:47 +03:00 |
|
Akmal Isomadinov
|
bf05f042da
|
Web: Added icons
|
2023-09-27 13:15:44 +05:00 |
|
|
|
4faaacf6e2
|
Web: Added toastr.
|
2023-09-27 10:56:31 +03:00 |
|
Elyor Djalilov
|
7a4e734699
|
added empty screen
|
2023-09-26 13:40:12 +05:00 |
|
|
|
38c4281383
|
Web: Added filter to rooms module.
|
2023-09-25 21:29:11 +03:00 |
|
|
|
796cbf3265
|
Merge branch 'develop' into feature/room-share-optimization
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2023-09-25 15:58:53 +03:00 |
|
mushka-n
|
10f8b0e00a
|
Merge branch 'develop' into feature/new-form-gallery
|
2023-09-25 14:25:46 +03:00 |
|
|
|
b14d6c8ef0
|
Merge branch 'hotfix/v1.1.3' into develop
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Core/ITenantService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
# config/appsettings.json
# config/nlog.config
# migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs
# packages/client/src/pages/Confirm/sub-components/createUser.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
# packages/common/components/MoreLoginModal/index.tsx
# packages/login/src/client/components/sub-components/LoginForm.tsx
# products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Core/CspSettingsHelper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# yarn.lock
|
2023-09-25 10:53:06 +03:00 |
|
|
|
fd383577a0
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-25 08:53:04 +03:00 |
|
Akmal Isomadinov
|
d70c057848
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
|
2023-09-25 10:40:22 +05:00 |
|
mushka-n
|
a843a45b09
|
merge develop + merge fix
|
2023-09-23 23:52:51 +03:00 |
|
mushka-n
|
6cbb1cce34
|
implemented new localization structure + after-merge fixes
|
2023-09-22 18:38:37 +03:00 |
|
|
|
4048d8dc82
|
Web: removed useless translation key ResetButton
|
2023-09-22 17:21:24 +04:00 |
|
|
|
8371330d3c
|
Web: Applied new design
|
2023-09-22 16:39:08 +04:00 |
|
|
|
5dab788680
|
Web: Files: InfoPanel: added infinite-loader to members list
|
2023-09-22 15:10:48 +03:00 |
|
Akmal Isomadinov
|
9cf396fbf7
|
Web: Added a form room icon
|
2023-09-21 19:29:53 +05:00 |
|
|
|
203fdc0695
|
public: api js polyfill
|
2023-09-21 14:41:11 +03:00 |
|
|
|
70b5c6e111
|
MErge branch 'develop' into feature/web-plugins
|
2023-09-21 14:30:04 +03:00 |
|
Elyor Djalilov
|
94685e3794
|
Merge branch 'develop' into feature/data-migration
# Conflicts:
# common/ASC.Data.Storage/DataOperators/WriteOperators/ZipWriteOperator.cs
# packages/client/public/locales/en/Settings.json
# packages/client/public/locales/ru/Settings.json
# packages/client/src/store/DialogsStore.js
# packages/client/src/store/index.js
# products/ASC.People/Server/Startup.cs
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2023-09-21 15:30:39 +05:00 |
|
|
|
44dbeb48cd
|
Merge branch 'develop' into feature/document-service-location
|
2023-09-21 13:38:25 +04:00 |
|
|
|
9c9f33cf12
|
Merge pull request #1746 from ONLYOFFICE/feature/split-invite
Feature/split invite
|
2023-09-20 19:46:48 +04:00 |
|
Viktor Fomin
|
c0d87940f0
|
Web: move ExpiredLink translate to Common
|
2023-09-20 17:35:38 +03:00 |
|
gazizova-vlada
|
69961e6900
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-20 17:19:12 +03:00 |
|
gazizova-vlada
|
183b32c2aa
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-20 16:27:26 +03:00 |
|
|
|
21b011cdfb
|
Web: Added translation.
|
2023-09-20 16:12:06 +03:00 |
|
|
|
bdabb35e55
|
Merge branch 'feature/leave-room' of github.com:ONLYOFFICE/AppServer into feature/leave-room
# Conflicts:
# public/locales/en/Common.json
|
2023-09-20 15:03:02 +03:00 |
|
|
|
940338fd9d
|
Web: Files: Leave-room: bugs fixed
|
2023-09-20 15:02:34 +03:00 |
|
|
|
b25b39da14
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-20 14:55:39 +03:00 |
|
|
|
3d20697ac0
|
Web: Translation: Fix UTC key duplication + sorting
|
2023-09-20 15:36:34 +04:00 |
|
gazizova-vlada
|
cc31a46cb9
|
Web:Fix common.
|
2023-09-20 12:53:29 +03:00 |
|
|
|
3a1bf92291
|
Merge branch 'develop' into feature/leave-room
|
2023-09-20 13:20:56 +04:00 |
|
|
|
e356f361f3
|
Merge pull request #1757 from ONLYOFFICE/feature/rtl-cron
Feature/rtl cron
|
2023-09-20 13:10:36 +04:00 |
|
Akmal Isomadinov
|
c1983fcfa6
|
Web:Cron Added translation
|
2023-09-20 13:34:26 +05:00 |
|
mushka-n
|
693a1bf02b
|
merge with develop (and submit-to-form-gallery)
|
2023-09-19 16:42:56 +03:00 |
|
|
|
bf48ce5393
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-19 14:02:42 +03:00 |
|
mushka-n
|
2b58726b86
|
Merge branch 'develop' into feature/new-form-gallery
|
2023-09-19 12:02:57 +03:00 |
|
|
|
ca76336fc3
|
Merge branch 'develop' into feature/leave-room
|
2023-09-19 10:44:07 +03:00 |
|
Vlada Gazizova
|
3471bbf09f
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-19 09:54:45 +03:00 |
|
|
|
d364748d84
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-19 09:23:13 +03:00 |
|
|
|
91ae0883e9
|
Web:Client:Plugins: fix plugin dialog
|
2023-09-19 08:58:48 +03:00 |
|
mushka-n
|
d98680b350
|
moved translations and updated selector
|
2023-09-18 17:10:16 +03:00 |
|
gazizova-vlada
|
34a7c068a7
|
Web:Client:Add onStartAgain, onTerminate.
|
2023-09-18 16:55:03 +03:00 |
|
|
|
74f9ea784b
|
Merge branch 'develop' into feature/submit-to-form-gallery
|
2023-09-18 16:31:27 +04:00 |
|
|
|
33091f9304
|
Web: Client: fix long text in copy button
|
2023-09-18 12:55:29 +02:00 |
|
|
|
95424d49f9
|
Web: Added ru translations + autofixes
|
2023-09-18 14:17:00 +04:00 |
|
mushka-n
|
da7aec7445
|
Merge branch 'develop' into feature/submit-to-form-gallery
|
2023-09-18 13:06:39 +03:00 |
|
|
|
0deac4bf00
|
Merge branch 'develop' into feature/mobile-sdk
|
2023-09-18 13:45:20 +04:00 |
|
|
|
35de42a262
|
Merge pull request #1739 from ONLYOFFICE/feature/version-error
feature/version-error
|
2023-09-18 13:01:24 +04:00 |
|
|
|
00c3d8a367
|
Merge branch 'develop' into feature/leave-room
# Conflicts:
# public/locales/en/Common.json
|
2023-09-15 18:46:34 +03:00 |
|
Viktor Fomin
|
15e58aa3c7
|
Web: add translates
|
2023-09-15 18:32:09 +03:00 |
|
|
|
9b5572552e
|
Web: Fix ru translations
|
2023-09-15 18:28:31 +04:00 |
|
|
|
d25e3e3d42
|
Web:Client:Plugins: add context menu item for all plugin actions, add opportunity change UNKNOWN file type and file.svg icon
|
2023-09-15 13:55:41 +03:00 |
|
|
|
e26bcc6ee2
|
Web:Client:Plugins: update list of plugins at portal settings, change settings plugin dialog
|
2023-09-14 18:27:37 +03:00 |
|
Viktor Fomin
|
2f6861f43f
|
Web: add translates
|
2023-09-14 14:42:46 +03:00 |
|
Viktor Fomin
|
4c56f2d047
|
Web: add apple icon
|
2023-09-14 14:32:01 +03:00 |
|
DmitrySychugov
|
df18d6435f
|
Public: added a parameter to check the domain in config
|
2023-09-13 18:56:39 +05:00 |
|
|
|
7e4f102620
|
Web: Added display of error about outdated version of DesktopEditors on Linux.
|
2023-09-12 18:04:46 +03:00 |
|
|
|
675590854c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-data
# Conflicts:
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs
# products/ASC.People/Server/Api/UserController.cs
|
2023-09-12 15:18:27 +03:00 |
|
mushka-n
|
b657d3731b
|
merge develop + merge fix
|
2023-09-12 02:13:05 +03:00 |
|
mushka-n
|
95e3bc8f36
|
merge develop + merge fix
|
2023-09-11 13:52:47 +03:00 |
|
mushka-n
|
d96911a37c
|
merge develop + merge fix
|
2023-09-11 13:26:58 +03:00 |
|
|
|
1f77cf82a2
|
Merge branch 'develop' into feature/leave-room
|
2023-09-11 13:28:56 +04:00 |
|
|
|
14e080abb6
|
Web: Cron: Added ru language
|
2023-09-11 13:16:39 +04:00 |
|
|
|
21fd5aa9d5
|
Merge branch 'develop' into feature/cron
|
2023-09-11 12:34:41 +04:00 |
|
|
|
0931a28a2f
|
Web: Client: add mobile version of sdk
|
2023-09-08 23:19:47 +02:00 |
|
|
|
3ac5d9159a
|
Merge branch 'develop' into feature/new-for-client
|
2023-09-08 18:51:06 +04:00 |
|
Elyor Djalilov
|
3fc19b5563
|
added warning on upload unsupported file
|
2023-09-08 19:48:04 +05:00 |
|
|
|
9700edd0cb
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/public/locales/en/Settings.json
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
# packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# packages/client/src/pages/PortalSettings/categories/security/StyledSecurity.js
# packages/client/src/store/PeopleStore.js
# packages/common/api/settings/index.js
# packages/components/themes/base.js
# packages/components/themes/dark.js
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
|
2023-09-08 10:30:53 +03:00 |
|
|
|
675755aedd
|
Merge remote-tracking branch 'remotes/origin/hotfix/v1.1.3' into develop
|
2023-09-08 09:46:59 +03:00 |
|
mushka-n
|
e1d989c6d2
|
merge develop + merge fix
|
2023-09-08 03:27:39 +03:00 |
|
|
|
db3f75c78b
|
added translations
|
2023-09-07 18:40:17 +03:00 |
|
|
|
c00645554b
|
Web: SDK: Fixed setting base locale
|
2023-09-07 15:32:54 +03:00 |
|
Akmal Isomadinov
|
2ba6366f29
|
Merge branch 'develop' into feature/cron
|
2023-09-07 16:43:58 +05:00 |
|
Akmal Isomadinov
|
096e3dd687
|
Web:Cron Fixed translations
|
2023-09-07 16:40:45 +05:00 |
|
Viktor Fomin
|
b595a62a43
|
Merge branch 'develop' into feature/management
|
2023-09-07 13:48:59 +03:00 |
|
Elyor Djalilov
|
5384062ad0
|
Merge branch 'develop' into feature/data-migration
|
2023-09-07 15:40:07 +05:00 |
|
|
|
c29f577df6
|
Merge branch 'develop' into feature/adding-new_ru
|
2023-09-07 14:10:20 +04:00 |
|
gazizova-vlada
|
b224b1bb8f
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-06 13:00:15 +03:00 |
|
|
|
86257bb8da
|
Web: SDK: Added onAuthSuccess event
|
2023-09-06 12:22:41 +03:00 |
|
Vladimir Khvan
|
07519d4109
|
Merge branch 'develop' into feature/data-migration
|
2023-09-06 12:33:23 +05:00 |
|
Viktor Fomin
|
3668d75450
|
Merge branch 'develop' into feature/management
|
2023-09-05 18:34:41 +03:00 |
|
|
|
96b916d81e
|
Merge branch 'hotfix/v1.1.3' into develop
|
2023-09-05 09:45:42 +04:00 |
|
|
|
761765cd2b
|
Web: SDK: Allow calling framesdk function on editor.requestClose
|
2023-09-04 16:52:44 +03:00 |
|
|
|
d3198671ba
|
Merge remote-tracking branch 'remotes/origin/hotfix/v1.1.3' into feature/zoom-login
# Conflicts:
# packages/common/constants/index.js
|
2023-09-04 16:38:06 +03:00 |
|
|
|
613938b819
|
Web: Added Zoom login button, translates and icons
|
2023-09-04 16:06:55 +03:00 |
|
|
|
f406e9eb3d
|
Web: Added check for userAgent of Zoom app
|
2023-09-04 15:40:03 +04:00 |
|
|
|
f40940f73c
|
Web: Added new editor.requestClose param to client config
(cherry picked from commit 70a18018c3104f9d400fa53a57f37eb9bdbc6d71)
|
2023-09-04 13:52:32 +03:00 |
|
|
|
b911f0aa19
|
Web: Added new config option window.DocSpaceConfig?.editor?.openOnNewPage (fix zoom client issues)
(cherry picked from commit ff25c784dee494bd29444f80ca1267248e13c41b)
|
2023-09-04 13:52:32 +03:00 |
|
|
|
c1bf6bf308
|
added new texts ru
|
2023-09-04 12:57:19 +03:00 |
|
|
|
5730a393f0
|
Merge branch 'develop' into feature/management
|
2023-09-04 12:23:29 +04:00 |
|
Vladimir Khvan
|
d24faf9716
|
Merge branch 'develop' into feature/data-migration
|
2023-09-04 13:21:56 +05:00 |
|
|
|
efdd42f8f6
|
Merge branch 'develop' into feature/rtl-interface-client
|
2023-09-01 15:30:48 +02:00 |
|
|
|
3e6a417d19
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
# migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs
# packages/client/src/components/panels/SelectFileDialog/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/ButtonComponent.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js
# packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js
# packages/client/src/store/ProfileActionsStore.js
# packages/common/api/files/index.js
# packages/common/store/AuthStore.js
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# yarn.lock
|
2023-09-01 15:33:39 +03:00 |
|
|
|
19a1c80a5f
|
edited ar language name
|
2023-08-30 15:39:37 +03:00 |
|
|
|
c9f22f83b6
|
added new translations
|
2023-08-30 15:23:58 +03:00 |
|
|
|
2b7f5fe64d
|
Web: rtl test translation tags
|
2023-08-30 13:19:18 +02:00 |
|
Vladimir Khvan
|
67d00bdbbc
|
translations were added
|
2023-08-30 15:19:49 +05:00 |
|
|
|
5e79ebe967
|
Added new language (ar-SA)
|
2023-08-30 12:03:34 +04:00 |
|
|
|
c18dfe8434
|
added new translations
|
2023-08-29 21:05:00 +03:00 |
|
Subhonbek
|
087711acc8
|
Merge branch 'develop' into feature/rtl-interface-client
|
2023-08-29 12:41:12 +03:00 |
|
Viktor Fomin
|
d2b1769e6f
|
Web: add translates
|
2023-08-29 11:44:27 +03:00 |
|
Viktor Fomin
|
1904e3bc43
|
Fix Bug 63467: auth via Microsoft is not available
|
2023-08-29 06:26:37 +03:00 |
|
|
|
bc6b0d9e0d
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# common/ASC.Core.Common/ASC.Core.Common.csproj
# common/ASC.Core.Common/Billing/ITariffService.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Core.Common/Notify/EmailSenderSink.cs
# common/ASC.Core.Common/Notify/JabberSenderSink.cs
# common/ASC.Core.Common/Notify/PushSenderSink.cs
# common/ASC.Core.Common/Notify/Telegram/TelegramSenderSink.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/Tools/ASC.Migration.Creator/ASC.Migration.Creator.csproj
# migrations/mysql/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
# migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.cs
# migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/mysql/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
# migrations/mysql/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
# migrations/mysql/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
# migrations/mysql/SaaS/WebhooksDbContext/WebhooksDbContextModelSnapshot.cs
# migrations/mysql/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
# migrations/postgre/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
# migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/postgre/SaaS/CustomDbContext/CustomDbContextModelSnapshot.cs
# migrations/postgre/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
# migrations/postgre/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
# migrations/postgre/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
# migrations/postgre/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
# packages/client/src/helpers/constants.js
# packages/client/src/pages/Files.jsx
# packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/backup-list/index.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/client/src/pages/PortalSettings/categories/security/index.js
# packages/client/src/pages/Profile/Section/Header/index.js
# packages/common/store/SettingsStore.js
# packages/components/drop-down/index.js
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Server/Api/FoldersController.cs
# products/ASC.Files/Server/Api/SecurityController.cs
# products/ASC.Files/Server/Api/SettingsController.cs
# products/ASC.Files/Server/Api/TagsController.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/FeedController.cs
# web/ASC.Web.Api/Api/PaymentsController.cs
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/SecurityController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Api/Core/DnsSettings.cs
# web/ASC.Web.Api/Core/FirstTimeTenantSettings.cs
# web/ASC.Web.Api/GlobalUsings.cs
# web/ASC.Web.Core/CookiesManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
# yarn.lock
|
2023-08-28 18:53:10 +03:00 |
|
|
|
be7034b296
|
added ar Common.json
|
2023-08-28 13:27:47 +03:00 |
|
|
|
245325c563
|
added translations hy, ro
|
2023-08-25 13:40:27 +03:00 |
|
|
|
e24755cbf4
|
added translations
|
2023-08-25 12:44:50 +03:00 |
|
|
|
4b4b4f747f
|
added translations
|
2023-08-25 11:52:45 +03:00 |
|
Elyor Djalilov
|
304a9b187f
|
added dark theme
|
2023-08-24 20:37:02 +05:00 |
|
Mushka Nikita
|
dee06aa519
|
Merge branch 'develop' into feature/new-form-gallery
|
2023-08-23 00:57:25 +03:00 |
|
Mushka Nikita
|
fe88c657de
|
merge develop + merge bugfix
|
2023-08-22 03:25:02 +03:00 |
|
Mushka Nikita
|
c148a8f55a
|
finised client-side, provided functionality for sort, locale and category filters. ip for category and search filters
|
2023-08-22 00:30:34 +03:00 |
|
|
|
f4c9338c07
|
Fix bug 63646 - Added a message when reaching the limit of paid users by invitation link.
|
2023-08-21 13:30:49 +03:00 |
|
Vladimir Khvan
|
29e4d708d5
|
Merge branch 'develop' into feature/data-migration
|
2023-08-18 17:30:30 +05:00 |
|
|
|
640fa2e5a5
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
# products/ASC.People/Server/Api/UserController.cs
|
2023-08-15 13:16:14 +03:00 |
|
Viktor Fomin
|
453b0ef741
|
Merge branch 'develop' into feature/management
|
2023-08-14 13:29:07 +03:00 |
|
|
|
148c0bfde7
|
Web: Added ability to set default quota in section header of accounts.
|
2023-08-14 13:01:49 +03:00 |
|
|
|
084deba6c8
|
Web: Added ability to disable quota in section header of accounts.
|
2023-08-14 12:46:50 +03:00 |
|
|
|
45e4d78273
|
Web: Added ability to change quota in section header of accounts, refactoring.
|
2023-08-14 12:04:27 +03:00 |
|
|
|
493c16f5af
|
Merge branch 'develop' into feature/leave-room
|
2023-08-11 15:21:18 +03:00 |
|
Elyor Djalilov
|
f542baeae3
|
added group menu items
|
2023-08-11 17:10:56 +05:00 |
|
|
|
e531654c54
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# build/build.backend.docker.ps1
# build/build.backend.docker.sh
# common/ASC.Api.Core/ASC.Api.Core.csproj
# common/ASC.Common/ASC.Common.csproj
# common/ASC.Core.Common/Context/SecurityContext.cs
# common/ASC.Data.Backup.Core/Tasks/Modules/RoomLogosModuleSpecifics.cs
# common/ASC.EventBus.RabbitMQ/ASC.EventBus.RabbitMQ.csproj
# common/ASC.EventBus.RabbitMQ/DefaultRabbitMQPersistentConnection.cs
# config/nginx/onlyoffice.conf
# packages/client/src/components/panels/InvitePanel/sub-components/AccessSelector.js
# packages/client/src/pages/AccountsHome/Section/Filter/index.js
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/common/api/files/index.js
# packages/components/.storybook/preview.js
# packages/components/package.json
# packages/editor/src/server/lib/helpers/index.js
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Server/Api/OperationController.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# yarn.lock
|
2023-08-11 12:47:44 +03:00 |
|
|
|
3f6aa66d33
|
Web: SDK: Added init frame on load script
|
2023-08-10 15:29:18 +03:00 |
|
|
|
f13e9eaca7
|
Merge branch 'develop' into feature/management
|
2023-08-09 12:28:25 +03:00 |
|
gazizova-vlada
|
9d4db20180
|
Merge branch 'develop' into feature/reassign-data
|
2023-08-08 11:39:24 +03:00 |
|
gazizova-vlada
|
34553e8c7d
|
Web:Client:Add translation.
|
2023-08-08 11:20:24 +03:00 |
|
|
|
1c5088c6eb
|
Merge branch 'develop' into feature/leave-room
|
2023-08-07 18:02:49 +04:00 |
|
Elyor Djalilov
|
4d493fbc6b
|
Merge branch 'develop' into feature/data-migration
|
2023-08-07 17:15:04 +05:00 |
|
|
|
638807a0e0
|
Merge branch 'develop' into feature/deep-link
|
2023-08-04 19:01:14 +04:00 |
|
Elyor Djalilov
|
b3826eedff
|
Merge branch 'develop' into feature/data-migration
|
2023-08-04 11:46:43 +05:00 |
|
Akmal Isomadinov
|
42eb301dbc
|
Web: Removed old fonts
|
2023-08-03 19:47:52 +05:00 |
|
Akmal Isomadinov
|
5440824b38
|
Web:Added new fonts open sans v35
|
2023-08-03 19:44:53 +05:00 |
|
|
|
62801e136a
|
Merge branch 'hotfix/v1.1.2' into bugfix/bug-63501
|
2023-08-02 18:12:31 +04:00 |
|
Akmal Isomadinov
|
065a4b1aa3
|
Web:Fixed bug 63501
|
2023-08-02 18:39:02 +05:00 |
|
Viktor Fomin
|
27a4814c76
|
Web: add translate
|
2023-08-02 12:10:43 +03:00 |
|
Viktor Fomin
|
89b8673f99
|
Merge branch 'develop' into feature/management
|
2023-08-02 11:26:54 +03:00 |
|
|
|
12558b8520
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# packages/client/src/components/Article/Body/index.js
# packages/client/src/components/panels/OperationsPanel/index.js
# packages/client/src/pages/About/AboutContent.js
# packages/client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
# yarn.lock
|
2023-08-01 17:56:22 +03:00 |
|
Viktor Fomin
|
ae61e11974
|
Merge branch 'develop' into feature/management
|
2023-08-01 16:16:28 +03:00 |
|
|
|
51fb13d035
|
Merge branch 'master' into develop
# Conflicts:
# packages/client/src/pages/Files.jsx
# packages/common/components/Navigation/Navigation.js
# packages/common/components/Navigation/sub-components/control-btn.js
# packages/common/components/Navigation/sub-components/plus-btn.js
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Server/Api/OperationController.cs
# yarn.lock
|
2023-08-01 14:39:31 +03:00 |
|
|
|
ea40ba3738
|
Web: Added error on empty files list on OperationPanel
|
2023-08-01 13:31:58 +04:00 |
|
Elyor Djalilov
|
a6e5b7a3dc
|
added cancel upload dialog
|
2023-07-31 16:39:14 +05:00 |
|
Elyor Djalilov
|
75b01cda79
|
Merge branch 'develop' into feature/data-migration
# Conflicts:
# packages/client/public/locales/en/Settings.json
# packages/client/public/locales/ru/Settings.json
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/utils/settingsTree.js
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2023-07-31 13:34:12 +05:00 |
|
Viktor Fomin
|
a3ff3954e4
|
Web: add translation
|
2023-07-29 19:03:46 +03:00 |
|
Mushka Nikita
|
30066705c5
|
Merge branch 'develop' into feature/document-service-location
|
2023-07-27 15:36:17 +03:00 |
|
Viktor Fomin
|
9b015e0860
|
Merge branch 'develop' into feature/management
|
2023-07-26 18:29:38 +03:00 |
|
Elyor Djalilov
|
0da183728b
|
added other steps
|
2023-07-26 16:49:47 +05:00 |
|
|
|
7d727e0842
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/src/components/dialogs/index.js
# packages/client/src/components/panels/UploadPanel/index.js
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/store/FilesActionsStore.js
# packages/client/src/store/FilesStore.js
|
2023-07-25 13:01:21 +03:00 |
|
Viktor Fomin
|
09a50c84a5
|
Merge branch 'develop' into feature/deep-link
|
2023-07-25 12:54:36 +03:00 |
|
|
|
b90bfda75c
|
Merge branch 'develop' into feature/leave-room
# Conflicts:
# packages/client/src/store/FilesStore.js
|
2023-07-25 12:37:24 +03:00 |
|
Mushka Nikita
|
a7dab5df0b
|
Merge branch 'develop' into feature/document-service-location
|
2023-07-25 12:11:39 +03:00 |
|
Viktor Fomin
|
68c16d5a30
|
Web: add icons
|
2023-07-25 11:56:17 +03:00 |
|
|
|
800a5e3ccf
|
Web: SDK: Fixed property name
|
2023-07-24 16:13:53 +03:00 |
|
|
|
ab472b0148
|
Merge branch 'master' into develop
# Conflicts:
# .gitignore
# build/install/docker/Dockerfile.dev
# build/install/docker/build.dev.yml
# build/install/docker/docspace.dev.yml
# build/install/win/DocSpace.aip
# common/ASC.ActiveDirectory/Base/DbHelper.cs
# common/ASC.Api.Core/Model/EmployeeDto.cs
# common/ASC.Core.Common/Billing/ITariffService.cs
# common/ASC.Core.Common/Billing/License/LicenseReader.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Core.Common/Messaging/MessagesContext.cs
# common/ASC.Core.Common/Tenants/TenantCookieSettings.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/IQuotaController.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/Tools/ASC.Migration.Creator/ASC.Migration.Creator.csproj
# common/Tools/ASC.Migration.Runner/ASC.Migration.Runner.csproj
# common/Tools/ASC.Migration.Runner/GlobalUsings.cs
# common/Tools/ASC.Migration.Runner/MigrationRunner.cs
# common/Tools/ASC.Migration.Runner/Program.cs
# common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs
# common/Tools/ASC.Migrations.Core/Models/ConfigurationInfo.cs
# common/Tools/ASC.Migrations.Core/Utils/DbContextActivator.cs
# common/services/ASC.ClearEvents/Services/ClearEventsService.cs
# common/services/ASC.ElasticSearch/Core/SearchSettings.cs
# common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
# config/nginx/onlyoffice.conf
# migrations/mysql/ASC.Migrations.MySql.csproj
# migrations/mysql/SaaS/AccountLinkContext/20221019144349_AccountLinkContextMigrate.Designer.cs
# migrations/mysql/SaaS/AccountLinkContext/20221019144349_AccountLinkContextMigrate.cs
# migrations/mysql/SaaS/AccountLinkContext/AccountLinkContextModelSnapshot.cs
# migrations/mysql/SaaS/BackupsContext/20230130103901_BackupsContextMigrate.Designer.cs
# migrations/mysql/SaaS/BackupsContext/20230130103901_BackupsContextMigrate.cs
# migrations/mysql/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
# migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.cs
# migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/mysql/SaaS/CustomDbContext/20221019144350_CustomDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/CustomDbContext/20221019144350_CustomDbContextMigrate.cs
# migrations/mysql/SaaS/CustomDbContext/CustomDbContextModelSnapshot.cs
# migrations/mysql/SaaS/FeedDbContext/20221019144344_FeedDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/FeedDbContext/20221019144344_FeedDbContextMigrate.cs
# migrations/mysql/SaaS/FeedDbContext/FeedDbContextModelSnapshot.cs
# migrations/mysql/SaaS/FilesDbContext/20230130103904_FilesDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/FilesDbContext/20230130103904_FilesDbContextMigrate.cs
# migrations/mysql/SaaS/FilesDbContext/20230515174318_FilesDbContext_Upgrade1.Designer.cs
# migrations/mysql/SaaS/FilesDbContext/20230515174318_FilesDbContext_Upgrade1.cs
# migrations/mysql/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
# migrations/mysql/SaaS/FirebaseDbContext/20221019144351_FirebaseDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/FirebaseDbContext/20221019144351_FirebaseDbContextMigrate.cs
# migrations/mysql/SaaS/FirebaseDbContext/FirebaseDbContextModelSnapshot.cs
# migrations/mysql/SaaS/InstanceRegistrationContext/20221019144346_InstanceRegistrationContextMigrate.Designer.cs
# migrations/mysql/SaaS/InstanceRegistrationContext/20221019144346_InstanceRegistrationContextMigrate.cs
# migrations/mysql/SaaS/InstanceRegistrationContext/InstanceRegistrationContextModelSnapshot.cs
# migrations/mysql/SaaS/IntegrationEventLogContext/20221019144342_IntegrationEventLogContextMigrate.Designer.cs
# migrations/mysql/SaaS/IntegrationEventLogContext/20221019144342_IntegrationEventLogContextMigrate.cs
# migrations/mysql/SaaS/IntegrationEventLogContext/IntegrationEventLogContextModelSnapshot.cs
# migrations/mysql/SaaS/MessagesContext/20221019144345_MessagesContextMigrate.Designer.cs
# migrations/mysql/SaaS/MessagesContext/20221019144345_MessagesContextMigrate.cs
# migrations/mysql/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
# migrations/mysql/SaaS/NotifyDbContext/20221019144352_NotifyDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/NotifyDbContext/20221019144352_NotifyDbContextMigrate.cs
# migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs
# migrations/mysql/SaaS/TeamlabSiteContext/20221219145514_TeamlabSiteContextMigrate.Designer.cs
# migrations/mysql/SaaS/TeamlabSiteContext/20221219145514_TeamlabSiteContextMigrate.cs
# migrations/mysql/SaaS/TeamlabSiteContext/20230621121634_TeamlabSiteContextMigrate.Designer.cs
# migrations/mysql/SaaS/TeamlabSiteContext/20230621121634_TeamlabSiteContextMigrate.cs
# migrations/mysql/SaaS/TelegramDbContext/20221019144353_TelegramDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/TelegramDbContext/20221019144353_TelegramDbContextMigrate.cs
# migrations/mysql/SaaS/TelegramDbContext/TelegramDbContextModelSnapshot.cs
# migrations/mysql/SaaS/TenantDbContext/20221019144354_TenantDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/TenantDbContext/20221019144354_TenantDbContextMigrate.cs
# migrations/mysql/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
# migrations/mysql/SaaS/UrlShortenerFakeDbContext/20221019144355_UrlShortenerFakeDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/UrlShortenerFakeDbContext/20221019144355_UrlShortenerFakeDbContextMigrate.cs
# migrations/mysql/SaaS/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs
# migrations/mysql/SaaS/UserDbContext/20230310195637_UserDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/UserDbContext/20230310195637_UserDbContextMigrate.cs
# migrations/mysql/SaaS/UserDbContext/UserDbContextModelSnapshot.cs
# migrations/mysql/SaaS/WebhooksDbContext/20221019144343_WebhooksDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/WebhooksDbContext/20221019144343_WebhooksDbContextMigrate.cs
# migrations/mysql/SaaS/WebhooksDbContext/WebhooksDbContextModelSnapshot.cs
# migrations/mysql/SaaS/WebstudioDbContext/20221019144356_WebstudioDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/WebstudioDbContext/20221019144356_WebstudioDbContextMigrate.cs
# migrations/mysql/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
# migrations/mysql/TeamlabSiteContext/20221219145514_TeamlabSiteContextMigrate.Designer.cs
# migrations/mysql/TeamlabSiteContext/20221219145514_TeamlabSiteContextMigrate.cs
# migrations/postgre/ASC.Migrations.PostgreSql.csproj
# migrations/postgre/SaaS/AccountLinkContext/20221019144350_AccountLinkContextMigrate.Designer.cs
# migrations/postgre/SaaS/AccountLinkContext/20221019144350_AccountLinkContextMigrate.cs
# migrations/postgre/SaaS/AccountLinkContext/AccountLinkContextModelSnapshot.cs
# migrations/postgre/SaaS/BackupsContext/20230130103902_BackupsContextMigrate.Designer.cs
# migrations/postgre/SaaS/BackupsContext/20230130103902_BackupsContextMigrate.cs
# migrations/postgre/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
# migrations/postgre/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.cs
# migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/postgre/SaaS/CustomDbContext/20221019144351_CustomDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/CustomDbContext/20221019144351_CustomDbContextMigrate.cs
# migrations/postgre/SaaS/CustomDbContext/CustomDbContextModelSnapshot.cs
# migrations/postgre/SaaS/FeedDbContext/20221019144345_FeedDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/FeedDbContext/20221019144345_FeedDbContextMigrate.cs
# migrations/postgre/SaaS/FeedDbContext/FeedDbContextModelSnapshot.cs
# migrations/postgre/SaaS/FilesDbContext/20230130103904_FilesDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/FilesDbContext/20230130103904_FilesDbContextMigrate.cs
# migrations/postgre/SaaS/FilesDbContext/20230515174319_FilesDbContext_Upgrade1.Designer.cs
# migrations/postgre/SaaS/FilesDbContext/20230515174319_FilesDbContext_Upgrade1.cs
# migrations/postgre/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
# migrations/postgre/SaaS/FirebaseDbContext/20221019144352_FirebaseDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/FirebaseDbContext/20221019144352_FirebaseDbContextMigrate.cs
# migrations/postgre/SaaS/FirebaseDbContext/FirebaseDbContextModelSnapshot.cs
# migrations/postgre/SaaS/InstanceRegistrationContext/20221019144347_InstanceRegistrationContextMigrate.Designer.cs
# migrations/postgre/SaaS/InstanceRegistrationContext/20221019144347_InstanceRegistrationContextMigrate.cs
# migrations/postgre/SaaS/InstanceRegistrationContext/InstanceRegistrationContextModelSnapshot.cs
# migrations/postgre/SaaS/IntegrationEventLogContext/20221019144343_IntegrationEventLogContextMigrate.Designer.cs
# migrations/postgre/SaaS/IntegrationEventLogContext/20221019144343_IntegrationEventLogContextMigrate.cs
# migrations/postgre/SaaS/IntegrationEventLogContext/IntegrationEventLogContextModelSnapshot.cs
# migrations/postgre/SaaS/MessagesContext/20221019144346_MessagesContextMigrate.Designer.cs
# migrations/postgre/SaaS/MessagesContext/20221019144346_MessagesContextMigrate.cs
# migrations/postgre/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
# migrations/postgre/SaaS/NotifyDbContext/20221019144353_NotifyDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/NotifyDbContext/20221019144353_NotifyDbContextMigrate.cs
# migrations/postgre/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs
# migrations/postgre/SaaS/TelegramDbContext/20221019144354_TelegramDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/TelegramDbContext/20221019144354_TelegramDbContextMigrate.cs
# migrations/postgre/SaaS/TelegramDbContext/TelegramDbContextModelSnapshot.cs
# migrations/postgre/SaaS/TenantDbContext/20221019144355_TenantDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/TenantDbContext/20221019144355_TenantDbContextMigrate.cs
# migrations/postgre/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
# migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.cs
# migrations/postgre/SaaS/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs
# migrations/postgre/SaaS/UserDbContext/20230310195637_UserDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/UserDbContext/20230310195637_UserDbContextMigrate.cs
# migrations/postgre/SaaS/UserDbContext/UserDbContextModelSnapshot.cs
# migrations/postgre/SaaS/WebhooksDbContext/20221019144344_WebhooksDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/WebhooksDbContext/20221019144344_WebhooksDbContextMigrate.cs
# migrations/postgre/SaaS/WebhooksDbContext/WebhooksDbContextModelSnapshot.cs
# migrations/postgre/SaaS/WebstudioDbContext/20221019144357_WebstudioDbContextMigrate.Designer.cs
# migrations/postgre/SaaS/WebstudioDbContext/20221019144357_WebstudioDbContextMigrate.cs
# migrations/postgre/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
# packages/client/src/Shell.jsx
# packages/client/src/components/Article/Body/Items.js
# packages/client/src/components/Article/Body/index.js
# packages/client/src/components/EmptyContainer/RoomNoAccessContainer.js
# packages/client/src/components/EmptyContainer/RootFolderContainer.js
# packages/client/src/components/panels/InvitePanel/index.js
# packages/client/src/components/panels/InvitePanel/sub-components/AccessSelector.js
# packages/client/src/components/panels/InvitePanel/sub-components/Item.js
# packages/client/src/components/panels/InvitePanel/sub-components/ItemsList.js
# packages/client/src/components/panels/SelectFileDialog/AsideView.js
# packages/client/src/components/panels/SelectFileDialog/index.js
# packages/client/src/components/panels/SelectFolderDialog/index.js
# packages/client/src/components/panels/SelectionPanel/ExceptionFoldersConstants.js
# packages/client/src/components/panels/SelectionPanel/SelectionPanelBody.js
# packages/client/src/components/panels/SelectionPanel/StyledSelectionPanel.js
# packages/client/src/pages/Accounts.jsx
# packages/client/src/pages/AccountsHome/index.js
# packages/client/src/pages/Confirm/index.js
# packages/client/src/pages/Confirm/sub-components/removePortal.js
# packages/client/src/pages/Errors/520/index.js
# packages/client/src/pages/Files.jsx
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableContainer.js
# packages/client/src/pages/Home/Section/AccountsBody/TableView/TableRow.js
# packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
# packages/client/src/pages/Home/Section/Filter/index.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/pages/Home/Section/SettingsBody/index.js
# packages/client/src/pages/Home/index.js
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
# packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
# packages/client/src/pages/PortalSettings/categories/common/sub-components/common-tooltips.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/index.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/FieldMapping.js
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/IdpSettings.js
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/ProviderMetadata.js
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/MetadataUrlField.js
# packages/client/src/pages/PortalSettings/categories/payments/index.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/mobileView.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/sessionLifetime.js
# packages/client/src/pages/PortalSettings/categories/security/sub-components/category-wrapper.js
# packages/client/src/pages/PortalSettings/index.js
# packages/client/src/pages/PortalSettings/utils/settingsTree.js
# packages/client/src/pages/Profile/Section/Body/sub-components/interface-theme/index.js
# packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js
# packages/client/src/pages/VersionHistory/Section/Body/StyledVersionHistory.js
# packages/client/src/pages/VersionHistory/Section/Body/VersionRow.js
# packages/client/src/pages/Wizard/index.js
# packages/client/src/store/AccountsContextOptionsStore.js
# packages/client/src/store/FilesActionsStore.js
# packages/client/src/store/FilesStore.js
# packages/common/components/Article/index.js
# packages/common/components/Article/sub-components/article-alerts.js
# packages/common/components/Article/sub-components/article-header.js
# packages/common/components/FilterInput/sub-components/FilterBlock.js
# packages/common/components/Loaders/index.js
# packages/common/components/MediaViewer/sub-components/ImageViewer/ImageViewer.props.ts
# packages/common/components/MediaViewer/sub-components/ImageViewer/index.tsx
# packages/common/components/PrivateRoute/index.js
# packages/common/store/SettingsStore.js
# packages/common/store/UserStore.js
# packages/common/utils/index.ts
# packages/components/file-input/index.js
# packages/components/selector/StyledSelector.js
# packages/components/selector/index.tsx
# packages/components/selector/sub-components/Body/index.tsx
# packages/components/slider/styled-slider.js
# 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/SecurityDao.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/OneDrive/OneDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ThirdPartyProviderDao.cs
# products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Server/Api/FoldersController.cs
# products/ASC.Files/Server/Api/SettingsController.cs
# products/ASC.Files/Service/Cleanup/Worker.cs
# products/ASC.People/Server/Api/UserController.cs
# public/scripts/api.js
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/PaymentsController.cs
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/Settings/LicenseController.cs
# web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Api/Api/Settings/TfaappController.cs
# web/ASC.Web.Api/Api/SmtpSettingsController.cs
# web/ASC.Web.Api/Core/SmtpOperation.cs
# web/ASC.Web.Core/CookiesManager.cs
# yarn.lock
|
2023-07-18 19:26:32 +03:00 |
|
|
|
77c3cdbe52
|
Web: Files: Public-room: fixed styles
|
2023-07-18 17:10:46 +03:00 |
|
Vladimir Khvan
|
f452fd7aa4
|
import section component was added
|
2023-07-17 20:13:19 +05:00 |
|
Elyor Djalilov
|
d07eca4957
|
fix bad merge
|
2023-07-17 18:32:52 +05:00 |
|
Elyor Djalilov
|
2433c574fd
|
Merge branch 'feature/data-migration' of github.com:ONLYOFFICE/DocSpace into feature/data-migration
|
2023-07-17 17:12:04 +05:00 |
|
Elyor Djalilov
|
7d6f35529e
|
Web: Client: PortalSettings: added data-import services
|
2023-07-17 17:04:13 +05:00 |
|
Vladimir Khvan
|
0b561e90fb
|
data migration page was created
|
2023-07-17 15:58:37 +05:00 |
|
Viktor Fomin
|
78b6c43d74
|
Merge branch 'develop' into feature/deep-link
|
2023-07-17 13:24:15 +03:00 |
|
|
|
a86408fcf8
|
Web: Client: SDK: Added editorGoBack property for editor
|
2023-07-14 16:57:58 +03:00 |
|
|
|
24fba12ce3
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/public/locales/en/CreateEditRoomDialog.json
# packages/client/public/locales/en/InfoPanel.json
# packages/client/src/components/dialogs/CreateEditRoomDialog/data/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/index.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/LinkRow.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/PublicRoomBar.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/PublicRoomBlock.js
# packages/client/src/pages/Home/InfoPanel/Body/views/Members/sub-components/StyledPublicRoom.js
# packages/client/src/pages/Home/InfoPanel/Header/index.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/store/ContextOptionsStore.js
# packages/client/src/store/FilesStore.js
# packages/common/constants/index.js
# packages/components/date-picker/index.js
# packages/components/selected-item/index.js
|
2023-07-14 15:40:47 +03:00 |
|
|
|
440ba6a13c
|
Web: Client: Sdk: Fixed stringify functions for events
|
2023-07-14 14:59:46 +03:00 |
|
Elyor Djalilov
|
2ab2e635ff
|
Web: Client: PortalSettings: added data-import categories
|
2023-07-14 15:48:06 +05:00 |
|
|
|
8b5eebffab
|
Web: Client: Sdk: Added selectorType property for file selector mode, added new base filter type : userFolderOnly
|
2023-07-14 10:27:43 +03:00 |
|
|
|
568155823a
|
Web: Client: Sdk: Fixed file selector mode, fixed button label and default filter type
|
2023-07-13 15:09:08 +03:00 |
|
|
|
dc59259fd0
|
Revert "added translations"
This reverts commit 47314b61c5, reversing
changes made to e22a56e032.
# Conflicts:
# build/install/OneClickInstall/install-Docker.sh
# build/install/win/DocSpace.aip
# packages/client/public/locales/bg/Settings.json
# packages/client/public/locales/cs/Settings.json
# packages/client/public/locales/ja-JP/Settings.json
# packages/client/public/locales/lv/Settings.json
# packages/client/public/locales/uk-UA/Settings.json
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/MetadataUrlField.js
|
2023-07-13 13:02:08 +03:00 |
|
|
|
d2fc13109c
|
Merge branch 'develop' into feature/leave-room
# Conflicts:
# packages/client/src/components/FilesPanels/index.js
|
2023-07-12 13:18:38 +03:00 |
|
gazizova-vlada
|
6e9e3e07f8
|
Web:Changed content, translations.
|
2023-07-11 23:05:25 +03:00 |
|
|
|
10ddb99d11
|
Web: Client: PortalSettings: Added "Integration request" block
|
2023-07-10 23:58:58 +03:00 |
|
gazizova-vlada
|
353783eb5a
|
Web:Add reassign data in context menu.
|
2023-07-07 15:05:01 +03:00 |
|
|
|
2e14572fc0
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/src/components/panels/OperationsPanel/index.js
# packages/client/src/components/panels/SelectFolderDialog/index.js
# packages/client/src/components/panels/SelectionPanel/FilesListWrapper.js
# public/images/clock.react.svg
|
2023-07-07 10:35:33 +03:00 |
|
Mushka Nikita
|
e6b9afebf7
|
added reset button translation
|
2023-07-06 16:31:48 +03:00 |
|
Vladimir Khvan
|
ae168c410a
|
clock svg was added
|
2023-07-05 14:16:13 +05:00 |
|
|
|
80620d0b0d
|
Web: Client: Sdk: Restored filter property
|
2023-07-04 18:05:49 +03:00 |
|
|
|
2f79b3baae
|
added translations
|
2023-06-30 13:40:20 +03:00 |
|
|
|
ede27c1562
|
Web: Files: EditRoom: added room owner change
|
2023-06-30 13:17:31 +03:00 |
|
|
|
870d4efac5
|
added translations
|
2023-06-29 18:06:36 +03:00 |
|
|
|
ae01f22e73
|
Web: Changed empty-folder-image.svg to rooms.react.svg
|
2023-06-29 13:56:06 +04:00 |
|
|
|
a1df1be7c6
|
Web: Changed rooms icon
|
2023-06-28 14:52:31 +04:00 |
|
|
|
c505c8dc2b
|
added translations
|
2023-06-28 13:35:40 +03:00 |
|
|
|
c0a1608691
|
Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0
|
2023-06-27 16:43:58 +03:00 |
|
|
|
3ba27cd577
|
added translations
|
2023-06-27 16:42:20 +03:00 |
|
|
|
794196e3a8
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/DocSpace into release/v1.1.0
|
2023-06-27 12:42:23 +03:00 |
|
|
|
ab35c4e497
|
Web: Client: FilesStore: Added getRooms by filter action. Added getRooms method to SDK
|
2023-06-27 12:42:16 +03:00 |
|
|
|
90004e8f94
|
added translations
|
2023-06-27 10:42:38 +03:00 |
|
|
|
1414483526
|
Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0
|
2023-06-26 16:02:34 +03:00 |
|
|
|
c737c5838f
|
added translations
|
2023-06-26 16:02:13 +03:00 |
|
|
|
412f64960b
|
Web: Client: SDK: Fixed create room signature
|
2023-06-26 15:45:35 +03:00 |
|
|
|
9179797473
|
Web: Client: DeveloperTools: Restored title and class names after destroy frame
|
2023-06-22 16:18:45 +03:00 |
|
|
|
e7c5e5520f
|
Web: Client: Removed useless code
|
2023-06-22 15:40:01 +03:00 |
|
|
|
80e732bbbf
|
Merge branch 'release/v1.1.0' into feature/sdk
|
2023-06-22 14:35:14 +03:00 |
|
|
|
c29439c1aa
|
added translations
|
2023-06-22 14:06:48 +03:00 |
|
|
|
43c992c85c
|
Merge branch 'release/v1.1.0' into feature/sdk
|
2023-06-22 10:23:01 +03:00 |
|
|
|
6858287810
|
added translations
|
2023-06-21 18:41:09 +03:00 |
|
|
|
384832c272
|
Web: Client: Sdk: Fixed pathParts and Breadcrumbs. Fixed redirect on no access. Fixed theme preload. Fixed locale usage
|
2023-06-21 17:58:19 +03:00 |
|
|
|
f368b3fbbb
|
Merge branch 'release/v1.1.0' into feature/sdk
|
2023-06-20 17:37:35 +03:00 |
|
|
|
05386e4d0d
|
added translations
|
2023-06-20 16:10:41 +03:00 |
|
|
|
4ddef13c04
|
Web: Client: Sdk: Added timeout for post messages
|
2023-06-20 13:41:01 +03:00 |
|
|
|
521b00c983
|
Web: Client: Sdk: Fixed hash api call
|
2023-06-20 12:46:13 +03:00 |
|
|
|
c37687b50d
|
Web: Client: Sdk: Fixed logs
|
2023-06-19 17:27:08 +03:00 |
|
|
|
0ccb36e559
|
Web: Client: Sdk: Fixed init methods signatures. Fixed config clean after destroy frame.
|
2023-06-19 14:49:19 +03:00 |
|
|
|
c3e7ddd9f4
|
Merge branch 'release/v1.1.0' into feature/sdk
|
2023-06-19 13:47:54 +03:00 |
|
|
|
9c5ee2e7c5
|
Web: Client: Sdk: Logs
|
2023-06-19 13:17:48 +03:00 |
|
|
|
c79d171b1d
|
added translations
|
2023-06-19 12:30:37 +03:00 |
|
|
|
f30ed529a3
|
Web: Client: Sdk: Fixed tasks chain
|
2023-06-16 18:34:12 +03:00 |
|
|
|
fcc02491ee
|
Merge branch 'release/v1.1.0' into feature/sdk
|
2023-06-16 14:59:15 +03:00 |
|
|
|
855c11b6c7
|
Web: Client: Sdk: Apply theme from config
|
2023-06-16 14:54:08 +03:00 |
|
|
|
2a4c002e4b
|
Web: Client: Sdk: Logs
|
2023-06-16 14:23:21 +03:00 |
|
Mushka Nikita
|
7675059430
|
fixed outside icon styling
|
2023-06-16 14:10:10 +03:00 |
|
|
|
a736daa480
|
Web: Client: Sdk: Added createTag, addTagsToRoom, removeTagsFromRoom. Fixed callback errors
|
2023-06-16 14:06:12 +03:00 |
|
|
|
4920c975c1
|
Added support of new hy-AM culture
|
2023-06-16 13:28:56 +04:00 |
|
Mushka Nikita
|
f6a49ab912
|
WIP: 0943f64c6a Merge branch 'develop' into feature/submit-to-form-gallery
|
2023-06-15 11:05:02 +03:00 |
|
Mushka Nikita
|
0943f64c6a
|
Merge branch 'develop' into feature/submit-to-form-gallery
|
2023-06-13 13:43:30 +03:00 |
|
|
|
6dafe52577
|
Merge branch 'release/v1.1.0' into feature/sdk
|
2023-06-13 09:28:20 +03:00 |
|
Viktor Fomin
|
fc688f4cc6
|
Web: add images
|
2023-06-12 22:27:09 +03:00 |
|
|
|
20bf5fa8d5
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/src/store/index.js
|
2023-06-09 11:59:10 +03:00 |
|
|
|
4edfedab57
|
Merge branch 'release/v1.1.0' into feature/sdk
|
2023-06-09 10:14:04 +03:00 |
|
|
|
ca3f29cd5d
|
Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0
|
2023-06-08 18:25:15 +03:00 |
|
|
|
fef76e032f
|
added translations
|
2023-06-08 18:24:46 +03:00 |
|
|
|
893aa52501
|
Merge branch 'release/v1.1.0' into feature/sdk
|
2023-06-08 16:14:09 +03:00 |
|
Mushka Nikita
|
d3504d06ba
|
added outside arrow icon option to context menu
|
2023-06-06 14:56:36 +03:00 |
|
Mushka Nikita
|
0420965a87
|
added translations
|
2023-06-06 03:33:35 +03:00 |
|
|
|
f4f5edec05
|
Merge branch 'develop' into feature/webhooks-page
# Conflicts:
# web/ASC.Web.Api/Api/Settings/WebhooksController.cs
|
2023-06-06 01:49:14 +03:00 |
|
|
|
ca03feb835
|
Merge branch 'release/v1.1.0' into feature/sdk
|
2023-06-05 14:28:21 +03:00 |
|
|
|
13eb9ea37a
|
Web: Files: added new translations
|
2023-06-05 13:44:55 +03:00 |
|
|
|
7e601fa5e2
|
Merge branch 'develop' into feature/public-room
|
2023-06-05 12:38:12 +03:00 |
|
Viktor Fomin
|
9974635112
|
Web: change images
|
2023-06-05 12:25:17 +03:00 |
|
Timofey Boyko
|
a4f8687af9
|
Web:Client: add flag to enable or disable image thumbnails
|
2023-06-01 15:05:49 +03:00 |
|
Timofey Boyko
|
6cb8a714b2
|
Merge branch 'develop' into branch feature/image-thumbnail
|
2023-06-01 14:30:06 +03:00 |
|
Viktor Fomin
|
cdd0367153
|
Web: add translations
|
2023-05-31 16:33:17 +03:00 |
|
Viktor Fomin
|
ae6577939b
|
Web: add translations
|
2023-05-31 16:33:17 +03:00 |
|
