Commit Graph

37707 Commits

Author SHA1 Message Date
gazizova-vlada
ca4201061b Merge branch 'develop' into feature/content-width-dividers 2023-09-06 13:06:16 +03:00
86257bb8da Web: SDK: Added onAuthSuccess event 2023-09-06 12:22:41 +03:00
25102157e6 Web: Deleted SelectFolderInput. 2023-09-06 11:56:16 +03:00
8fe5d67405 Web: DeveloperTools: Replacement with a new file selector. 2023-09-06 11:46:10 +03:00
d788e533fd fixed migrations 2023-09-06 11:29:07 +03:00
2b40130bce Merge branch 'develop' into bugfix/backup 2023-09-06 10:51:25 +03:00
254b3bbff1 Web: Backup: Removed reset to default when leaving settings. 2023-09-06 10:31:49 +03:00
569330129b move api redirect uri from login provider 2023-09-06 10:13:46 +03:00
b52a90cf4a Web: Backup: Refactoring. 2023-09-06 10:06:53 +03:00
9a9dad8381 CSP: fixed room upload logo 2023-09-05 18:27:34 +03:00
2792df1a84 added pt-PT 2023-09-05 17:23:59 +03:00
d744651f55 Web: Files: Hotkeys: added Ctrl+c/Ctrl+v hotkeys support 2023-09-05 17:08:02 +03:00
2e17d714ca Web: Fix search is not defined 2023-09-05 17:52:01 +04:00
6b2f6b76aa Web: Restore: Added file selection for third-party accounts. 2023-09-05 16:34:13 +03:00
c6b7a33b14 Web: Deleted SelectFileInput component. 2023-09-05 16:18:04 +03:00
6611a1315d Web: Restore: Added file selection with new selector. 2023-09-05 15:42:35 +03:00
98583fcbd1 added sk, ko 2023-09-05 15:36:38 +03:00
Akmal Isomadinov
cb2a5da527 Web:Components:tooltip Refactoring 2023-09-05 16:57:31 +05:00
1378fb9195 Web: Added styles. 2023-09-05 14:16:45 +03:00
8e2159052f Web: FilesSelector: Removed useless code. 2023-09-05 14:12:35 +03:00
cd7eca41f3 Web: FilesSelector: Added types. 2023-09-05 14:09:02 +03:00
5a5e5d0a7d Web: Added showing a list of rooms if the selected room has been archived or deleted. 2023-09-05 13:57:00 +03:00
Akmal Isomadinov
e6832cb2d6 Web:Components:tooltip Added middlewares 2023-09-05 15:34:57 +05:00
Akmal Isomadinov
5e998e472d Web:Components:tooltip Added utils 2023-09-05 15:33:32 +05:00
Akmal Isomadinov
404fefab96 Web:Components Fixed tooltip component 2023-09-05 14:15:29 +05:00
Akmal Isomadinov
6f8f34468c Web: Updated tooltip 2023-09-05 14:14:37 +05:00
b390888cc7 Web: Backup: Refactoring. 2023-09-05 12:10:36 +03:00
0369705ae3 Merge branch 'develop' into feature/accounts-optimization
# Conflicts:
#	products/ASC.People/Server/Api/UserController.cs
2023-09-05 11:22:06 +03:00
d96e45abb7 Update yarn.lock 2023-09-05 12:08:32 +04:00
fb8159383b Web: Refactoring. 2023-09-05 10:47:02 +03:00
dc4b0275ec Web: Added redirect only for rooms on error. 2023-09-05 10:38:00 +03:00
0919a195cd Web: Backup: Added error handler. 2023-09-05 10:37:30 +03:00
1ee4861651 Web: Backup: Fixed file selection for rooms. 2023-09-05 10:36:02 +03:00
725ca4c16b Web: Backup: fixed file selection for third-party accounts. 2023-09-05 10:33:07 +03:00
96b916d81e Merge branch 'hotfix/v1.1.3' into develop 2023-09-05 09:45:42 +04:00
1e23dad91e
Merge pull request #1689 from ONLYOFFICE/feature/change-chunk-size-s3-copy-and-backup
change chunk size
2023-09-04 13:12:49 -07:00
2b86dd25df Merge branch 'develop' into feature/change-chunk-size-s3-copy-and-backup
# Conflicts:
#	config/backup.json
2023-09-04 23:11:47 +03:00
d864448da5 Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
#	products/ASC.Files/Core/Core/VirtualRooms/InvitationLinkService.cs
#	products/ASC.Files/Core/Utils/FileSharing.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
2023-09-04 23:01:50 +03:00
2fd15b4108
Merge pull request #1699 from ONLYOFFICE/refacroting/csp-to-core
common: move cspsettings from web.api to core.common project
2023-09-04 10:44:38 -07:00
a40294f624 fixed tag new creating after copy 2023-09-04 20:11:09 +03:00
7f9286219c optimized access check 2023-09-04 20:10:13 +03:00
e5b3d44bc3 fixed calculating hash 2023-09-04 19:55:54 +03:00
715c21f090 added ko, sk 2023-09-04 18:21:40 +03:00
761765cd2b Web: SDK: Allow calling framesdk function on editor.requestClose 2023-09-04 16:52:44 +03:00
83bc2edd02 Web: bump version to v1.1.3 2023-09-04 17:43:24 +04:00
3986e1fb98
Merge pull request #1700 from ONLYOFFICE/feature/zoom-login
Feature/zoom login
2023-09-04 16:38:37 +03:00
d3198671ba Merge remote-tracking branch 'remotes/origin/hotfix/v1.1.3' into feature/zoom-login
# Conflicts:
#	packages/common/constants/index.js
2023-09-04 16:38:06 +03:00
178534e9f1
Merge pull request #1701 from ONLYOFFICE/feature/zoom-browser
Feature/zoom browser
2023-09-04 16:34:59 +03:00
613938b819 Web: Added Zoom login button, translates and icons 2023-09-04 16:06:55 +03:00
2cdac01a1e Merge branch 'feature/zoom-browser' of https://github.com/ONLYOFFICE/DocSpace into feature/zoom-browser 2023-09-04 17:00:08 +04:00