Commit Graph

23422 Commits

Author SHA1 Message Date
28e0d02b28 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/integration/index.js
#	packages/client/src/pages/PortalSettings/index.js
2022-08-06 23:12:39 +03:00
145fc1dbfa
Merge pull request #751 from ONLYOFFICE/feature/integration-system
Feature/integration system
2022-08-05 18:56:21 +03:00
526b9ab82b Web: Client: PortalSettings: Reworked preview page 2022-08-05 18:51:25 +03:00
72ea160e18 Web: Client: PortalSettings: Fixed portal integration page header 2022-08-05 18:50:39 +03:00
d26eee0424 Async: fix webhook 2022-08-05 18:47:33 +03:00
e972d28f87 SSO: fix 2022-08-05 18:10:45 +03:00
8c234ee0aa SSO: fix forbidden image 2022-08-05 18:04:30 +03:00
65e7362ac8 Merge branch 'feature/sso' of github.com:ONLYOFFICE/AppServer into feature/sso 2022-08-05 17:49:27 +03:00
8d7de4ee8c Merge branch 'feature/sso' of https://github.com/ONLYOFFICE/AppServer into feature/sso 2022-08-05 17:32:20 +03:00
8281b48006 SSO: fix SP action combo box 2022-08-05 17:32:04 +03:00
59160afcdc SSO: fix template path 2022-08-05 17:29:17 +03:00
08d8b4a580 Web: Client: Fixed isFrame as computed property 2022-08-05 17:26:30 +03:00
fce5867471 Web: Client: Fixed frameConfig property`s usage 2022-08-05 17:03:47 +03:00
6725d7c203 Web: Integration: Fixed parsing property from script url 2022-08-05 17:03:04 +03:00
be3fc664ca Web: Integration: Fixed methods names: getItems -> getList, setItemsView -> setListView. Changed openCrateFileModal, openCrateFolderModal, openCrateRoomModal to openModal(type, options) 2022-08-05 15:02:49 +03:00
bbfcbd6955 Web: Integration: Fixed getting default config from url. Fixed access at private property on destroyFrame method 2022-08-05 13:49:37 +03:00
3babfa0f99 Client: PortalIntegration: Fixed message event binding 2022-08-05 13:47:54 +03:00
b1e65a25b0 SSO: wait tReady 2022-08-05 13:12:20 +03:00
b5f05f73d3 SSO: fix modal buttons 2022-08-05 13:03:35 +03:00
ecd1ca05d9 SSO: add loader, fix double error 2022-08-05 13:00:29 +03:00
0e489f8113 Web: Integration: Fixed var 2022-08-05 12:51:40 +03:00
1ca4e85c0a Web: Integration: Added "mode" option to frame config 2022-08-05 12:50:53 +03:00
3de884d0f9 Merge branch 'develop' into feature/integration-system 2022-08-05 11:12:32 +03:00
3ac5550727 SSO: fix style 2022-08-05 10:30:27 +03:00
0cdbaa4a83 SSO: fix style 2022-08-05 03:26:50 +03:00
077daa7d1d Components: Themes: fix 2022-08-05 03:26:28 +03:00
e47e8ed4c1 SSO: fix padding 2022-08-05 03:07:41 +03:00
c7b0b4addd Components: HelpButton: fix size 2022-08-05 03:07:29 +03:00
bf90c710be Components: Submenu: fix style 2022-08-05 02:54:39 +03:00
9101f90f18 SSO: fix modal style 2022-08-05 02:44:05 +03:00
a254ced4c3 SSO: fix table style 2022-08-05 01:43:23 +03:00
db75f31e28 SSO: add help btn 2022-08-05 01:43:07 +03:00
c09751c8a0 SSO: fix icon 2022-08-05 00:59:28 +03:00
746d5f3795 SSO: add copy link 2022-08-05 00:59:16 +03:00
acbcd337f6 Components: InputBlock: fix icon 2022-08-05 00:58:50 +03:00
92fa19ec82 Webhook: fix iasyncenumerable 2022-08-04 18:59:21 +03:00
fa9f50d1b7 Web: Fix many keys translation issues (prefix Home -> Files) 2022-08-04 18:35:32 +03:00
1230674026 Web: Fix 'ContainsSpecCharacter' key translation 2022-08-04 18:31:27 +03:00
33220f701b Web: Fix 'NewRoom' key translation 2022-08-04 18:29:45 +03:00
9215ec53fc Web: Fix 'EmptyFolderHeader' key translation 2022-08-04 18:27:41 +03:00
1b5ae746ac Web: Fix 'FileRemoved' key translation 2022-08-04 18:26:17 +03:00
b28915462b Web: Fix login and logout 2022-08-04 18:23:19 +03:00
7741d235f7 Web: Optimization of store 2022-08-04 17:34:53 +03:00
b0039e6c4f SSO: fix styles 2022-08-04 14:43:12 +03:00
cf0e9e05a1 SSO: fix translate 2022-08-04 14:42:59 +03:00
9149d08937 Files: async 2022-08-04 13:47:18 +03:00
1926a9c4b3 Client: PortalSettings: Fixed integration api script path 2022-08-04 13:32:19 +03:00
ffd01f52c2 Common: SettingsStore: Removed base integration frame config 2022-08-04 13:31:35 +03:00
87909ca9ed Client: Home: Added base integration frame init after load client inside frame 2022-08-04 13:30:42 +03:00
11098da084 Common: Utils: Added methods for interacting with integration frame: frameCallbackData, frameCallCommand 2022-08-04 13:29:42 +03:00