|
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 |
|
|
a2ab770725
|
Web: Integration: Added setItemsView method
|
2022-08-01 16:29:30 +03:00 |
|
|
78436e9f27
|
Web: Integration: Added reloading on change iframe options with setConfig
|
2022-08-01 16:19:26 +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 |
|
|
0afd521b43
|
Web: Files: Added IntegrationStore. Added method handleMessage. Added openCrateFileModal, openCrateFolderModal, openCrateRoomModal, createFile, createFolder, createRoom message events
|
2022-08-01 14:49:46 +03:00 |
|
|
c53028ac3f
|
Web: Common: Added frameCallback util
|
2022-08-01 14:47:04 +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 |
|
|
fa04e92286
|
Web: Added TODO: Change url by category
|
2022-08-01 13:30:26 +03:00 |
|
|
ec70758d79
|
Web: Fix some old urls to /filter
|
2022-08-01 13:29:27 +03:00 |
|
|
28d8c4b4a9
|
Merge pull request #746 from ONLYOFFICE/feature/pool-context
Feature/pool context
|
2022-08-01 13:15:10 +03:00 |
|
|
d406e8deb5
|
Merge branch 'develop' into feature/pool-context
|
2022-08-01 13:14:47 +03:00 |
|
|
b71611e272
|
Merge pull request #744 from ONLYOFFICE/feature/testShareRoomByLink
union tests GetLink and ShareRoomByLink
|
2022-08-01 12:59:19 +03:00 |
|
|
5c1fa45279
|
Merge branch 'develop' into feature/testShareRoomByLink
|
2022-08-01 12:54:26 +03:00 |
|
|
14e6d3ffbb
|
Merge branch 'develop' into feature/integration-system
|
2022-08-01 12:52:13 +03:00 |
|
|
f2ae627ca0
|
fix api
|
2022-08-01 12:34:17 +03:00 |
|
|
b03f8bc1dc
|
Merge branch 'develop' into feature/pool-context
|
2022-08-01 11:49:11 +03:00 |
|
|
3ea068fd2f
|
Web: Client: SSO: fix errors
|
2022-08-01 09:23:01 +03:00 |
|
|
f6a5df4577
|
Web: Client: SSO: fix
|
2022-08-01 07:37:24 +03:00 |
|
|
0cb9753ab5
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
|
2022-08-01 00:29:26 +03:00 |
|
|
18173e397e
|
Web: Client: SSO: refactoring
|
2022-08-01 00:29:17 +03:00 |
|
|
d0289756ec
|
Web: Changed routing by new categoryType
|
2022-07-31 20:14:28 +03:00 |
|
|
359c160ac1
|
Web: Refactoring routes urls
|
2022-07-31 13:52:35 +03:00 |
|
|
af8ebef56e
|
Web: Removed ASC.Projects/Client
|
2022-07-31 13:16:31 +03:00 |
|
|
2c5da93540
|
Web: Removed ASC.Mail/Client
|
2022-07-31 13:15:59 +03:00 |
|