Commit Graph

3838 Commits

Author SHA1 Message Date
mushka
aad25382f2 moved privacy setting to own component and added warning banner 2022-08-15 15:53:47 +03:00
mushka
d79e7bf452 fixed translations in data & removed thhirdparties 2022-08-15 15:53:16 +03:00
mushka
5aa2147bf3 added permanent settings 2022-08-15 15:52:30 +03:00
mushka
78fe429124 restructured params to templates 2022-08-15 15:52:10 +03:00
mushka
5097d09a44 created iconEditorComponent 2022-08-15 15:51:11 +03:00
mushka
84f50bd4bd updated state in EditRoom 2022-08-15 15:50:31 +03:00
mushka
307be1d4e5 updated state in CreateRoom 2022-08-15 15:50:18 +03:00
mushka
a2ef8d46b5 updated and edited translations 2022-08-15 15:49:43 +03:00
mushka
868ca37341 added svg for icon-croppper grid 2022-08-15 15:49:19 +03:00
mushka
ea5b92f1af added func for getting cloudTypeIcon to filesUtils 2022-08-15 15:48:23 +03:00
c729229e14 Web: Refactoring, added error handler when provider changed. 2022-08-15 14:27:24 +03:00
TimofeyBoyko
64d794d184 Web:Client:Acctouns: update filter data 2022-08-15 14:24:08 +03:00
TimofeyBoyko
4879908b88 Web:Client:Pages: move PeopleHome page to accounts folder 2022-08-15 13:51:32 +03:00
TimofeyBoyko
f2e67660ca Web:Client:PeopleHome: fix active catalog item after reload page 2022-08-15 12:55:11 +03:00
TimofeyBoyko
818e3ff9ba Web:Client:Article: delete useless code 2022-08-15 12:54:44 +03:00
520ccb172f Merge branch 'develop' into feature/inifinite-scroll 2022-08-15 12:17:37 +03:00
769f70db18 Web: Files: fixed hotkeys scroll 2022-08-15 12:06:19 +03:00
TimofeyBoyko
3420660eba Web:Client:Article: add isActive state for accounts item of catalog 2022-08-15 11:59:38 +03:00
12548b6ea8 Web:Components:Removed light theme color changes for StyledButtonAlertIcon. 2022-08-15 11:51:33 +03:00
4863150dc6 Web:Client:Added InfoPanelToggleTheme. 2022-08-15 11:16:17 +03:00
3a80b93bca Web:Common:Added InfoPanelToggleTheme. 2022-08-15 11:15:44 +03:00
d941020ef3 Web: Added updating folder list when changed provider. 2022-08-15 11:02:07 +03:00
d96a3140dc Web:Common:Added FloatingButtonTheme. 2022-08-15 10:38:46 +03:00
TimofeyBoyko
4cd8e666ba Merge branch 'develop' into feature/system-plugin-v2 2022-08-15 10:31:57 +03:00
af491f2a53 Web: Added new prop for connect dialog. 2022-08-15 10:20:28 +03:00
TimofeyBoyko
bf1d0b3b5c Web:Client:ContextOptionsStore: return item as function argument to plugin callbacks 2022-08-15 09:54:36 +03:00
TimofeyBoyko
698a34198d Web:Client:Plugin: fix deactivate method for plugin store 2022-08-15 09:53:46 +03:00
e3d82a9f7a Web: Restore/ManualBackup: Refactoring, added file selection. 2022-08-14 16:11:07 +03:00
c79d5e5885 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/login-confirm-redesign
# Conflicts:
#	common/ASC.WebDav/.yarn/install-state.gz
2022-08-12 18:17:31 +03:00
4e9c7a713d Merge 2022-08-12 18:07:44 +03:00
b82a4206e0 Merge branch 'develop' into feature/settings-common 2022-08-12 18:04:11 +03:00
160bc3a1a7 Web: Components: fixed grid loaders 2022-08-12 17:52:21 +03:00
5fcb32c16e Web: Files: fixed remove files 2022-08-12 17:35:30 +03:00
e5846be9ad Web: Refactoring, fixed bugs after merge. 2022-08-12 17:32:22 +03:00
055102cdac Web: Fixed bugs after merge. 2022-08-12 17:13:16 +03:00
22c45015c3 Web: Components: fixed scroll 2022-08-12 17:01:53 +03:00
a35aa2d306 Web: Files: fixed create folders 2022-08-12 15:56:18 +03:00
2ec456f070 Web: Components: fixed height error 2022-08-12 15:31:21 +03:00
645c771b3b Web: Components: fixed table columns 2022-08-12 15:28:57 +03:00
87d351a304 Web: Components: fixed List width, fixed fetch 2022-08-12 14:45:14 +03:00
c72a9b18e0 Login: comment signin with code 2022-08-12 14:40:25 +03:00
72207f7496 Web:Common:Fix. 2022-08-12 14:33:21 +03:00
b0781a59f0 Web:Common:Added LoadingButtonTheme. 2022-08-12 14:33:09 +03:00
856c1a1266 Web: SelectFolderInput: Returned imports. 2022-08-12 13:53:12 +03:00
191f527028 Login: RoomsLogin: fix 2022-08-12 13:48:30 +03:00
d32cadc5e3 Login: RoomsLogin: add background pattern 2022-08-12 13:36:08 +03:00
938b34bcdc Login: redesign 2022-08-12 13:33:38 +03:00
4638c8dca5 Login: add translates 2022-08-12 13:33:20 +03:00
f60aaef514 Login: CodeLogin: add logo 2022-08-12 13:32:58 +03:00
6c2b49470c WEb: Fixed after merge. 2022-08-12 13:25:29 +03:00
4feba8a356 Merge branch 'develop' into feature/inifinite-scroll 2022-08-12 13:08:12 +03:00
ba66b55d4d Login: fix register height 2022-08-12 13:07:42 +03:00
1853175976 Web: Files: fixed create/rename events 2022-08-12 12:56:57 +03:00
200b425a39 Web:Common:Added LinkForgotPasswordTheme. 2022-08-12 12:35:50 +03:00
3bbd457505
Merge branch 'develop' into feature/login-confirm-redesign 2022-08-12 12:05:40 +03:00
Artem Tarasov
649a9d5ed5 Web: Editor: fixed duplication of global styles on each request (production) 2022-08-12 11:26:54 +03:00
ac01f1f91c Web:Components:Added ComboButtonTheme. 2022-08-12 11:16:43 +03:00
53ddfa421d Web:Components:Added InputBlockTheme. 2022-08-12 11:14:23 +03:00
aeef316114 Web:Components:Added TextInputTheme. 2022-08-12 11:13:37 +03:00
7b03dfe3ae Web:Components:Added TextareaTheme. 2022-08-12 11:12:51 +03:00
b3e682299c Web:Common:Added TextareaTheme, InputBlockTheme, TextInputTheme, ComboButtonTheme. 2022-08-12 11:12:08 +03:00
7d691f6dcb Web: Common: fixed scroll 2022-08-12 11:00:42 +03:00
28c73a4a7c Web: Components: moved to react-virtualized, fixed blue screen 2022-08-12 10:35:32 +03:00
Artem Tarasov
7673750d41 Web: Editor: fixed duplication of global styles on each request 2022-08-12 10:02:41 +03:00
484d1867e6 Confirm: fix style 2022-08-11 17:43:39 +03:00
eea2c0c656 Components: FormWrapper: fix min-width 2022-08-11 17:43:30 +03:00
6316de2937 Components: FormWrapper: fix width 2022-08-11 17:17:21 +03:00
962ebd4e9c Confirm: fix style 2022-08-11 17:16:20 +03:00
4463fc6e8f Merge branch 'develop' into feature/docspace-backup
# Conflicts:
#	packages/asc-web-common/api/settings/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/sub-components/ButtonContainer.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/DirectConnectionContainer.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/DirectThirdPartyConnection.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/FormConnection.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/GetThirdPartyStoragesOptions.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/consumer-storage-settings/InputsMethods.js
#	packages/common/components/Loaders/AutoBackupLoader/StyledAutoBackup.js
#	packages/common/components/Loaders/AutoBackupLoader/index.js
#	packages/common/components/Loaders/DataBackupLoader/StyledDataBackup.js
#	packages/common/components/Loaders/DataBackupLoader/index.js
#	packages/common/components/Loaders/RestoreBackupLoader/StyledRestoreBackup.js
#	packages/common/components/Loaders/RestoreBackupLoader/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
#	products/ASC.Files/Client/src/components/panels/SelectionPanel/SelectionPanelBody.js
#	products/ASC.Files/Server/GlobalUsings.cs
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/StyledBackup.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/DocumentsModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/ThirdPartyModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/ThirdPartyStorageModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/AmazonSettings.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/GoogleCloudSettings.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/RackspaceSettings.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/SelectelSettings.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/DocumentsModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/ThirdPartyModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/ThirdPartyStorageModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/AmazonStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/GoogleCloudStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/RackspaceStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/SelectelStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/DocumentsModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/ThirdPartyResourcesModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/ThirdPartyStoragesModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/AmazonStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/GoogleCloudStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/RackspaceStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/SelectelStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
#	web/ASC.Web.Client/src/store/BackupStore.js
2022-08-11 17:10:37 +03:00
c2f5295b52 Confirm: fix style 2022-08-11 16:49:05 +03:00
f4caa90745 Confirm: fix style 2022-08-11 16:36:17 +03:00
1f035e9556 Confirm: fix style 2022-08-11 16:30:11 +03:00
TimofeyBoyko
0353092791 Web:Client:Plugins: delete useless code 2022-08-11 16:18:36 +03:00
TimofeyBoyko
ecf3da4668 Web:Components:DropDownItem: add available display icon as link 2022-08-11 16:14:14 +03:00
c39451a531 Web: Added room selection. 2022-08-11 15:54:12 +03:00
6a386f9be0 Confirm: fix style 2022-08-11 15:22:44 +03:00
8c3bc03f6d Components: FormWrapper: fix width 2022-08-11 15:22:30 +03:00
18863258a0 Confirm: fix style 2022-08-11 14:53:43 +03:00
fe15fcffb3 Web:Common:Added VersionBadgeTheme. 2022-08-11 11:32:15 +03:00
TimofeyBoyko
7e16507b41 Web:Client:Plugins: refactoring plugin store and helplers 2022-08-10 17:47:15 +03:00
TimofeyBoyko
10e20b9f17 Web:Helplers:Plugins: add plugin type for contstants 2022-08-10 16:26:33 +03:00
TimofeyBoyko
d6f1f99d02 Web:Components:ContextMenu: add available show item icon from relative path 2022-08-10 16:21:00 +03:00
2aed8eb3a0 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/login-confirm-redesign
# Conflicts:
#	packages/asc-web-components/index.js
#	packages/client/src/DocspaceLogo/index.js
#	packages/client/src/pages/Confirm/ConfirmWrapper.js
#	packages/components/form-wrapper/index.js
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header-unauth.js
#	web/ASC.Web.Client/src/components/pages/Confirm/index.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/StyledConfirm.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePhone.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/profileRemove.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/tfaActivation.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/tfaAuth.js
#	web/ASC.Web.Login/src/Login.jsx
#	web/ASC.Web.Login/src/StyledLogin.js
2022-08-10 16:16:43 +03:00
1c07363c48 SSO: fix edit 2022-08-10 15:30:41 +03:00
d0ea9b4d7e SSO: fix clear data 2022-08-10 13:47:45 +03:00
492ed86674 Web: Files: fixed double scroll 2022-08-10 13:32:17 +03:00
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
67cedcd06e Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2022-08-09 19:08:11 +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
c680c90580 Web:Components:add support dark-theme for tag component 2022-08-09 11:15:01 +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
8ffffd72b5 Merge branch 'feature/inifinite-scroll' of github.com:ONLYOFFICE/AppServer into feature/inifinite-scroll 2022-08-09 09:31:35 +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
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
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
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
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
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
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
f7b24248da Section: fix settings style 2022-08-04 01:36:19 +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
mushka
1e10e329d9 added ability to pass props directly to tooltip through help-button 2022-08-03 14:28:00 +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
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
mushka
a418d7d42d Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2022-08-02 12:18:06 +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
7000cd55f6 Merge branch 'develop' into refactoring/client 2022-08-01 15:59:18 +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
mushka
f2112365b8 Merge branch 'develop' into feature/create-room 2022-08-01 09:59:21 +03:00
mushka
6823957d47 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2022-08-01 09:57:22 +03:00
mushka
8ae3d46e24 modal dialog tweaks and fixes 2022-08-01 09:52:48 +03:00
mushka
97c83a1d30 added api calls for room editing 2022-08-01 09:51:55 +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
16d35e05b7 Merge branch 'feature/docspace-backup' of github.com:ONLYOFFICE/AppServer into feature/docspace-backup 2022-07-29 18:06:35 +03:00
b9fa0f4673 Web: Added new options for Amazon storage. 2022-07-29 18:04:23 +03:00
6fd385e026 Merge branch 'develop' into feature/docspace-backup 2022-07-29 11:13:42 +03:00
4c097607f9 Web: Fix position of MainButton with logo and display logo 2022-07-29 10:17:41 +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
c1ab8edaaf Merge branch 'develop' into refactoring/client 2022-07-28 18:32:32 +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
09c19fdcb9 Web:Components:Added CalendarTheme. 2022-07-27 19:19:04 +03:00
af10ec18d2 Web:Common:Added IconWrapperTheme, CalendarTheme. 2022-07-27 19:18:21 +03:00
0f2564afbc Web:Common:Added FilterBlockItemTagTheme. 2022-07-27 16:45:18 +03:00
cd85409a1f Web:Components:Added MainButtonMobileTheme. 2022-07-27 15:07:04 +03:00
d77b0fde43 Web:Common:Added IndicatorFilterButtonTheme. 2022-07-27 15:06:42 +03:00
5141e39d7b Web:Common:Added MainButtonMobileTheme, IndicatorFilterButtonTheme. 2022-07-27 15:06:01 +03:00
0e0cc87aba Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
#	public/locales/az/Common.json
#	public/locales/bg/Common.json
#	public/locales/cs/Common.json
#	public/locales/de/Common.json
#	public/locales/el/Common.json
#	public/locales/en/Common.json
#	public/locales/es/Common.json
#	public/locales/fi/Common.json
#	public/locales/fr/Common.json
#	public/locales/it/Common.json
#	public/locales/ja/Common.json
#	public/locales/ko/Common.json
#	public/locales/lo/Common.json
#	public/locales/lv/Common.json
#	public/locales/nl/Common.json
#	public/locales/pl/Common.json
#	public/locales/pt-BR/Common.json
#	public/locales/pt/Common.json
#	public/locales/ro/Common.json
#	public/locales/ru/Common.json
#	public/locales/sk/Common.json
#	public/locales/sl/Common.json
#	public/locales/tr/Common.json
#	public/locales/uk/Common.json
#	public/locales/vi/Common.json
#	public/locales/zh-CN/Common.json
2022-07-26 19:02:17 +03:00
c23df6273e Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-confirm-redesign 2022-07-26 17:48:35 +03:00
53a4e15b52 Web: Components: FormWrapper: fix style 2022-07-26 13:22:01 +03:00
c5baa8834d Web: Fix 'Accounts' imports, routes and includes 2022-07-26 12:51:52 +03:00
5dccd8f52c Web: Backup: Added direct third-party connection component. 2022-07-26 12:03:35 +03:00
Artem Tarasov
045c00b4ff Web: Common/Doceditor: fixed name of init state of editor 2022-07-26 10:56:25 +03:00
e41c2f9333 Web:Common:Added theme changer for Badges. 2022-07-26 10:39:23 +03:00
59a4b07ff3 Web:Common:Fix. 2022-07-26 10:38:09 +03:00
0ebd28f299 Web: Merged 'People' module with 'Client' and fixed paths 2022-07-25 22:19:47 +03:00
a588f4aacc Web:Common:Added theme changer for QuickButtons. 2022-07-25 22:15:33 +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
9da2f25991 Web:Components:Added theme changer for TabContainer. 2022-07-25 20:29:59 +03:00
1af0fa4d51 Web:Common:Added theme changer for TabContainer. 2022-07-25 20:29:20 +03:00
94cb5b0a18 Web: Components: init form wrapper 2022-07-25 19:27:34 +03:00
c35a5b50b9 Web:Components:Added theme changer for SubmenuTextTheme, SubmenuItemLabelTheme, ToggleButtonTheme. 2022-07-25 18:49:26 +03:00
a476bbe9f8 Web:Common:Added theme changer for SubmenuTextTheme, SubmenuItemLabelTheme, ToggleButtonTheme. 2022-07-25 18:48:32 +03:00
82a58efebd Web: Common: add class with-background-pattern 2022-07-25 18:28:23 +03:00
mushka
30d2b47fb0 added createTag and addTagsToRoom api calls 2022-07-25 18:14:16 +03:00
Artem Tarasov
42c42f19eb Merge branch 'develop' into bugfix/doceditor-fix 2022-07-25 18:05:08 +03:00
Artem Tarasov
64305a3c2c Web: Common/Doceditor: fixed request of build version and custom scheme 2022-07-25 17:10:38 +03:00
9062431197 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso 2022-07-25 17:02:18 +03:00
0b706db9ff Web: Common: Article: add margin 2022-07-25 16:47:04 +03:00
Artem Tarasov
e701def2d7 Web: Common/Doceditor: fixed portal settings request 2022-07-25 16:24:10 +03:00
Artem Tarasov
ba40abd43e Web: Common/Doceditor: fixed user request when initializing auth state 2022-07-25 16:14:24 +03:00
ee5a326bc8 Web: Common: Article: fix scroll position 2022-07-25 15:53:04 +03:00
ea79763079 Web: Common: Article: fix style 2022-07-25 11:42:40 +03:00
0425c79018 Web:Common:Delete className. 2022-07-25 10:41:55 +03:00
2eaa0940d9 Web:Components:Delete className. 2022-07-25 10:41:44 +03:00
3958ef0173 Web:Components:Added theme changer for CatalogItem. 2022-07-25 10:40:03 +03:00
f9640a400c Web: Moved 'People' images and translations to 'Client' 2022-07-25 10:29:16 +03:00
mushka
f0c30dbc5c fixes on drop-down component 2022-07-24 23:42:10 +03:00
66e2f28c8c Web:Components:Added theme changer for buttons, badges, main-button. 2022-07-24 21:11:11 +03:00
dd4dc6cb55 Web:Common:Added component ColorTheme. 2022-07-24 21:10:56 +03:00
mushka
4866fb8070 added interaction with height and heightTablet props for DropDown 2022-07-24 21:06:18 +03:00
mushka
5575789062 new props for DropdownItem: hight and heightTablet 2022-07-24 21:05:14 +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
mushka
42a2ce2292 Merge branch 'develop' into feature/create-room 2022-07-24 19:03:23 +03:00
mushka
2b119c35b7 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2022-07-24 19:00:28 +03:00
mushka
93390a86ef fixes on dropdown component 2022-07-24 18:55:07 +03:00
mushka
11713f5b82 added ability to lock scroll on modal 2022-07-23 02:05:17 +03:00
2e5f2cb7a6 Web: Components: Themes: fix padding 2022-07-23 01:39:54 +03:00
a0f3e18b91 Web: Common: Article: fix style 2022-07-23 01:27:22 +03:00
79296c742f Web: Common: Article: fix header jump 2022-07-23 01:23:25 +03:00
6786fd40b0 Web: Common: Article: fix desktop width 2022-07-23 01:20:19 +03:00
3735ca16b3 Web: Common: Article: fix jumping 2022-07-23 00:53:40 +03:00
e7252c4bc4 Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00
44c65ee52c Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
#	public/locales/az/Common.json
#	public/locales/bg/Common.json
#	public/locales/cs/Common.json
#	public/locales/de/Common.json
#	public/locales/el/Common.json
#	public/locales/en/Common.json
#	public/locales/es/Common.json
#	public/locales/fi/Common.json
#	public/locales/fr/Common.json
#	public/locales/it/Common.json
#	public/locales/ja/Common.json
#	public/locales/ko/Common.json
#	public/locales/lo/Common.json
#	public/locales/lv/Common.json
#	public/locales/nl/Common.json
#	public/locales/pl/Common.json
#	public/locales/pt-BR/Common.json
#	public/locales/pt/Common.json
#	public/locales/ro/Common.json
#	public/locales/ru/Common.json
#	public/locales/sk/Common.json
#	public/locales/sl/Common.json
#	public/locales/tr/Common.json
#	public/locales/uk/Common.json
#	public/locales/vi/Common.json
#	public/locales/zh-CN/Common.json
#	web/ASC.Web.Client/src/store/index.js
2022-07-22 19:04:35 +03:00
1d10263162
Merge branch 'develop' into feature/remove-header 2022-07-22 18:59:13 +03:00
58626a8b4f Web: Components: HelpButton: fix icon 2022-07-22 18:13:17 +03:00
6dcac0eb0d Web: Components: Themes: fix color 2022-07-22 18:04:54 +03:00
4ce9acce3d Merge branch 'develop' into feature/sso
# Conflicts:
#	products/ASC.Files/Server/DocStore
2022-07-22 17:23:36 +03:00
bf1ce10736 Web: Common: Article: fix styles 2022-07-22 16:20:01 +03:00
mushka
003dc33ba8 Merge branch 'develop' into feature/create-room 2022-07-22 14:35:47 +03:00
5479b3452b Web: Common: Article: fix style 2022-07-22 13:50:57 +03:00
b8e7eb9752 Web: Common: Article: fix area click 2022-07-22 13:43:27 +03:00
93d7221388 Web: Components: IconButton: add height 2022-07-22 13:43:11 +03:00
mushka
dba0fa32c7 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2022-07-22 13:40:56 +03:00
23d6cb773e Web: Common: Article: fix styles 2022-07-22 13:29:22 +03:00
12e7d4edbf Merge branch 'develop' into feature/settings-common 2022-07-22 13:22:59 +03:00
20d83a0059 Web: Common: Article: fix username 2022-07-22 12:53:02 +03:00
mushka
07e6ccbcf7 overall fixes and Image editor tryouts 2022-07-22 12:31:26 +03:00
mushka
bf4f2d5bad add ThirpartyComboBox 2022-07-22 12:30:53 +03:00
af377fae99 Merge branch 'develop' into feature/inifinite-scroll 2022-07-22 12:18:47 +03:00
9eec30a707 Web:Common:Added methods getAppearanceTheme, sendAppearanceTheme. 2022-07-22 11:11:27 +03:00
af85268ff1 Web: Common: Article: fix styles 2022-07-22 10:55:26 +03:00
180aa03d95 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header 2022-07-22 10:22:52 +03:00
TimofeyBoyko
9e3eb3c008 Web:Common:FilterInput: fix multy line of selected items 2022-07-22 05:37:17 +03:00
c15ca79dcb Web: Common: Article: fix styles 2022-07-21 18:40:45 +03:00
Artem Tarasov
284f0ef58d Web: Common/Client: deleted unnecessary comment, fix import tryRedirectTo 2022-07-21 18:05:23 +03:00
a288d72db2 Web: Common: Article: increase area click 2022-07-21 17:45:46 +03:00
afdd1b7908 Web: Components: ContextMenuButton: add iconClassName prop 2022-07-21 17:44:13 +03:00
459cc8d92e Web: Common: Article: truncate long text 2022-07-21 17:10:30 +03:00
bdb3860b54 Web: Common: Article: add redirect to home page 2022-07-21 16:51:19 +03:00
07d8339b6a Web: Common: Article: fix styles 2022-07-21 16:41:12 +03:00
Artem Tarasov
345dad709c Merge branch 'develop' into feature/doceditor-ssr 2022-07-21 16:02:48 +03:00
mushka
682b256cbe Merge branch 'develop' into feature/create-room 2022-07-21 15:49:10 +03:00
71fd2efab9 Merge branch 'develop' into feature/inifinite-scroll
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContainer.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableContainer.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js
2022-07-21 15:14:44 +03:00
ff04dcf1f4 Web: Common: Article: hide header on mobile 2022-07-21 14:45:28 +03:00
2fe786769f Web: Common: SettingsStore: fix logo url 2022-07-21 14:43:22 +03:00
831bdc578f Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
#	packages/asc-web-common/components/Article/styled-article.js
#	products/ASC.Files/Client/src/Files.jsx
2022-07-21 14:22:28 +03:00
mushka
7e9290f3bc Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2022-07-21 14:19:25 +03:00
7045bd8540
Merge branch 'develop' into feature/sso 2022-07-21 13:07:36 +03:00
TimofeyBoyko
d742e5529c Web:Components:ContextMenu: delete useless code 2022-07-21 13:00:43 +03:00
TimofeyBoyko
77f8eecf78 Web:Files: fix header of context menu for rooms 2022-07-21 12:01:38 +03:00
77d311b636
Merge branch 'develop' into feature/doceditor-ssr 2022-07-21 11:41:42 +03:00
a9d23c4d19 Web: Files: InfiniteLoader: refactoring 2022-07-21 11:27:29 +03:00
TimofeyBoyko
1633d0782a Web:Files:TableView: fix view at room folder when info panel is open 2022-07-21 11:24:24 +03:00
TimofeyBoyko
59fb67d3d2 Web:Files:Filter: fix clear filter 2022-07-20 19:10:27 +03:00
TimofeyBoyko
9ca843c26e Web:Common:FilterInput: fix spread operator for changeFilterValue method 2022-07-20 18:51:24 +03:00
TimofeyBoyko
5f7fd97f46 Web:Common:Loaders: remove search block from filter block loader 2022-07-20 18:44:18 +03:00
TimofeyBoyko
1f918c7ee8 Web:Components:MainButtonMobile: fix display for rooms 2022-07-20 17:03:14 +03:00
61c1959cb5 Merge branch 'develop' into feature/inifinite-scroll 2022-07-20 16:14:39 +03:00
bdc07bd48d Web: Components: added resetAfterIndex after folder change 2022-07-20 16:13:50 +03:00
TimofeyBoyko
66e4f2b12d Web:Api: add withoutTags for rooms filter 2022-07-20 15:20:56 +03:00
TimofeyBoyko
f95d01dc7d Web:Api:Rooms: add withoutMe to rooms filter 2022-07-20 15:11:14 +03:00
366c50bfc4 Web: Common: Article: add logo 2022-07-20 14:58:50 +03:00
TimofeyBoyko
7a9114f562 Merge branch 'develop' into feature/virtual-rooms-page 2022-07-20 14:29:04 +03:00
68bfe739ca Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header 2022-07-20 14:15:42 +03:00
5b762545a4 Merge branch 'develop' into feature/settings-common 2022-07-20 14:00:11 +03:00
310c774cfb Web: Components: added custom scroll, changed outerElementType for VariableSizeList 2022-07-20 13:25:33 +03:00
ab3b5a2dec Web: Files: moved InfiniteGrid to components 2022-07-20 12:31:57 +03:00
d459a92c05 Merge branch 'develop' into feature/inifinite-scroll 2022-07-20 10:51:42 +03:00
75042eedf0 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
#	packages/asc-web-common/components/Article/styled-article.js
2022-07-20 10:00:32 +03:00
TimofeyBoyko
684e28d188 Web:Components:TableContainer: fix color of icon for group menu items 2022-07-20 08:40:11 +03:00
TimofeyBoyko
0782af817f Merge branch 'develop' into feature/virtual-rooms-page 2022-07-20 08:36:31 +03:00
mushka
2e54e0c067 fixed aside scroll on mobile devices 2022-07-20 02:24:30 +03:00
mushka
c8b10fed16 updated api requests 2022-07-20 02:08:51 +03:00
Artem Tarasov
bd4eb87ae8 Web: Common: added export of fonts from the library 2022-07-19 23:11:29 +03:00
9e68c29d4f Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
#	web/ASC.Web.Client/public/locales/en/Settings.json
2022-07-19 21:22:18 +03:00
mushka
3b2d496909 Merge branch 'develop' into feature/create-room 2022-07-19 19:51:06 +03:00
Artem Tarasov
4ddffad7b2 Merge branch 'develop' into feature/doceditor-ssr 2022-07-19 18:22:16 +03:00
66b0e8c303
Merge branch 'develop' into bugfix/tfa 2022-07-19 18:17:22 +03:00
TimofeyBoyko
709b40f338 Web:Components:MainButtonMobile: add withoutButton prop 2022-07-19 16:30:19 +03:00
c6179665a3 Web: Common: Article: open context menu by avatar click on tablet 2022-07-19 16:12:46 +03:00
93418bcac0 Web: Components: ContextMenu: fix 2022-07-19 16:11:54 +03:00
TimofeyBoyko
fd818d148e Web:Common:Api: disable search withSubfolders and searchInContent for rooms 2022-07-19 15:57:14 +03:00
TimofeyBoyko
4614d3fb32 Web:Components:CatalogItem: fix position of badge icon 2022-07-19 15:52:49 +03:00
839d6870f5 Web: Common: Article: fix align avatar 2022-07-19 14:46:31 +03:00
Artem Tarasov
2e52b228fe Web: Common: AdvancedSelector: fixed user selection without existing groups on the portal 2022-07-19 12:06:01 +03:00
TimofeyBoyko
4084d3a250 Web:Common:FilterInput: add loader for filter block 2022-07-19 11:44:34 +03:00
TimofeyBoyko
e84c9e1f79 Web:Common:Loaders: add filter block loader 2022-07-19 11:37:51 +03:00
6e00220796 Web: Common: Article: use profile actions store 2022-07-18 21:47:05 +03:00
TimofeyBoyko
6e67c915db Web:Common:FilterInput: add new filter items for work with options and checkbox 2022-07-18 20:26:15 +03:00
TimofeyBoyko
f15894a7e9 Web:Common:Api: fix searchInContent 2022-07-18 19:34:04 +03:00
Artem Tarasov
10f2cde731 Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	.gitignore
2022-07-18 17:05:53 +03:00
81aa52e074 Web: Components: Themes: fix menu header colors 2022-07-18 16:31:40 +03:00
TimofeyBoyko
c3179249ef Web:Common:Api: fix rooms withSubfolder 2022-07-18 16:11:10 +03:00
e645fb8828 Web: Common: Article: fix profile style 2022-07-18 16:00:44 +03:00
afd5bc40f1 Web: Components: add theme 2022-07-18 16:00:14 +03:00
24423a2cb4 Web: RestoreBackup: Added new loader. 2022-07-18 14:39:11 +03:00
7cc4e482ea Web: Common: Article: add about action 2022-07-18 14:09:29 +03:00
TimofeyBoyko
4319c29da2 Web:Common:FilterInput: add display selected items under the filter row 2022-07-18 13:33:25 +03:00
TimofeyBoyko
8832aece23 Web:Files: move logic from virtual room page to home page 2022-07-16 09:50:32 +03:00
42bbecd463 Web: Backup: Added loaders. 2022-07-15 15:54:30 +03:00
0c048277ee Merge branch 'develop' into feature/inifinite-scroll 2022-07-15 15:18:48 +03:00
06092c8928 Web: Common: Article: hide profile on mobile 2022-07-15 14:01:33 +03:00
fd6f4bc6e4 Web: Components: Themes: fix header background 2022-07-15 14:01:02 +03:00
5d712ea8b1 Web: Components: moved ListComponent to another file, added GridComponent 2022-07-15 11:58:58 +03:00
mushka
d106647ecf tweaked DownloadDialog and fixed overall aside body scroll 2022-07-14 17:45:18 +03:00
mushka
1b895976f5 fixed DownloadAs panel 2022-07-14 17:26:21 +03:00
ec80b996e7 Web: Common: add confirmKey for validate tfa 2022-07-14 15:27:48 +03:00
379ed60458 Web: Common: fix set tfa api 2022-07-14 14:43:29 +03:00
TimofeyBoyko
564fe335f2 Web:Common:Api: add isRoom params to folder in getRooms method 2022-07-14 07:42:25 +03:00
TimofeyBoyko
33780332f7 Web:Components:CatalogItem: delete useless arg 'type' from onClick function 2022-07-14 07:11:57 +03:00
42b4d8a59e Web: Common: check password settings 2022-07-13 21:00:42 +03:00
04d2c2d51c Web: move profile block to common article 2022-07-13 14:03:08 +03:00
95726501bd Web:Components:TabContainer:Allow component to update when props change elements. 2022-07-13 12:36:33 +03:00
33914577d8 Web:Common:Adding the setColorScheme method. 2022-07-13 12:34:53 +03:00
mushka
e4d07810e8 fixed aside height on mobile browser 2022-07-12 17:40:00 +03:00
TimofeyBoyko
c59ffe797a Web:People: fix filter after refactoring 2022-07-12 17:04:30 +03:00
TimofeyBoyko
09122918f6 Merge branch 'develop' into feature/virtual-rooms-page 2022-07-12 16:19:00 +03:00
72b00ffe94 Merge branch 'develop' into feature/modal-redesign 2022-07-12 14:24:11 +03:00
mushka
45f2e63836 changed ConnectCloud dark theme and fixed ConsumerModalDialolg 2022-07-12 14:19:04 +03:00
404e014a59 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
#	products/ASC.Files/Client/src/Files.jsx
2022-07-12 14:18:29 +03:00
59121d0ced Web: Components: add base avatar size 2022-07-12 11:02:00 +03:00
TimofeyBoyko
6602a71fe6 Web:Common:API: add isArchive to archived rooms 2022-07-12 10:22:19 +03:00
7b42f63d28 Web: Components: ContextMenuButton: fix warning 2022-07-11 22:53:12 +03:00
mushka
7d22e52c70 fixed mobile keyboard interaction with dialogs 2022-07-11 20:43:25 +03:00
mushka
ada4ab71b8 fixed backdrop height on mobile browsers 2022-07-11 17:37:28 +03:00
55d67a4ed0 Web: Components: fixed updateTableRows 2022-07-11 17:29:18 +03:00
85b92385df Web: Components: created InfiniteLoader component 2022-07-11 17:06:21 +03:00
TimofeyBoyko
8bad489bf1 Web:Common:Navigation: add isRootRoom as second argument to onClick item 2022-07-11 16:08:40 +03:00
f69a87a7a7 Web: Files: added InfiniteLoader to table view 2022-07-11 15:25:00 +03:00
baea63043c Web: Components: Utils: fix hugeMobile size 2022-07-11 14:48:25 +03:00
mushka
2fb38338e5 fixed backdrop and Debug dialog 2022-07-11 13:30:55 +03:00
c8db893dc4 Merge branch 'develop' into feature/inifinite-scroll 2022-07-11 11:10:56 +03:00
Artem Tarasov
55198d0e7f Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	web/ASC.Web.Editor/src/i18n.js
#	web/ASC.Web.Editor/webpack.config.js
#	yarn.lock
2022-07-10 11:23:44 +03:00
TimofeyBoyko
ca099daffb Web:Common: fixed export and import decodeDisplayName 2022-07-08 18:30:50 +03:00
TimofeyBoyko
2e72e298e6 Web:Common: fixed export and import decodeDisplayName 2022-07-08 18:29:50 +03:00
TimofeyBoyko
43b9b6183c Web:Common:Api: add decodeDisplayName to getRooms and getRoom api rooms methods 2022-07-08 18:22:11 +03:00
TimofeyBoyko
2155df63fe Web:Common:Api: move decodeDisplayName function from files api to utils 2022-07-08 18:20:25 +03:00
mushka
58e68c1c12 Merge branch 'develop' into feature/modal-redesign 2022-07-08 17:23:02 +03:00
TimofeyBoyko
54435e755e Web:Common:Api: fix equals rooms filter method 2022-07-08 14:50:42 +03:00
TimofeyBoyko
b9e8ae7edc Web:Components:Tag: fix onClick function 2022-07-08 14:41:06 +03:00
TimofeyBoyko
e5c46f62b6 Web:Common:Tags: add onSelectTag function 2022-07-08 14:40:49 +03:00
TimofeyBoyko
f9fa940fb2 Web:Common:Api: fix clone rooms filter 2022-07-08 14:40:30 +03:00
412bc21104 Web: Components: Themes: add upload button theme 2022-07-08 13:42:28 +03:00
TimofeyBoyko
c8feb7899b Merge branch 'develop' into feature/virtual-rooms-page 2022-07-08 12:32:26 +03:00
TimofeyBoyko
7803751844 Web:Common:FilterInput: refactoring 2022-07-08 12:10:37 +03:00
TimofeyBoyko
334367bb33 Web:Common:Tags: delete 'No tag' tag if tags length = 0 2022-07-08 10:41:36 +03:00
TimofeyBoyko
1e8859b29e Web:Common:Api: add method to get all tags 2022-07-08 10:41:00 +03:00
TimofeyBoyko
a3ca2d6052 Web:Common:Api: fix subject id for rooms filter 2022-07-08 10:40:26 +03:00
TimofeyBoyko
3adf3fe5aa Web:Common:Utils: update getObjectByLocation to work with array at URL 2022-07-08 10:40:04 +03:00
TimofeyBoyko
4ea77f00a5 Web:Common:Loaders: fix article loaders 2022-07-08 10:39:15 +03:00
TimofeyBoyko
9a541330aa Web:Common:Article: fix article width 2022-07-08 10:38:57 +03:00
0da612710d Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings 2022-07-07 19:39:12 +03:00
mushka
89dd7ab365 fixed translations, styles and dark theme for ConnectCloud 2022-07-07 19:25:31 +03:00
e5f56f6855 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso 2022-07-07 18:12:26 +03:00
dab94135cf Web: Components: fixed onClickOutside eventTypes 2022-07-07 17:58:41 +03:00
fb30766210 Fix Bug 58038: hide upload button by cross button 2022-07-07 13:16:46 +03:00
TimofeyBoyko
56c6873ac1 Web:Common:FilterInput: update for multiselect and refactoring 2022-07-07 12:23:21 +03:00
45b5859833 Merge branch 'release/v1.2' into feature/inifinite-scroll
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/FilesStore.js
2022-07-07 11:06:41 +03:00
mushka
3fd65e887d Merge branch 'release/v1.2' into feature/modal-redesign 2022-07-06 18:13:33 +03:00
398a87fc3d Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-07-06 18:07:22 +03:00
27109aae4a Fix Bug 57965: Added a scrollbar for the list of formats. 2022-07-06 18:06:32 +03:00
0b5dc80b42 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-07-06 16:36:30 +03:00
ba21d018c9 Fixed Bug 58016 - Mobile. Fixed action menu closing 2022-07-06 16:36:21 +03:00
dce8c778c3 Fix Bug 58018: active background 2022-07-06 16:26:58 +03:00
1e0ae3cc4b Fix Bug 57998: disable paging if one page 2022-07-06 15:12:02 +03:00
1a00edc87c Fixed Bug 57639: Added new icons for form actions. Fixed accordion menu sublevel padding and restored icons displaying. 2022-07-06 14:23:27 +03:00
47b4e2e753 Fixed Bug 57784: Common: Section: Fixed left padding for row view after change checkbox container 2022-07-06 13:18:45 +03:00
mushka
ce4e9c26fd removed divider from ConflicResolve and added second btn to ChangeEmail and ChangePassword 2022-07-06 13:02:52 +03:00
bcef77d46f Web: Common: FloatingButton: fix position 2022-07-05 23:52:37 +03:00
95ce082219 Web: Components: Added DropDown offsetLeft default value 2022-07-05 22:56:18 +03:00
8a960857e2 Fix Bug 57997 - Mobile. Hide sorting from 'Recent' 2022-07-05 19:07:06 +03:00
mushka
cdcfdccb57 fixed SelectFile and SelectFolder panels && moved their footers to ModalDialog.Footer subcomponent 2022-07-05 17:23:59 +03:00
49fae13345 Fixed Bug 57768 - Mobile. Fixed click on context menu items 2022-07-05 16:32:05 +03:00
e1e0b37429 Web: Common: Navigation: fix clear trash icon 2022-07-05 15:28:07 +03:00
mushka
58aa87ff19 fixed Article CloseBtn and Header offset 2022-07-05 13:53:43 +03:00
c1b9bdc505 Web: Components: add offsetLeft 2022-07-05 13:34:21 +03:00
a386da4e63 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-07-05 13:17:57 +03:00
0abf68fb3e Fix Bug 57952: Removed mobile hover from MainButtonMobile. 2022-07-05 13:15:57 +03:00
29bf57205d Web: Components: MainButtonMobile: Fixed withoutIcon property usage 2022-07-05 12:41:22 +03:00
6c2c1b3997 Web: Components: DropDownItem: Fixed withoutIcon property usage if we no need display icon on sublevel 2022-07-05 12:40:50 +03:00
mushka
9f002e3249 Merge branch 'release/v1.2' into feature/modal-redesign 2022-07-05 12:17:58 +03:00
TimofeyBoyko
a2a689ecca Web:Common:FilterInput: update filter block item for multi select in selector 2022-07-05 10:03:52 +03:00
TimofeyBoyko
082fa0afb2 Web:Common:Utils: update to urlParams for array key 2022-07-05 10:03:12 +03:00
TimofeyBoyko
4b326c9dbc Web:Common:Api: fix rooms filter 2022-07-05 10:02:45 +03:00
b61e98775b Fix Bug 57967: two dropdown 2022-07-04 20:32:18 +03:00
703ff843f6 Web: i18n: Fix already loaded condition check in @appserver/common/utils/i18next-http-backend 2022-07-04 18:49:46 +03:00
552002c560 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-07-04 18:37:53 +03:00
d81f33e6de Fix Bug 57753: too dark final version badge 2022-07-04 18:37:45 +03:00
6be4108159 Web:Components:Fix style. 2022-07-04 18:26:14 +03:00
881bad2626 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-07-04 18:20:27 +03:00
9de6439c78 Web:Components:Fix style. 2022-07-04 18:20:19 +03:00
e7d4e1f80e Web: i18n: Added "cross-fetch" for @appserver/common/utils/i18next-http-backend 2022-07-04 18:13:23 +03:00
90fe1383b7 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-07-04 18:04:06 +03:00
f95f91d737 Fix Bug 53335: disable save button if no change 2022-07-04 17:51:14 +03:00
d8a459f397 Web: i18n: Replaced i18next-http-backend package with custom realization from @appserver/common/utils/i18next-http-backend (fix issue: too many same translations files are loading at once) 2022-07-04 17:47:12 +03:00
TimofeyBoyko
bbce2a0125 Web:Common:Filter: add sort button for all view for rooms pages 2022-07-04 16:52:55 +03:00
4f2bfd2d02 Web:Components:Fix style. 2022-07-04 16:07:19 +03:00
TimofeyBoyko
e8a1808711 Web:Common:Tags: fix display tags when columnCount === 0 2022-07-04 16:04:34 +03:00
1e0962a11a Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-07-04 15:49:11 +03:00
421070f3a3 Fix Bug 57864: For phones in landscape orientation, shifting the list of access rights to the right in ExternalLink to personal. 2022-07-04 15:48:42 +03:00
mushka
24c0397ef0 fixed DeleteProfileEver and DeleteUsersDialog + fixed ModalDialogComponent 2022-07-04 13:20:18 +03:00
mushka
f88b82670a tweaks on ModalDialog component 2022-07-04 12:12:02 +03:00
d4b9709d60 Web: Common: API: fix request 2022-07-04 11:56:22 +03:00
2a75edcfc5 Web: Common: API: fix sso path 2022-07-04 11:53:33 +03:00
TimofeyBoyko
4e0026b450 Web:Common:FilterInput: refactoring 2022-07-04 11:10:43 +03:00
635eaa6156 Web: Components: MainButtonMobile: use withoutIcon 2022-07-04 07:24:17 +03:00
c9689905e9 Web: Components: DropDownItem: add withoutIcon prop 2022-07-04 07:23:51 +03:00
6c2baae9fd Web: Components: MainButtonMobile: add submenu 2022-07-04 07:10:55 +03:00
bc48d626c8 Web: Components: DropDownItem: add empty item without icon 2022-07-04 07:08:54 +03:00
a651b2fb34 Web: Components: DropDownItem: add submenu 2022-07-04 06:18:28 +03:00
d8b8aa8b4e Web: Common: Navigation: use context menu 2022-07-04 06:16:24 +03:00
e2a8f2a62d Web: Components: ContextMenu: add leftOffset prop 2022-07-04 06:15:45 +03:00
TimofeyBoyko
de05711dfc Web:Components:Row: add rowContextClose callback 2022-07-04 04:58:18 +03:00
TimofeyBoyko
208499be9e Web:Components:RoomLogo: update classes 2022-07-04 04:57:58 +03:00
TimofeyBoyko
17bcf2e98c Web:Components:Tag: fix label of dropdown item 2022-07-04 04:57:28 +03:00
TimofeyBoyko
e75368a0b1 Web:Common:Tags: update tags component for work with array of string 2022-07-04 04:56:56 +03:00
31fbe6f058 Bug 57777 - Docs: Paging buttons text moved upper common buttons line 2022-07-03 16:25:41 +03:00
d6b7db91e3 Web: Translations: Added translations minimization 2022-07-03 13:25:41 +03:00
TimofeyBoyko
485adf6b39 Web:Components:RoomLogo: add checkbox 2022-07-03 08:24:46 +03:00
Artem Tarasov
2ef94f75da Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Editor/src/Editor.jsx
#	web/ASC.Web.Editor/webpack.config.js
#	yarn.lock
2022-07-01 23:41:10 +03:00
TimofeyBoyko
986b4d6d0a Web:Common:Api: add new API methods for rooms 2022-07-01 18:28:24 +03:00
4a92908fc6 Fix Bug 57914 - Client.Clouds.DropBox. Incorrect date in Modified/Created columns for DropBox folders. 2022-07-01 17:33:18 +03:00
b54e47a10e Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso 2022-07-01 13:37:47 +03:00
24ff817701 Web: Files: fixed row-loader styles 2022-07-01 12:17:59 +03:00
TimofeyBoyko
d699b30ed4 Web:Common:Api: add new api methods for archive and unarchive rooms 2022-07-01 11:58:41 +03:00
TimofeyBoyko
3e07ef1efc Merge branch 'develop' into feature/virtual-rooms-page 2022-07-01 10:09:47 +03:00
TimofeyBoyko
4d383cac9d Fixed Bug 57845 - Client.Filter. Remove the need to confirm filter cleaning 2022-07-01 07:12:02 +03:00
b03c24ac48 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-30 15:46:07 +03:00
2e5000d6bc Web:Components:Fix not wrapping a long word in a toast. 2022-06-30 15:45:54 +03:00
fe294e77e1 Fix Bug 57877: show icon badge where hover 2022-06-30 13:52:50 +03:00
e891f8b6d6 Fixed Bug 57880: Added theme support for download dialog. 2022-06-30 13:14:31 +03:00