Viktor Fomin
|
1c95499dc8
|
Client: PortalSettings: Common: fix blink
|
2023-09-11 13:31:05 +03:00 |
|
|
|
eb9e71d978
|
Merge branch 'develop' into feature/branding-mobile-layout
|
2023-09-11 14:21:53 +04:00 |
|
|
|
0510210a7b
|
Merge pull request #1728 from ONLYOFFICE/bugfix/folder-restore
Bugfix/folder restore
|
2023-09-11 02:11:24 -07:00 |
|
|
|
09867f8e4c
|
Merge pull request #1729 from ONLYOFFICE/bugfix/room-filter
Bugfix/room filter
|
2023-09-11 02:10:33 -07:00 |
|
|
|
d3097f9cd9
|
Merge branch 'develop' into bugfix/room-filter
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2023-09-11 11:19:40 +03:00 |
|
|
|
bf9eae140f
|
fixed folder restore from trash
|
2023-09-11 11:16:24 +03:00 |
|
|
|
a75a69222d
|
Merge pull request #1725 from ONLYOFFICE/feature/copy-paste-hotkeys
Feature/copy paste hotkeys
|
2023-09-08 20:02:16 +04:00 |
|
Viktor Fomin
|
2ad811c363
|
Merge branch 'develop' into feature/branding-mobile-layout
|
2023-09-08 18:56:18 +03:00 |
|
|
|
60e7c125ad
|
Merge branch 'develop' into feature/copy-paste-hotkeys
|
2023-09-08 19:55:35 +04:00 |
|
|
|
d87434d426
|
Merge pull request #1639 from ONLYOFFICE/feature/sso-mobile-layout
Feature/sso mobile layout
|
2023-09-08 19:54:14 +04:00 |
|
|
|
3329a5bf0b
|
Merge branch 'feature/copy-paste-hotkeys' of github.com:ONLYOFFICE/AppServer into feature/copy-paste-hotkeys
|
2023-09-08 18:33:08 +03:00 |
|
|
|
5d8dc15b24
|
Web: Files: Hotkeys: added MacOS support
|
2023-09-08 18:32:53 +03:00 |
|
Viktor Fomin
|
467b5e179d
|
Merge branch 'develop' into feature/sso-mobile-layout
|
2023-09-08 18:17:52 +03:00 |
|
|
|
f484b2f21e
|
Merge branch 'develop' into feature/copy-paste-hotkeys
|
2023-09-08 19:14:47 +04:00 |
|
Viktor Fomin
|
45e0f7a106
|
Client: PortalSettings: SSO: fix button size
|
2023-09-08 18:12:31 +03:00 |
|
|
|
d8eb149b09
|
Merge pull request #1726 from ONLYOFFICE/feature/new-for-client
Feature/new for client
|
2023-09-08 19:05:26 +04:00 |
|
|
|
315dc26b6e
|
Fix EnDublicatesByContentTest issue (replaced key)
|
2023-09-08 19:00:12 +04:00 |
|
Viktor Fomin
|
9a32c2e5a7
|
Client: PortalSettings: Utils: fix
|
2023-09-08 17:54:05 +03:00 |
|
|
|
3ac5d9159a
|
Merge branch 'develop' into feature/new-for-client
|
2023-09-08 18:51:06 +04:00 |
|
|
|
1e615924ae
|
Merge branch 'develop' into feature/sso-mobile-layout
|
2023-09-08 18:36:25 +04:00 |
|
|
|
8d4eab05c5
|
Web: Components: SelectionArea: fixed selection
|
2023-09-08 17:12:37 +03:00 |
|
|
|
d6156be7ef
|
Web: Files: Hotkeys: fixed translation
|
2023-09-08 16:49:48 +03:00 |
|
|
|
35a4287e03
|
Web: Files: Hotkeys: added support for copying from desktop, removed useless files-converter
|
2023-09-08 15:53:47 +03:00 |
|
|
|
2026a16792
|
Merge pull request #1668 from ONLYOFFICE/bugfix/login-page
Bugfix/login page
|
2023-09-08 16:11:02 +04:00 |
|
|
|
5b6b331664
|
Merge branch 'develop' into bugfix/login-page
|
2023-09-08 15:48:08 +04:00 |
|
|
|
0c94da690a
|
Merge pull request #1702 from ONLYOFFICE/bugfix/rtl-dates
bugfix/rtl-dates
|
2023-09-08 14:39:37 +04:00 |
|
|
|
f33715e4a3
|
Web: Client: remove unnecessary
|
2023-09-08 12:36:17 +02:00 |
|
Akmal Isomadinov
|
7051e55778
|
Merge branch 'feature/copy-paste-hotkeys' of github.com:ONLYOFFICE/DocSpace into feature/copy-paste-hotkeys
|
2023-09-08 15:28:00 +05:00 |
|
Akmal Isomadinov
|
15673efae5
|
Web:MediaViewer Added hot keys
|
2023-09-08 15:27:43 +05:00 |
|
|
|
33bda424b3
|
added translations
|
2023-09-08 13:17:13 +03:00 |
|
|
|
f37b453eba
|
Merge branch 'develop' into bugfix/rtl-dates
|
2023-09-08 13:55:30 +04:00 |
|
|
|
1e21d8c719
|
Merge pull request #1717 from ONLYOFFICE/feature/new-translations
feature/new-translations
|
2023-09-08 13:54:27 +04:00 |
|
|
|
037318277c
|
Merge branch 'develop' into bugfix/rtl-dates
|
2023-09-08 11:23:54 +02:00 |
|
|
|
52adcbc30f
|
fix build
|
2023-09-08 11:47:40 +03:00 |
|
|
|
e3f129ea64
|
Web: Deleted old translations.
|
2023-09-08 11:34:35 +03:00 |
|
|
|
8764179bdb
|
Web: Removed old translations.
|
2023-09-08 11:29:20 +03:00 |
|
|
|
b22b216d95
|
Merge branch 'develop' into feature/copy-paste-hotkeys
|
2023-09-08 11:29:08 +03:00 |
|
|
|
4f6aa213e9
|
Merge pull request #1683 from ONLYOFFICE/feature/new-settings-description
Web: Client: Setting: added new description of settings, fixed styles
|
2023-09-08 12:06:28 +04:00 |
|
|
|
5a76bd2bcf
|
Merge branch 'develop' into feature/new-settings-description
|
2023-09-08 12:05:20 +04:00 |
|
|
|
11b064c39c
|
Merge pull request #1704 from ONLYOFFICE/bugfix/tooltip
Bugfix/tooltip
|
2023-09-08 12:01:25 +04:00 |
|
Akmal Isomadinov
|
4163d354f2
|
Web:Components:Tooltip Removed arrow
|
2023-09-08 12:55:54 +05:00 |
|
Akmal Isomadinov
|
37b7f10622
|
Merge branch 'bugfix/tooltip' of github.com:ONLYOFFICE/DocSpace into bugfix/tooltip
|
2023-09-08 12:46:41 +05:00 |
|
Akmal Isomadinov
|
9403e2b317
|
Web:Components Fixed tooltip in all stories
|
2023-09-08 12:46:18 +05:00 |
|
|
|
b022c41772
|
Update yarn.lock
|
2023-09-08 11:33:45 +04:00 |
|
|
|
c5731bd8a8
|
Merge branch 'develop' into bugfix/tooltip
|
2023-09-08 11:28:42 +04:00 |
|
|
|
675755aedd
|
Merge remote-tracking branch 'remotes/origin/hotfix/v1.1.3' into develop
|
2023-09-08 09:46:59 +03:00 |
|
|
|
22433ef3d6
|
Merge remote-tracking branch 'remotes/origin/feature/zoom-config' into hotfix/v1.1.3
|
2023-09-08 09:41:39 +03:00 |
|
|
|
718366d704
|
Web: Updated translations.
|
2023-09-08 09:20:17 +03:00 |
|
|
|
6b4cfcb205
|
Web: Client: fix date format when rtl in webhook details
|
2023-09-07 19:23:33 +02:00 |
|
|
|
ffdca0ba38
|
Merge branch 'develop' into bugfix/rtl-dates
|
2023-09-07 18:53:14 +02:00 |
|
