Commit Graph

45764 Commits

Author SHA1 Message Date
cfdb83c7de added method getUserSessionsById and commented out mockData 2024-06-03 14:40:34 +05:00
a4e7d2b0ca Web: Socket: fixed double socket connection 2024-06-01 11:33:51 +05:00
4de4798cb8 Merge branch 'develop' into feature/security-active-sessions
# Conflicts:
#	packages/client/src/store/SelectionPeopleStore.js
2024-05-28 15:02:37 +05:00
2785668fa5
Merge pull request #440 from ONLYOFFICE/bugfix/upload-folder
bugfix/upload-folder
2024-05-28 13:26:19 +04:00
9253b3a120 Fixed Bug 67431 - Mobile. Folder is not selected when selecting Folder Upload 2024-05-28 12:09:52 +03:00
d9b1ec35e5
Merge pull request #439 from ONLYOFFICE/bugfix/fix-hotkeys-scrolling
Web: Hotkeys: fixed scroll focus
2024-05-28 11:59:38 +04:00
61b00dd53c Web: Hotkeys: fixed scroll focus 2024-05-28 10:54:49 +03:00
015956d9b4
Merge pull request #433 from ONLYOFFICE/feature/new-room-icons
Feature/new room icons
2024-05-27 21:14:57 +04:00
c9191231d7 Web: Socket: Removed socketUsersHelper and changes by namespaces 2024-05-27 20:17:56 +05:00
08b3a6b1bf
Merge pull request #435 from ONLYOFFICE/bugfix/quota-socket
Web: Fixed quota socket with incorrect data
2024-05-27 16:57:59 +03:00
1fa5d6c356 Web: Fixed quota socket with incorrect data 2024-05-27 16:56:00 +03:00
namushka
0b0ba31920
code cleanup 2024-05-27 16:50:00 +03:00
namushka
094ae26c72
fixed dark theme for EditRoom dialog 2024-05-27 16:38:52 +03:00
namushka
fa900eef94
updated light color 2024-05-27 16:31:38 +03:00
namushka
9ec645ba5c
removed unused theme keys 2024-05-27 16:29:54 +03:00
namushka
62ecc7952d
fixed dark theme 2024-05-27 16:29:25 +03:00
b051b381cc fixed styles 2024-05-27 18:20:27 +05:00
1bf71d5ee2 Merge branch 'develop' into feature/new-room-icons 2024-05-27 17:12:43 +04:00
7af7e4fad7
Merge pull request #431 from ONLYOFFICE/feature/editor-in-same-tab
feature/editor-in-same-tab
2024-05-27 17:04:53 +04:00
9cbd0ae4c9
Merge pull request #434 from ONLYOFFICE/bugfix/table-crash
Web: Files: fixed table
2024-05-27 16:54:19 +04:00
27defeb2e0 Web: Files: fixed table 2024-05-27 15:53:02 +03:00
6df5001198 refactoring 2024-05-27 17:47:07 +05:00
410f69e130 Merge branch 'develop' into feature/editor-in-same-tab 2024-05-27 16:31:42 +04:00
namushka
6cec1d0111
Merge branch 'develop' into feature/new-room-icons 2024-05-27 12:04:49 +03:00
namushka
994c41e030
updated room type action color 2024-05-27 12:02:29 +03:00
f3ab0dae5a added additional conditions for country and city 2024-05-27 12:58:49 +05:00
f45c5b40a1
Merge pull request #426 from ONLYOFFICE/feature/renaming-resource-keys
Feature/renaming resource keys
2024-05-27 11:42:50 +04:00
fba45f1ce1 i18next: saved projects with new changes 2024-05-27 11:40:58 +04:00
48fdd4e775 Translations: Fix NotAllLanguageTranslatedTest (sr-Latn-RS issue) 2024-05-27 11:24:22 +04:00
76ba3ae10b Merge branch 'develop' into feature/renaming-resource-keys 2024-05-27 11:13:21 +04:00
6676c07a89
Merge pull request #410 from ONLYOFFICE/bugfix/67751
bugfix/67751
2024-05-24 20:57:39 +04:00
63492f8345
Merge pull request #428 from ONLYOFFICE/bugfix/missing-focus
Bugfix/missing focus
2024-05-24 20:57:00 +04:00
2b1798b010 Merge branch 'develop' into bugfix/missing-focus 2024-05-24 20:47:28 +04:00
cb43a107f4 removed useless code 2024-05-24 21:38:32 +05:00
ad888d4032
Merge pull request #424 from ONLYOFFICE/feature/copy-folder-link
Feature/copy folder link
2024-05-24 18:59:01 +04:00
namushka
37e8fe661b
fixed :active styling 2024-05-24 16:55:00 +03:00
8138752496 Merge branch 'develop' into feature/copy-folder-link 2024-05-24 17:40:07 +04:00
ddd7ccbd84 Merge branch 'develop' into feature/editor-in-same-tab 2024-05-24 15:06:55 +03:00
4f28dd9341
Merge pull request #419 from ONLYOFFICE/feature/typescript
feature/typescript
2024-05-24 15:32:21 +04:00
6c35dea56e
Merge pull request #427 from ONLYOFFICE/feature/my_documents
edited Documents
2024-05-24 15:30:26 +04:00
762e9f56fd Merge branch 'develop' into feature/my_documents 2024-05-24 15:26:55 +04:00
namushka
99b7339a83
added hover effects for RoomType ListItem and DropdownButton components 2024-05-24 14:03:27 +03:00
namushka
9af68dbd94
updated icons for RoomIcon component 2024-05-24 14:02:49 +03:00
6e5e965703
Merge pull request #429 from ONLYOFFICE/bugfix/sort-arrow-direction
bugfix/sort-arrow-direction
2024-05-24 15:00:18 +04:00
bbfc866c96
Merge pull request #432 from ONLYOFFICE/feature/accounts-hotkeys
Web: Accounts: added hotkeys support
2024-05-24 14:59:07 +04:00
79bbd357e2 Web: Accounts: added hotkeys support 2024-05-24 13:18:50 +03:00
c74d88608f Web: Socket: Added window refs 2024-05-24 14:18:10 +04:00
abb0fa6520 Web: Socket: Added socketUsersHelper and applied changes by namespaces 2024-05-24 14:09:55 +04:00
94755b838d Client: Article: fix margin 2024-05-24 13:04:29 +03:00
cca0391c17 Shared: Updated socket.io client version 2024-05-24 13:48:49 +04:00