Commit Graph

23147 Commits

Author SHA1 Message Date
59160afcdc SSO: fix template path 2022-08-05 17:29:17 +03:00
ed67603126 Web: SSO: Fix setFields by api response config 2022-08-03 14:52:13 +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
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
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
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
72878d5ca8 Web: Fix open NavMenu on Mobile 2022-08-01 18:47:11 +03:00
ac3683d7ab Web: Fix i18n ns name for Files.json 2022-08-01 18:12:15 +03:00
af5cfe6553 Web: Rename translation file on 'en' 2022-08-01 18:03:27 +03:00
1f17ab9231 Nginx: Restored files handlers 2022-08-01 17:53:57 +03:00
ebc6ce1d67 Web: Commented console logs 2022-08-01 17:53:26 +03:00
a4ea50c760 split AuditReportCreator 2022-08-01 17:23:50 +03:00
c39b845da9 Build: Removed old fix path commands 2022-08-01 16:56:45 +03:00
a14c0f74d5 Nginx: Removed old files/people configs 2022-08-01 16:55:44 +03:00
e9312097cc Nginx: Renamed onlyoffice-studio.conf to onlyoffice-client.conf 2022-08-01 16:55:11 +03:00
7000cd55f6 Merge branch 'develop' into refactoring/client 2022-08-01 15:59:18 +03:00
07e8e49579 Web: Fix Frontend.Translations.Tests run 2022-08-01 15:55:39 +03:00
d093c97b97 Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes) 2022-08-01 15:37:33 +03:00
fd21ad788c Web: Portal-Settings: Hide security/admins 2022-08-01 14:53:26 +03:00
3ed5ca8706 Web: Fix old url to /filter 2022-08-01 14:52:18 +03:00
58d3407729 fix 2022-08-01 13:58:14 +03:00
ceae4ff07d packages updated 2022-08-01 13:58:12 +03:00
3c3234b6c2 Merge branch 'develop' into feature/fix-api 2022-08-01 13:51:05 +03:00
4559942c30 fix confrim links 2022-08-01 13:50:31 +03:00
9df9195cff suppress warning 2022-08-01 13:41:33 +03:00