|
|
8f4ee05948
|
Web: Files: fixed mobile scroll
|
2022-08-10 13:27:52 +03:00 |
|
|
|
966e1e293e
|
Web: Files: fixed hotkeys
|
2022-08-10 11:38:04 +03:00 |
|
|
|
2c2251d33e
|
Web: Files: added default useReactWindow prop
|
2022-08-10 11:37:14 +03:00 |
|
|
|
08c41f5121
|
Web: Files: FormGallery: removed useless code
|
2022-08-10 11:28:57 +03:00 |
|
|
|
2e06c8fd58
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/sso
# Conflicts:
# build/install/win/DocSpace.aip
|
2022-08-10 09:57:03 +03:00 |
|
mushka
|
8f5f597c5f
|
Merge branch 'develop' into feature/create-room
|
2022-08-09 19:12:47 +03:00 |
|
mushka
|
038c9140d0
|
improvements on new structure
|
2022-08-09 19:07:38 +03:00 |
|
mushka
|
9d4bfb12cb
|
started building new structure for InfoPanel
|
2022-08-09 19:07:16 +03:00 |
|
mushka
|
6a9b73b3b3
|
updated Home/index.js
|
2022-08-09 19:06:25 +03:00 |
|
|
|
abe3f73cb6
|
SSO: auto set checkboxes
|
2022-08-09 18:36:35 +03:00 |
|
|
|
75a7553397
|
SSO: fix delete
|
2022-08-09 18:28:57 +03:00 |
|
|
|
deffed2d14
|
Web: Files: fixed scroll for mobile devices
|
2022-08-09 16:19:52 +03:00 |
|
|
|
b1d70eaeb0
|
Web: Files: fixed Tile styles
|
2022-08-09 14:13:42 +03:00 |
|
|
|
0de5d36ce4
|
Web: Files: Scroll: added WindowScroller
|
2022-08-09 13:43:24 +03:00 |
|
TimofeyBoyko
|
012d347ca2
|
Web:Client: fix column width after switching from files to rooms
|
2022-08-09 10:57:30 +03:00 |
|
|
|
d0e4f67ec4
|
Merge branch 'develop' into feature/inifinite-scroll
# Conflicts:
# packages/client/src/components/Article/Body/index.js
# packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContainer.js
# packages/client/src/pages/Home/Section/Body/TableView/TableContainer.js
# packages/client/src/pages/Home/Section/Body/TilesView/sub-components/InfiniteGrid.js
# packages/client/src/pages/Home/Section/Body/TilesView/sub-components/StyledInfiniteGrid.js
# packages/client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js
# packages/client/src/store/FilesStore.js
|
2022-08-09 09:49:28 +03:00 |
|
TimofeyBoyko
|
4ec8ef90fe
|
Web:Helpers:Plugins: update
|
2022-08-08 19:53:58 +03:00 |
|
|
|
e6651821ce
|
SSO: fix exist certificate
|
2022-08-08 13:55:38 +03:00 |
|
|
|
b252732ed2
|
SSO: add translate
|
2022-08-08 13:55:23 +03:00 |
|
|
|
05ab23b63a
|
PortalSettings: fix after merge
|
2022-08-06 23:18:30 +03:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
e972d28f87
|
SSO: fix
|
2022-08-05 18:10:45 +03:00 |
|
|
|
8c234ee0aa
|
SSO: fix forbidden image
|
2022-08-05 18:04:30 +03:00 |
|
|
|
08d8b4a580
|
Web: Client: Fixed isFrame as computed property
|
2022-08-05 17:26:30 +03:00 |
|
Artem Tarasov
|
a520446d69
|
Web: Packages: localStorage usage changed to cookies when saving language
|
2022-08-05 17:21:14 +03:00 |
|
|
|
fce5867471
|
Web: Client: Fixed frameConfig property`s usage
|
2022-08-05 17:03:47 +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 |
|
|
|
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 |
|
Artem Tarasov
|
c37178a07b
|
Merge branch 'develop' into feature/login-ssr
|
2022-08-05 11:58:06 +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 |
|
|
|
e47e8ed4c1
|
SSO: fix padding
|
2022-08-05 03:07:41 +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 |
|
|
|
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 |
|
Artem Tarasov
|
3f61baa64e
|
Web: Client/Common: disabled redirect to login page inside client
|
2022-08-04 15:27:44 +03:00 |
|
mushka
|
5cd4263b38
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-04 15:21:06 +03:00 |
|
mushka
|
65e9cd6cac
|
separated createRoom and createRoomInThirdparty
|
2022-08-04 15:10:33 +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 |
|
|
|
1926a9c4b3
|
Client: PortalSettings: Fixed integration api script path
|
2022-08-04 13:32:19 +03:00 |
|
|
|
87909ca9ed
|
Client: Home: Added base integration frame init after load client inside frame
|
2022-08-04 13:30:42 +03:00 |
|
mushka
|
d0182d7aad
|
created new IconEditorComponent
|
2022-08-04 13:28:54 +03:00 |
|
TimofeyBoyko
|
1fe0b51e1f
|
Web:Client:Section: add plugin items for main button to action list
|
2022-08-04 13:03:21 +03:00 |
|
|
|
c879c78dd5
|
SSO: fix set action
|
2022-08-04 12:52:00 +03:00 |
|
|
|
8767e532b7
|
SSO: fix style
|
2022-08-04 01:36:02 +03:00 |
|
TimofeyBoyko
|
634053e53f
|
Web:Client:Store: add items from plugins to context menu
|
2022-08-03 18:50:59 +03:00 |
|
TimofeyBoyko
|
b23e7fe914
|
Web:Client:ProfileActionsStore: add items from plugins to profile actions
|
2022-08-03 18:50:19 +03:00 |
|
TimofeyBoyko
|
c45ddd8c98
|
Web:Client:Article: add items from plugins to main button
|
2022-08-03 18:47:26 +03:00 |
|
TimofeyBoyko
|
ff8aa982d8
|
Web:Client:Shell: init plugin store
|
2022-08-03 18:46:47 +03:00 |
|
TimofeyBoyko
|
ceee18d4fe
|
Web:Helpers:Plugins: add constants, API for plugins, base methods and PluginStore
|
2022-08-03 18:46:18 +03:00 |
|
TimofeyBoyko
|
6445e83f24
|
Web:PortalSettings:PortalPlugins: add simple plugins list and upload button
|
2022-08-03 18:45:49 +03:00 |
|
mushka
|
24f26491d8
|
commented out help button in roomType
|
2022-08-03 16:41:00 +03:00 |
|
mushka
|
8fddde9d7c
|
fixed translation import
|
2022-08-03 16:37:45 +03:00 |
|
mushka
|
8c289c66ec
|
deleted unused console.log
|
2022-08-03 16:37:30 +03:00 |
|
mushka
|
28a95c269f
|
removed default tags interation from editRoom
|
2022-08-03 16:37:10 +03:00 |
|
mushka
|
050cd9fc84
|
fixed default tags names
|
2022-08-03 16:36:31 +03:00 |
|
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 |
|
|
|
bf99da04bf
|
SSO: fix style
|
2022-08-02 18:22:34 +03:00 |
|
|
|
28698beeee
|
SSO: fix placeholders
|
2022-08-02 18:04:10 +03:00 |
|
|
|
bb49d50560
|
SSO: fix style
|
2022-08-02 17:46:50 +03:00 |
|
|
|
2ee692d007
|
SSO: fix validate error
|
2022-08-02 17:41:02 +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 |
|
|
|
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 |
|
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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
TimofeyBoyko
|
177e415b83
|
Web:PortalSettings:Integration: add submenu for thirdparty and plugins
|
2022-08-02 10:21:09 +03:00 |
|
TimofeyBoyko
|
4f32b96e45
|
Web:Pages:PortalSettings: add integration routes
|
2022-08-02 10:20:19 +03:00 |
|
TimofeyBoyko
|
126bb7fc05
|
Web:PortalSettings:Utils: fix checkPropertyByLink if item is undefined
|
2022-08-02 09:57:27 +03:00 |
|
TimofeyBoyko
|
158cb45d90
|
Web:PortalSettings:Utils: add integration-plugin to settingsTree
|
2022-08-02 09:55:34 +03:00 |
|
|
|
27fa822017
|
Web: Commented useless code
|
2022-08-01 19:47:29 +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 |
|
|
|
ebc6ce1d67
|
Web: Commented console logs
|
2022-08-01 17:53:26 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
d0637936cb
|
Web: Fix translation getDefaultFileName()
|
2022-07-31 13:13:16 +03:00 |
|
|
|
e0856c1503
|
Web: bootstrap: Commented registerSW
|
2022-07-31 12:53:20 +03:00 |
|
|
|
9890724990
|
Web: Accounts: Fix loaders
|
2022-07-31 12:52:53 +03:00 |
|
|
|
995d07deae
|
Web: Upgrade yarn to v3.2.2
|
2022-07-29 18:20:57 +03:00 |
|
|
|
211ac2666f
|
Web: Fix error on user equals null
|
2022-07-28 19:11:48 +03:00 |
|
|
|
027b23ba92
|
Web: Added toast
|
2022-07-28 19:10:58 +03:00 |
|
|
|
98645969b6
|
Web: Moved some files from past locations
|
2022-07-28 19:10:36 +03:00 |
|
|
|
a87497a385
|
Web: Moved src/components/pages/* to src/pages + Added new aliases SRD_DIR, PACKAGE and fix paths + Renamed /settings to /portal-settings
|
2022-07-28 17:34:27 +03:00 |
|
|
|
256c2de843
|
Web: Removed modules dependencies and People and Files mobx providers
|
2022-07-28 16:11:55 +03:00 |
|
|
|
53737a06e8
|
Merge branch 'develop' into refactoring/client
# Conflicts:
# packages/editor/src/client/components/DynamicComponent.js
# packages/editor/src/client/components/Editor.js
# packages/editor/src/client/components/SelectFileDialog.js
# packages/editor/src/client/components/SelectFolderDialog.js
# packages/editor/src/client/components/SharingDialog.js
# packages/editor/src/client/helpers/utils.js
# packages/editor/src/client/helpers/withDialogs.js
# packages/editor/src/server/lib/helpers/index.js
|
2022-07-28 10:38:29 +03:00 |
|
|
|
c5baa8834d
|
Web: Fix 'Accounts' imports, routes and includes
|
2022-07-26 12:51:52 +03:00 |
|
|
|
0ebd28f299
|
Web: Merged 'People' module with 'Client' and fixed paths
|
2022-07-25 22:19:47 +03:00 |
|
|
|
280f702cf9
|
Merge branch 'develop' into refactoring/client
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/components/NavMenu/index.js
# packages/client/src/store/ProfileActionsStore.js
# yarn.lock
|
2022-07-25 21:29:04 +03:00 |
|
|
|
f9640a400c
|
Web: Moved 'People' images and translations to 'Client'
|
2022-07-25 10:29:16 +03:00 |
|
|
|
7684fe7632
|
Web: Added 'Accounts' routing
|
2022-07-24 20:38:41 +03:00 |
|
|
|
c83811576c
|
Web: Fix files-settings routing
|
2022-07-24 20:17:45 +03:00 |
|
|
|
7db4dcd407
|
Web: Client: Added missing code
|
2022-07-24 20:03:48 +03:00 |
|
|
|
c956d8b696
|
Web: Merged 'Files' module with 'Client' and fixed paths
|
2022-07-24 19:57:03 +03:00 |
|
|
|
e7252c4bc4
|
Web: Moved all clients app to packages directory
|
2022-07-22 22:01:25 +03:00 |
|
