Commit Graph

882 Commits

Author SHA1 Message Date
3a1bf92291 Merge branch 'develop' into feature/leave-room 2023-09-20 13:20:56 +04:00
ca76336fc3 Merge branch 'develop' into feature/leave-room 2023-09-19 10:44:07 +03:00
mushka-n
d98680b350 moved translations and updated selector 2023-09-18 17:10:16 +03:00
74f9ea784b Merge branch 'develop' into feature/submit-to-form-gallery 2023-09-18 16:31:27 +04:00
2f1f2ef4fa Web: Client: fix long text in theme edit button 2023-09-18 13:28:32 +02:00
e0b4b232df Web: Files: Leave-room: fixed translations 2023-09-18 13:50:33 +03:00
95424d49f9 Web: Added ru translations + autofixes 2023-09-18 14:17:00 +04:00
mushka-n
da7aec7445 Merge branch 'develop' into feature/submit-to-form-gallery 2023-09-18 13:06:39 +03:00
0deac4bf00 Merge branch 'develop' into feature/mobile-sdk 2023-09-18 13:45:20 +04:00
00c3d8a367 Merge branch 'develop' into feature/leave-room
# Conflicts:
#	public/locales/en/Common.json
2023-09-15 18:46:34 +03:00
c32c2b61f7 Web: Files: fixed translations 2023-09-15 17:56:05 +03:00
4ad47b9797 Merge branch 'develop' into feature/cron 2023-09-15 18:15:37 +04:00
a5662b7cdd Merge branch 'develop' into feature/leave-room
# Conflicts:
#	packages/client/public/locales/en/Files.json
2023-09-15 16:54:26 +03:00
mushka-n
cf735a6fbe Merge branch 'develop' into feature/submit-to-form-gallery 2023-09-15 00:43:58 +03:00
23202b8477 web: Files: fixed translation key 2023-09-14 12:04:19 +03:00
c84eb55ff1 Merge branch 'develop' into feature/add-new-link-dialog 2023-09-14 11:12:17 +03:00
7a075a1351 Web: Client: add successful copy toast 2023-09-13 14:43:48 +02:00
Akmal Isomadinov
bbd40500c9 Merge branch 'develop' into feature/cron 2023-09-13 16:11:13 +05:00
307d0eb4d1 Merge branch 'develop' into feature/mobile-sdk
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
2023-09-13 12:30:44 +02:00
d8fc4babc7 Web: Removed full duplicate 2023-09-12 19:41:40 +04:00
772b730eba Merge branch 'develop' into feature/add-new-link-dialog 2023-09-12 17:01:30 +03:00
b3470375cb Web: Fix translations to other languages 2023-09-12 17:57:27 +04:00
9c173f3d20 Web: Files: added new translations for delete dialog 2023-09-12 16:06:43 +03:00
8283538b52
Merge pull request #1578 from ONLYOFFICE/feature/new-files-dialog
feature/new-files-dialog
2023-09-12 14:09:20 +04:00
gazizova-vlada
d0ce4eb38e Web:Client:Change MarkAsRead to Viewed. 2023-09-12 13:00:15 +03:00
be0d97dd17 Web: Files: Changed translations for add new link dialog 2023-09-12 11:56:39 +03:00
mushka-n
d96911a37c merge develop + merge fix 2023-09-11 13:26:58 +03:00
eb9e71d978 Merge branch 'develop' into feature/branding-mobile-layout 2023-09-11 14:21:53 +04:00
1f77cf82a2 Merge branch 'develop' into feature/leave-room 2023-09-11 13:28:56 +04:00
21fd5aa9d5 Merge branch 'develop' into feature/cron 2023-09-11 12:34:41 +04:00
0931a28a2f Web: Client: add mobile version of sdk 2023-09-08 23:19:47 +02: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
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
315dc26b6e Fix EnDublicatesByContentTest issue (replaced key) 2023-09-08 19:00:12 +04: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
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
b22b216d95 Merge branch 'develop' into feature/copy-paste-hotkeys 2023-09-08 11:29:08 +03:00
718366d704 Web: Updated translations. 2023-09-08 09:20:17 +03:00
db3f75c78b added translations 2023-09-07 18:40:17 +03:00
d054750b70 Web: Files: removed useless "SettingPasswordStrengthMobileHelper" translation key 2023-09-07 16:20:30 +03:00
86c1a6df53 Merge branch 'develop' into feature/copy-paste-hotkeys 2023-09-07 16:09:29 +03:00
bf7e88da34 Merge branch 'develop' into feature/new-settings-description 2023-09-07 15:40:14 +03:00
Akmal Isomadinov
2ba6366f29 Merge branch 'develop' into feature/cron 2023-09-07 16:43:58 +05:00
Akmal Isomadinov
096e3dd687 Web:Cron Fixed translations 2023-09-07 16:40:45 +05:00
4db2e18bd8 Merge branch 'develop' into bugfix/rtl-dates 2023-09-07 12:56:43 +02:00