Commit Graph

45655 Commits

Author SHA1 Message Date
328df23d4a Merge branch 'feature/VDR-room' into feature/VDR-lifetime 2024-05-22 12:57:39 +03:00
d2b6d23d9a Merge branch 'develop' into feature/VDR-room
# Conflicts:
#	packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/Rooms/index.js
2024-05-22 12:57:07 +03:00
3d9ffaf309 Web: Files: VDR-lifetime: fixed merge 2024-05-22 12:55:27 +03:00
07030faa8c Client: Changed icon of My Documents 2024-05-22 13:51:38 +04:00
bfe8ba5ffe
Merge pull request #420 from ONLYOFFICE/bugfix/scroll-issues
Bugfix/scroll issues
2024-05-21 20:01:12 +04:00
765d31beed
Merge pull request #418 from ONLYOFFICE/feature/refacroting-login
Feature/refactoring login
2024-05-21 19:57:23 +04:00
369fd5dc68 Login: delete console log 2024-05-21 18:49:45 +03:00
23fba61b52 Merge branch 'feature/refacroting-login' of github.com:ONLYOFFICE/DocSpace-client into feature/refacroting-login 2024-05-21 18:49:01 +03:00
a2da81c318 Login: add submit login for enter 2024-05-21 18:48:48 +03:00
49c3467475 Shared:Components:SocialButtonsGroup: add onMoreAuthToggle function 2024-05-21 18:48:29 +03:00
801caeac7b Shared:Table: fix undefined 2024-05-21 18:48:01 +03:00
b7a6d74406 Client: MediaViewer: Disable scroll to top after open/close media viewer 2024-05-21 17:47:32 +02:00
ade5717617 Shared: Scrollbar: Set cursor default to scroll thumbs 2024-05-21 17:47:32 +02:00
ffcebeb635 Shared:Components:TableHeaderCell: fix undefined 2024-05-21 19:45:47 +04:00
c8a35eacde Client:Components:SimulatePassword: fix undefined 2024-05-21 18:34:19 +03:00
5e02b121d4 Shared:Scrollbar: fix ssr render 2024-05-21 18:22:24 +03:00
ceeb8c8271 Merge branch 'develop' into feature/refacroting-login 2024-05-21 19:09:19 +04:00
7f46d74010 Merge branch 'hotfix/v2.5.1' into develop 2024-05-21 19:09:02 +04:00
d26faa09c5 Merge branch 'develop' into feature/refacroting-login
# Conflicts:
#	packages/shared/components/scrollbar/Scrollbar.tsx
2024-05-21 19:08:23 +04:00
832dc05e65
Merge pull request #405 from ONLYOFFICE/feature/hiding-scroll
Feature/hiding-scroll
2024-05-21 16:40:34 +04:00
68c06ac91a Merge branch 'feature/VDR-room' into feature/VDR-lifetime
# Conflicts:
#	packages/client/src/components/FilesPanels/index.js
#	packages/client/src/components/FilesSelector/index.tsx
#	packages/client/src/components/QuickButtons.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/components/selector/Selector.types.ts
#	packages/components/selector/index.tsx
#	packages/components/selector/sub-components/Body/Body.types.ts
#	packages/components/selector/sub-components/Item/Item.types.ts
#	packages/components/selector/sub-components/Item/StyledItem.ts
#	packages/components/selector/sub-components/Item/index.tsx
#	packages/components/themes/base.js
#	packages/shared/components/navigation/Navigation.tsx
#	packages/shared/components/selector/sub-components/Body.tsx
#	packages/shared/themes/dark.ts
2024-05-21 14:38:28 +03:00
05b47b3e1a Login: return API timers log 2024-05-21 14:31:14 +03:00
bab758d3ba Merge branch 'develop' into feature/refacroting-login 2024-05-21 13:42:09 +03:00
34b5ee9d9f Login: restore translation keys 2024-05-21 13:37:18 +03:00
8523fda056 Login: delete console log 2024-05-21 13:37:04 +03:00
a7bd84e936 Login: fix current color scheme 2024-05-21 13:15:21 +03:00
a3c9c55ad4 Merge branch 'develop' into feature/VDR-room
# Conflicts:
#	packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/Rooms/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/views/History/index.js
2024-05-21 12:55:23 +03:00
9441b328fe Login: fix not found error 2024-05-21 12:32:09 +03:00
bd00879ddf
Merge pull request #404 from ONLYOFFICE/refactoring/sdk-presets
refactoring/sdk-presets
2024-05-21 13:13:02 +04:00
3801069692
Merge pull request #417 from ONLYOFFICE/bugfix/profile-active-sessions
bugfix/profile-active-sessions
2024-05-21 13:10:59 +04:00
286fad43e2 Shared: Scrollbar: Fix bugs caused by merge develop 2024-05-21 11:05:40 +02:00
778fbb2c95 added comma after country 2024-05-21 13:48:56 +05:00
382dee0e2c refactored conditions for row view 2024-05-21 13:42:07 +05:00
03eade0701 refactored conditions 2024-05-21 13:38:27 +05:00
2bce1cfc2d Login: refactoring 2024-05-21 11:30:49 +03:00
45c380a488 removed duplicate divider 2024-05-21 13:28:33 +05:00
835e99dc05 removed duplicate divider 2024-05-21 13:21:13 +05:00
980637fcf1 added additional conditions 2024-05-21 13:04:52 +05:00
Iskandar Kurbonov
0caa51fcc2
Updates package versions when a release or hotfix branch is created (#329) 2024-05-21 11:00:25 +03:00
2b6514d6e4 fixed condition for displaying country and city 2024-05-21 12:52:41 +05:00
d74ced477a Shared: Scrollbar: Fix when iframe (SDK) breaks dragging scroll 2024-05-20 19:46:31 +02:00
d743752350 Revert "Client: JavascriptSDK: Shared: Scrollbar Fix dragging scroll breaks if the cursor is over sdk iframe"
This reverts commit 9e8c07ca56.
2024-05-20 19:35:24 +02:00
ac7d53a673 Shared: Scrollbar: Fix scroll styles 2024-05-20 16:03:59 +02:00
dfe9e91b98 Shared: Section: Fix progress bar scrolls with section body 2024-05-20 15:54:06 +02:00
9e8c07ca56 Client: JavascriptSDK: Shared: Scrollbar Fix dragging scroll breaks if the cursor is over sdk iframe 2024-05-20 15:18:27 +02:00
fcf36bd108 Merge branch 'refs/heads/develop' into feature/hiding-scroll 2024-05-20 13:04:57 +02:00
0c7ebf068d Shared: Section: Fix dropzone can't grow to full height 2024-05-20 12:52:59 +02:00
Vladimir Khvan
21bf244d7c Web: Client: JavascriptSDK: fixed onChangeFileId function in viewer preset 2024-05-20 14:39:34 +05:00
32d82aebbe Login: fix first render with system theme 2024-05-20 11:17:25 +03:00
e881cc7687 Login: delete useless 2024-05-20 10:49:09 +03:00