mushka
|
4272c1f661
|
small stranslation fix
|
2022-08-03 16:34:14 +03:00 |
|
mushka
|
57e76d78e1
|
secondaryInfoButton fix position
|
2022-08-03 14:56:43 +03:00 |
|
mushka
|
b1b5b87871
|
implemented new translation keys
|
2022-08-03 14:56:26 +03:00 |
|
mushka
|
507979d9cc
|
added translation keys for storageLocation and MakePrivate secondary infos
|
2022-08-03 14:55:59 +03:00 |
|
|
|
ed67603126
|
Web: SSO: Fix setFields by api response config
|
2022-08-03 14:52:13 +03:00 |
|
|
|
4af1247136
|
Web: Integration: Restored after merge develop
|
2022-08-03 14:48:54 +03:00 |
|
mushka
|
50c6a82c8c
|
added translation keys for room types
|
2022-08-03 14:47:30 +03:00 |
|
mushka
|
766082b505
|
removed unused styles
|
2022-08-03 14:47:06 +03:00 |
|
mushka
|
29160a6cbc
|
impemented new SecondaryInfoButtonComponent
|
2022-08-03 14:46:55 +03:00 |
|
mushka
|
a373d0dcc8
|
created own component for help button
|
2022-08-03 14:42:49 +03:00 |
|
mushka
|
1e10e329d9
|
added ability to pass props directly to tooltip through help-button
|
2022-08-03 14:28:00 +03:00 |
|
|
|
7413870d5a
|
Merge branch 'develop' into feature/integration-system
|
2022-08-03 12:48:50 +03:00 |
|
|
|
71f7cea44e
|
Merge branch 'feature/sso' of github.com:ONLYOFFICE/AppServer into feature/sso
|
2022-08-03 10:47:45 +03:00 |
|
|
|
4cb0f20d99
|
Merge branch 'develop' into feature/sso
|
2022-08-03 10:35:06 +03:00 |
|
|
|
95f473f81a
|
Merge pull request #750 from ONLYOFFICE/feature/docker-build-modify-frontend
Add client docker build
|
2022-08-02 18:58:45 +03:00 |
|
|
|
bdf4db49da
|
Merge branch 'develop' into feature/docker-build-modify-frontend
|
2022-08-02 18:58:38 +03:00 |
|
|
|
bf99da04bf
|
SSO: fix style
|
2022-08-02 18:22:34 +03:00 |
|
|
|
28698beeee
|
SSO: fix placeholders
|
2022-08-02 18:04:10 +03:00 |
|
|
|
928ee509ad
|
Components: Headline: fix size
|
2022-08-02 18:03:25 +03:00 |
|
|
|
bb49d50560
|
SSO: fix style
|
2022-08-02 17:46:50 +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 |
|
|
|
2ee692d007
|
SSO: fix validate error
|
2022-08-02 17:41:02 +03:00 |
|
|
|
270fe80679
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
|
2022-08-02 17:35:31 +03:00 |
|
|
|
c8c4395d4c
|
SSO: fix modal style
|
2022-08-02 17:35:19 +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 |
|
|
|
18bb507835
|
SSO: fix style
|
2022-08-02 16:51:25 +03:00 |
|
sk81.biz@gmail.com
|
7781a3fa5c
|
Modify node version
|
2022-08-02 16:21:33 +03:00 |
|
|
|
8fff10bb1a
|
SSO: add disable
|
2022-08-02 16:20:19 +03:00 |
|
|
|
dcd559d560
|
SSO: fix
|
2022-08-02 16:16:59 +03:00 |
|
|
|
5d057906b3
|
SSO: fix styles
|
2022-08-02 16:14:07 +03:00 |
|
|
|
650767c7ec
|
fixed build scripts
|
2022-08-02 15:24:19 +03:00 |
|
mushka
|
1d8d7e9a6e
|
appserver to docspace import fix
|
2022-08-02 14:55:51 +03:00 |
|
mushka
|
03f1f0c8cc
|
fix dialog exporting after merge
|
2022-08-02 14:54:59 +03:00 |
|
|
|
f0d949339f
|
Web: Integration: Fixed method name
|
2022-08-02 14:22:04 +03:00 |
|
mushka
|
449c848445
|
fixes after develop merge
|
2022-08-02 14:12:16 +03:00 |
|
mushka
|
ea8aa736c4
|
merge with develop
|
2022-08-02 14:11:41 +03:00 |
|
|
|
0c94897f75
|
Merge branch 'develop' into feature/sso
|
2022-08-02 12:39:12 +03:00 |
|
|
|
ad75ae40d3
|
SSO: show metadata if enable
|
2022-08-02 12:36:05 +03:00 |
|
|
|
3514d1a60f
|
SSO: fix modal
|
2022-08-02 12:33:41 +03:00 |
|
sk81.biz@gmail.com
|
77820a5cf9
|
Modify docker client build
|
2022-08-02 12:21:05 +03:00 |
|
mushka
|
a418d7d42d
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2022-08-02 12:18:06 +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 |
|
|
|
03b03ed910
|
Merge branch 'develop' into feature/sso
# Conflicts:
# packages/client/public/images/actions.upload.react.svg
# packages/client/public/images/empty_screen_privacy.png
# packages/client/public/locales/en/SingleSignOn.json
# packages/client/public/locales/ru/SingleSignOn.json
# packages/client/src/helpers/constants.js
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerItem.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerModalDialog.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerToggle.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/modalDialogContainer.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/ssoLoader.js
# packages/client/src/pages/PortalSettings/categories/integration/thirdPartyServicesSettings.js
# packages/client/src/store/SsoFormStore.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerItem.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerToggle.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/modalDialogContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerItem.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerToggle.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/modalDialogContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js
|
2022-08-02 12:05:15 +03:00 |
|
|
|
9d3bc076b9
|
Merge pull request #747 from ONLYOFFICE/feature/fix-api
Feature/fix api
|
2022-08-02 11:59:47 +03:00 |
|
|
|
a12d0b5609
|
Web: Temporary removed auto-changelog and debug-info
|
2022-08-01 20:26:19 +03:00 |
|
|
|
271b6b3bad
|
Web: Update auto-changelog and yarn.lock
|
2022-08-01 19:48:05 +03:00 |
|
|
|
27fa822017
|
Web: Commented useless code
|
2022-08-01 19:47:29 +03:00 |
|
|
|
865bc438cd
|
Merge pull request #748 from ONLYOFFICE/refactoring/client
Refactoring/client
|
2022-08-01 18:57:18 +03:00 |
|
