Commit Graph

6809 Commits

Author SHA1 Message Date
Viktor Fomin
3d8005fb2f Client: PortalSettings: fix style 2023-09-11 16:35:57 +03:00
Viktor Fomin
97a2cd9851 Client: PortalSettings: fix styles 2023-09-11 15:12:11 +03:00
Viktor Fomin
698305fe5d Client: PortalSettings: fix style 2023-09-11 14:36:46 +03:00
Viktor Fomin
88584496e0 Client: PortalSettings: Customization: use MobileCategoryWrapper 2023-09-11 14:36:30 +03:00
Viktor Fomin
ccb9579a12 Client: PortalSettings: MobileCategoryWrapper: add paid badge 2023-09-11 14:35:28 +03:00
Viktor Fomin
c8b75c10ea Client: PortalSettings: Customization: delete useless 2023-09-11 14:02:00 +03:00
Viktor Fomin
35f5ae7c0b Client: PortalSettings: Customization: fix show badge 2023-09-11 13:37:08 +03:00
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
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
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
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
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
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
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
5a76bd2bcf Merge branch 'develop' into feature/new-settings-description 2023-09-08 12:05:20 +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
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
b0064f20b6 Web: Client: fix webhooks rtl styles 2023-09-07 18:53:02 +02:00
db3f75c78b added translations 2023-09-07 18:40:17 +03:00
Akmal Isomadinov
8dca5302af Merge branch 'develop' into bugfix/tooltip 2023-09-07 18:46:47 +05:00
d054750b70 Web: Files: removed useless "SettingPasswordStrengthMobileHelper" translation key 2023-09-07 16:20:30 +03:00
8ac6241c7e Merge branch 'develop' into feature/new-settings-description 2023-09-07 17:13:02 +04:00
86c1a6df53 Merge branch 'develop' into feature/copy-paste-hotkeys 2023-09-07 16:09:29 +03:00
191e575929
Merge pull request #1708 from ONLYOFFICE/bugfix/backup
Bugfix/backup
2023-09-07 16:08:02 +03:00
b25bfddf6f Web: PortalSettings: Fixed CSP chips after merge 2023-09-07 16:05:04 +03:00
7d8e48ea69 Merge branch 'develop' into bugfix/backup
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/data-management/index.js
2023-09-07 16:02:48 +03:00
bf7e88da34 Merge branch 'develop' into feature/new-settings-description 2023-09-07 15:40:14 +03:00
c00645554b Web: SDK: Fixed setting base locale 2023-09-07 15:32:54 +03:00
17cb6257c6 Merge branch 'develop' into bugfix/rtl-dates 2023-09-07 14:03:03 +02:00