Commit Graph

543 Commits

Author SHA1 Message Date
5a99889f9d Web: Added the number of days left before the grace period expires, changed translation. 2023-03-13 15:21:53 +03:00
51228a34c9 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-13 15:58:11 +04:00
64436d915d Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-13 14:36:12 +03:00
11c133af7f Web: Added translation. 2023-03-13 14:36:02 +03:00
066da1dfd0 Fix NotFoundKeysTest issue (Restore InviteLinkTitle key) 2023-03-13 15:17:54 +04:00
543b8a79d2 Fix UselessTranslationKeysTest issue (Remove WizardTitle key) 2023-03-13 15:02:02 +04:00
8758140ae6 Fix UselessTranslationKeysTest issue (Remove UploadToFolder key) 2023-03-13 15:00:30 +04:00
b99c821d38 Fix UselessTranslationKeysTest issue (Remove MediaLoadError key) 2023-03-13 14:32:45 +04:00
0c2faa4e74 Fix UselessTranslationKeysTest issue (Remove ForbiddenPageHeader key) 2023-03-13 14:30:54 +04:00
af90fdb084 Fix UselessTranslationKeysTest issue (Remove ForbiddenPageDescription key) 2023-03-13 14:29:55 +04:00
7ce506836e Fix UselessTranslationKeysTest issue (Remove ErrorParamsTitle key) 2023-03-13 14:28:10 +04:00
9bc4fac559 Fix UselessTranslationKeysTest issue (Remove ErrorParamsBody key) 2023-03-13 14:26:52 +04:00
012d95efb3 Fix UselessTranslationKeysTest issue (Remove ErrorLicenseTitle key) 2023-03-13 14:25:29 +04:00
1eabeb237f Fix UselessTranslationKeysTest issue (Remove ErrorLicenseRead key) 2023-03-13 14:24:07 +04:00
b77f0ac9f5 Fix UselessTranslationKeysTest issue (Remove EnterPath key) 2023-03-13 13:24:34 +04:00
1dd7df9951 Fix UselessTranslationKeysTest issue (Remove ChangeEmailTitle key) 2023-03-13 13:20:41 +04:00
b47ed2642f Fix UselessTranslationKeysTest issue (Remove AddMembers key) 2023-03-13 13:19:09 +04:00
71b44b2cbc Fix EmptyValueKeysTest issue (removed useless key DownloadReportBtn) 2023-03-13 13:05:27 +04:00
0df0b35782 Fix NotAllLanguageTranslatedTest issue (+ sorting) 2023-03-13 12:58:52 +04:00
d1c766c6fc Fix FullEnDublicatesTest issues (Archive/to archive) 2023-03-13 12:56:29 +04:00
80f2f03638 Fix EnDublicatesByContentTest issue (Payments) 2023-03-13 12:38:31 +04:00
Vashchuk Nikita
2d92da7c0c Merge branch 'release/v1.0.0' into feature/notifications
# Conflicts:
#	web/ASC.Web.Api/GlobalUsings.cs
2023-03-10 17:39:47 +05:00
ec3d8eb44b Web: Deleted useless translations. 2023-03-09 19:13:22 +03:00
2d83a0df66 Web: Deleted useless translations. 2023-03-09 18:36:15 +03:00
8790582db2 Web: Deleted useless translation after merge. 2023-03-09 18:24:59 +03:00
Mushka Nikita
8f2e525b32 changed InfoPanel:ExpectUsers translationm key to "Pending invitations" 2023-03-09 11:39:06 +03:00
Mushka Nikita
43810c2526 Changed Files:Archived translation key to "Archive" 2023-03-09 11:23:04 +03:00
29abce027d Merge branch 'develop' into feature/notifications
# Conflicts:
#	packages/client/src/pages/Accounts.jsx
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/constants/index.js
#	products/ASC.People/Server/Api/UserController.cs
2023-03-06 15:37:45 +03:00
964300cd19 Merge branch 'develop' into bugfix/oforms-context-info 2023-03-03 17:02:35 +04:00
Mushka Nikita
00d44aad43 added russian translation to erasure functionality 2023-03-03 14:21:17 +03:00
Viktor Fomin
c6e1c58e97 Client: add translates 2023-03-03 14:00:53 +03:00
c1a89733c4 Web: Added new translations 2023-02-28 14:22:29 +04:00
ead94f371e Merge branch 'develop' into feature/notifications 2023-02-27 10:29:50 +03:00
d69084d736 Web: Client: InvitePanel: Fixed translations 2023-02-22 16:35:43 +03:00
216a6480c8 Merge branch 'develop' into feature/notifications
# Conflicts:
#	packages/common/constants/index.js
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	yarn.lock
2023-02-22 15:50:55 +03:00
6ee6ce7d21 Web: Client: InvitePanel: Added descriptions 2023-02-22 15:16:45 +03:00
9b36707fbd Web: Changed "DeveloperTools" translation 2023-02-14 12:55:16 +03:00
c9baec3175 Web: Added translation. 2023-02-10 11:31:49 +03:00
ca2906ebee Merge branch 'develop' into feature/notifications
# Conflicts:
#	packages/client/src/store/FilesStore.js
2023-02-08 12:44:15 +03:00
25f8ca42ca Web: Added translations. 2023-02-07 16:27:01 +03:00
Elyor Djalilov
3722ae1a77 Fix Bug 61037 - Rooms.Localization. Incorrect message about moving rooms to the archive in Russian localization 2023-02-06 21:23:32 +05:00
DmitrySychugov
b3d04ccd59 Web: Client: added media error ru translation 2023-02-06 19:50:55 +05:00
68adfe1138 Web: Added enable/disable notifications to the context menu. 2023-02-06 16:55:19 +03:00
6fa291abce Web: Client: Locales: Payment: Fixed key: QuotaPaidUserLimitError 2023-02-06 16:32:29 +03:00
52fd2400e1 Web: Client: Locales: Payment: Added new key: QuotaPaidUserLimitError 2023-02-06 15:15:44 +03:00
Vashchuk Nikita
ab7f24a68b Merge branch 'release/rc-v1.2.0' into feature/notifications 2023-02-02 18:48:48 +05:00
Elyor Djalilov
2514de24a0 Web:Client: Fix translate 2023-02-01 17:10:23 +05:00
Elyor Djalilov
baf75b0c42 Web:PortalSettings: Changed portal settings navigation 2023-02-01 16:49:02 +05:00
Mushka Nikita
5a2b8c871f Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2023-01-30 09:47:48 +03:00
Mushka Nikita
bcbf37b7da created new CreateEditRoomConfirmDialog component 2023-01-30 08:14:11 +03:00
Elyor Djalilov
418bc2d3c3 Fix Bug 60695 - Settings: Common. The minimum length of the portal name cannot be less than 6 characters. 2023-01-27 15:56:07 +05:00
14204efc52 Web: PortalSettings: Payments: Changed styles according to layouts. 2023-01-27 09:59:37 +03:00
Elyor Djalilov
32db1571b6 Fix Bug 60689 - Files. Incorrect contents of the Move to Trash confirmation window. 2023-01-25 20:29:01 +05:00
Elyor Djalilov
517e138131 Fix Bug 60689 - Files. Incorrect contents of the Move to Trash confirmation window 2023-01-24 13:24:05 +05:00
1db86f8839 Web: Moved translation. 2023-01-23 11:31:28 +03:00
49279cd069 Web: Added rooms activity component. 2023-01-23 11:21:36 +03:00
194156e439 Merge branch 'release/rc-v1.2.0' into feature/notifications 2023-01-23 10:38:46 +03:00
596126f224 Web: Added LinkValidTime translation key for invite link 2023-01-20 16:59:19 +03:00
50cee9ad91 Web: Deleted useless translation. 2023-01-20 16:52:03 +03:00
acbf23e68c Web: Changed logic and styles according to layouts. 2023-01-20 16:50:22 +03:00
Elyor Djalilov
1a41d54722 Fix Bug 60695 - Settings: Common. The minimum length of the portal name cannot be less than 6 characters 2023-01-20 18:11:49 +05:00
af09362401 Merge branch 'release/rc-v1.2.0' into feature/manage-notifications-panel
# Conflicts:
#	packages/client/public/locales/en/Profile.json
#	packages/client/public/locales/ru/Profile.json
2023-01-20 14:13:00 +03:00
cfda2c1313 Added translation of empty list alert of third-party services for Room Admin 2023-01-19 20:42:32 +03:00
b7bad31a55 Fix Bug 60621 - Rooms.Settings.ThirdParty. Hide the ability for admins to connect third-party storage when creating a room, if the setting is disabled. 2023-01-18 11:36:06 +03:00
Elyor Djalilov
b18618bf04 Fix Bug 60601 - Accounts. Delete the data transfer offer from the delete user window 2023-01-17 15:30:28 +05:00
aa6ed73f61 Update FilesSettings.json 2023-01-16 20:48:48 +03:00
b2e5d8ca9c Fix Bug 60563 - Rooms.ThirdParty. Incorrect 'Third-party services' link in toast when Third-party accounts is disabled. 2023-01-16 19:59:09 +03:00
2dd8cb623d Web: Updated SSO AttributeMatchingTooltip key translations 2023-01-13 17:32:47 +03:00
29e6307b3a Removed old Payments code and resources 2023-01-12 17:09:52 +03:00
2dfb34cb78 Removed ManualBackupHelpNote 2023-01-12 16:50:47 +03:00
7589e06778 Update Settings.json 2023-01-12 16:33:10 +03:00
46b99d1f25 Removed old resources (Team titles - custom names) 2023-01-12 16:20:35 +03:00
Viktor Fomin
1053e18569 Client: change translate, delete old 2023-01-12 13:54:42 +03:00
093a2a7787 Web: Renamed translation keys 2023-01-11 20:30:10 +03:00
ab353e47b1 Removed old resources (Reassign) 2023-01-11 20:25:32 +03:00
bd0efe1a7e Removed old resources (GroupSelector, AddGroupPanel) 2023-01-11 20:04:35 +03:00
22acb7f16d Removed old resources (GroupAction) 2023-01-11 19:52:31 +03:00
ce21c86a87 Removed old resources (for third-party-move dialog) 2023-01-11 19:17:04 +03:00
eb9ff03634 Removed old resources (for third-party dialog) 2023-01-11 19:08:11 +03:00
80566009db Removed old resources (for third-party) 2023-01-11 18:53:33 +03:00
b80a35dbd5 Web: Merged translation keys AuditDownloadText and LoginDownloadText to DownloadStatisticsText 2023-01-11 11:18:23 +03:00
c2ceab129a Merge branch 'release/rc-v1.2.0' into feature/edit-en 2023-01-11 10:57:10 +03:00
684d86e110 Removed old resource (ConnectMakeShared) 2023-01-10 18:52:03 +03:00
c65009c1b1 Removed old common folder resources (CommonEmptyContainerDescription) 2023-01-10 18:43:54 +03:00
f952c7474f Removed old empty screen resources (SharedEmptyContainerDescription) 2023-01-10 18:40:57 +03:00
2cb3d34ed0 edited en 2023-01-10 17:56:40 +03:00
0b64d4223c Web: Default document names have been moved to 'Common' file. 2023-01-10 15:26:57 +03:00
Akmal Isomadinov
ce2c92d5ce Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-30 16:56:10 +05:00
Akmal Isomadinov
abc7579133 Web:Client Updated image compression function in avatar editor 2022-12-30 16:56:00 +05:00
dfa766bc39 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-29 12:15:50 +03:00
d455c23171 Web: PortalSettings: Added error notification. 2022-12-29 12:14:26 +03:00
77829e4545 Translations: Fix EnDublicatesByContentTest issues 2022-12-28 22:27:47 +03:00
15bdd93ca6 Translations: Removed useless key 2022-12-28 21:56:30 +03:00
87e515c894 Translations: Removed useless key 2022-12-28 21:52:59 +03:00
9aad0214a3 Translations: Added rus translations (by Google) 2022-12-28 21:42:28 +03:00
efe3f251e3 Translations: Removed useless BrowserNoCanvasSupport key 2022-12-23 19:19:52 +03:00
459e68a5d7 Translations: Removed useless AddAuthor key 2022-12-23 19:18:48 +03:00
81ff746f38 Update client.babel and applied sorting 2022-12-23 19:08:01 +03:00
Viktor Fomin
b8acddeb25 Client: add line break 2022-12-22 15:33:33 +03:00
928071d4e7 Fixed Bug 60261 - Files. Fixed download docxf 2022-12-21 17:14:27 +03:00
Mushka Nikita
55598886bb returned feed translations and added new way of getting them 2022-12-12 15:38:15 +03:00
Akmal Isomadinov
7bf73d427d Web: Fixed component DownloadDialog and Add styled component LinkWithDropdown 2022-12-09 18:49:53 +05:00
Mushka Nikita
0aaf8d7c27 fixed bug with loaders in formGallery infoPanel 2022-12-08 14:33:50 +03:00
c3578d1661 Fix EnDublicatesByContentTest issues 2022-12-02 18:58:36 +03:00
b73c4a8762 Web: Removed useless translations 2022-12-02 16:29:52 +03:00
c0d1645b45 Fix some UselessTranslationKeysTest issues 2022-12-02 15:56:05 +03:00
0f96d279d3 Fix some UselessTranslationKeysTest issues 2022-12-02 14:28:02 +03:00
3b70343764 Fix NotAllLanguageTranslatedTest issues 2022-12-01 13:38:03 +03:00
Elyor Djalilov
5d5eb5c7ca unused key removed 2022-11-30 20:17:18 +05:00
Elyor Djalilov
db496b990c unused key removed 2022-11-30 20:13:49 +05:00
Elyor Djalilov
86b004072e unused key removed 2022-11-30 20:11:51 +05:00
Elyor Djalilov
cc7ee46838 unused key removed 2022-11-30 20:10:08 +05:00
Elyor Djalilov
01150b19d8 unused key removed 2022-11-30 20:06:15 +05:00
Elyor Djalilov
cbf6e57e4b unused key removed 2022-11-30 20:03:45 +05:00
Elyor Djalilov
ddd4a8fe48 unused key removed 2022-11-30 20:01:03 +05:00
Elyor Djalilov
333c6bf92a unused key removed 2022-11-30 19:23:00 +05:00
Elyor Djalilov
4eb2b63838 unused key removed 2022-11-30 19:19:55 +05:00
Elyor Djalilov
17c22d6eb9 unused key removed 2022-11-30 19:16:40 +05:00
Elyor Djalilov
bdfb09b35b unused key removed 2022-11-30 19:14:44 +05:00
Elyor Djalilov
55a02bc242 unused key removed 2022-11-30 19:12:55 +05:00
Elyor Djalilov
6d89b2ed09 unused key removed 2022-11-30 19:08:52 +05:00
Elyor Djalilov
2006b9e798 unused key removed 2022-11-30 19:06:55 +05:00
Elyor Djalilov
a365d1a395 unused key removed 2022-11-30 19:03:16 +05:00
Elyor Djalilov
f0b5e55189 unused key removed 2022-11-30 19:01:00 +05:00
Elyor Djalilov
af3a7b6575 unused key removed 2022-11-30 18:58:44 +05:00
Elyor Djalilov
a38c249bdb unused key removed 2022-11-30 18:56:35 +05:00
Elyor Djalilov
7572dcb5f4 unused key removed 2022-11-30 18:54:28 +05:00
Elyor Djalilov
3243e201ea unused key removed 2022-11-30 18:52:55 +05:00
Elyor Djalilov
5fa7e8efa2 unused key removed 2022-11-30 18:50:47 +05:00
Elyor Djalilov
917827696b unused key removed 2022-11-30 18:48:26 +05:00
Elyor Djalilov
f65003ec1b unused keys removed 2022-11-30 18:46:18 +05:00
Elyor Djalilov
3207cdb6b0 unused key removed 2022-11-30 18:34:45 +05:00
Elyor Djalilov
802567ada2 unused key removed 2022-11-30 18:33:10 +05:00
Elyor Djalilov
33c333ab6c unused key removed 2022-11-30 18:00:02 +05:00
Elyor Djalilov
125a65187c unused key removed 2022-11-30 17:44:50 +05:00
Elyor Djalilov
6011d39ea5 unused key removed 2022-11-30 17:42:59 +05:00
Elyor Djalilov
7fa5d0a3be unused key removed 2022-11-30 17:40:51 +05:00
Elyor Djalilov
dfa6b98487 unused key removed 2022-11-30 17:39:04 +05:00
Elyor Djalilov
21f6122282 unused key removed 2022-11-30 17:37:01 +05:00
Elyor Djalilov
ce60f52154 unused key removed 2022-11-30 17:24:35 +05:00
Elyor Djalilov
55094377ac unused key removed 2022-11-30 17:20:58 +05:00
Elyor Djalilov
b044d18b61 unused key removed 2022-11-30 17:18:40 +05:00
Elyor Djalilov
f7a4d48d61 unused key removed 2022-11-30 17:16:50 +05:00
Elyor Djalilov
5697a644a6 unused key removed 2022-11-30 17:15:08 +05:00
Elyor Djalilov
bb0c368931 unused key removed 2022-11-30 17:13:24 +05:00
Elyor Djalilov
da7996ec87 unused key removed 2022-11-30 17:11:40 +05:00
Elyor Djalilov
9a04949e46 unused key removed 2022-11-30 17:10:06 +05:00
Elyor Djalilov
e2e81cb4c4 unused key removed 2022-11-30 17:08:23 +05:00
Elyor Djalilov
3d80ae146e unused keys removed 2022-11-30 17:06:15 +05:00
Elyor Djalilov
316fda9f42 unused key removed 2022-11-30 16:58:41 +05:00
Elyor Djalilov
7876d6307c unused key removed 2022-11-30 16:56:55 +05:00
Elyor Djalilov
9fe512152f unused key removed 2022-11-30 16:55:09 +05:00
Elyor Djalilov
fcfe1e99ef unused key removed 2022-11-30 16:53:30 +05:00
Elyor Djalilov
d0bb98fe33 unused key removed 2022-11-30 16:48:35 +05:00
Elyor Djalilov
f51be1fea9 unused key removed 2022-11-30 16:41:20 +05:00
Elyor Djalilov
e4571eb5ce unused key removed 2022-11-30 16:39:30 +05:00
Elyor Djalilov
cb4f86cb1d unused key removed 2022-11-30 16:29:12 +05:00
Elyor Djalilov
840c999137 unused key removed 2022-11-30 15:48:05 +05:00
Elyor Djalilov
142fbadd66 unused key removed 2022-11-30 15:45:51 +05:00
Elyor Djalilov
e738aac686 unused key removed 2022-11-30 15:43:52 +05:00
Elyor Djalilov
295777b0d9 unused key removed 2022-11-30 15:40:44 +05:00
Elyor Djalilov
2124a9f3ab unused key removed 2022-11-30 15:38:24 +05:00
Elyor Djalilov
a0444b7eeb unused key removed 2022-11-30 15:36:39 +05:00
Elyor Djalilov
796f702d1d unused key removed 2022-11-30 15:33:52 +05:00
Elyor Djalilov
70404e4db2 unused key removed 2022-11-30 15:33:26 +05:00
Elyor Djalilov
f4e53d9cf8 unused key removed 2022-11-30 15:33:03 +05:00
Elyor Djalilov
4e8d62f24a unused key removed 2022-11-30 15:31:16 +05:00
Elyor Djalilov
4050700819 unused key removed 2022-11-30 15:30:46 +05:00
Elyor Djalilov
e986d29240 unused key removed 2022-11-30 15:30:25 +05:00
Elyor Djalilov
5c0322fe80 unused key removed 2022-11-30 15:30:01 +05:00
Elyor Djalilov
08108a6afa unused key removed 2022-11-30 15:29:38 +05:00
Elyor Djalilov
39930f88c6 unused key removed 2022-11-30 15:29:17 +05:00
Elyor Djalilov
feeebbb54a unused key removed 2022-11-30 15:28:50 +05:00
Elyor Djalilov
86442a8704 unused key removed 2022-11-30 15:28:25 +05:00
Elyor Djalilov
1afb601f0a unused key removed 2022-11-30 15:28:01 +05:00
Elyor Djalilov
1c929c76dc unused key removed 2022-11-30 15:27:29 +05:00
Elyor Djalilov
21855e992d unused key removed 2022-11-30 15:26:30 +05:00
Elyor Djalilov
96020455bd unused key removed 2022-11-30 15:26:07 +05:00
Elyor Djalilov
30c0cc2134 unused key removed 2022-11-30 15:25:41 +05:00
Elyor Djalilov
8d930f9830 unused key removed 2022-11-30 15:25:14 +05:00
Elyor Djalilov
3c430abfef unused key removed 2022-11-30 15:24:49 +05:00
Elyor Djalilov
18a8b5a371 unused key removed 2022-11-30 15:24:05 +05:00
Elyor Djalilov
139d313670 unused key removed 2022-11-30 15:23:36 +05:00
Elyor Djalilov
982ab9e047 unused key removed 2022-11-30 15:23:02 +05:00
Elyor Djalilov
7b71164aac unused key removed 2022-11-30 15:22:31 +05:00
Elyor Djalilov
c3e702bbf5 unused key removed 2022-11-30 15:21:15 +05:00
Elyor Djalilov
aa097121c4 unused key removed 2022-11-30 15:15:05 +05:00
Elyor Djalilov
37e15bb90b unused key removed 2022-11-30 15:12:40 +05:00
Elyor Djalilov
eb21deff5c unused key removed 2022-11-30 15:10:05 +05:00
Elyor Djalilov
f7ef99c00d unused key removed 2022-11-30 15:08:06 +05:00
Elyor Djalilov
1a5ecc1f5a unused key removed 2022-11-30 15:07:02 +05:00
Elyor Djalilov
a2ea616c77 unused key removed 2022-11-30 15:04:50 +05:00
Elyor Djalilov
02218f522a unused key removed 2022-11-30 15:04:02 +05:00
Elyor Djalilov
6a61438766 unused key removed 2022-11-30 15:03:34 +05:00
Elyor Djalilov
9b35c5735a unused key removed 2022-11-30 15:02:14 +05:00
Elyor Djalilov
5ffd47d754 deleted duplicate key 2022-11-30 14:53:26 +05:00
Elyor Djalilov
69ebe3b38a deleted duplicate key 2022-11-30 14:33:22 +05:00
Elyor Djalilov
353a3670f8 unused key removed 2022-11-29 13:56:32 +05:00
Elyor Djalilov
e4b077f69b key was moved to the Common 2022-11-29 00:39:03 +05:00
Elyor Djalilov
af4bcf4c05 deleted duplicate keys 2022-11-28 23:01:07 +05:00
Elyor Djalilov
89fe900387 deleted duplicate keys 2022-11-28 22:54:54 +05:00
Elyor Djalilov
04db0e8f0a deleted duplicate key and was moved to the Common 2022-11-28 22:46:57 +05:00
Elyor Djalilov
23109e30c2 deleted duplicate keys and was moved to the Common 2022-11-28 22:19:57 +05:00
Elyor Djalilov
b3b6615226 deleted duplicate key 2022-11-28 22:03:20 +05:00
Elyor Djalilov
d88331c704 deleted duplicate keys 2022-11-28 21:41:21 +05:00
Elyor Djalilov
b924f1582d deleted duplicate keys and was moved to the Common 2022-11-28 15:37:10 +05:00
Elyor Djalilov
3c637dbaa2 deleted duplicate keys and was moved to the Common 2022-11-28 15:19:44 +05:00
Elyor Djalilov
6ac2aceb64 deleted duplicate keys and was moved to the Common 2022-11-28 14:55:18 +05:00
Elyor Djalilov
c628368e9b deleted duplicate keys 2022-11-28 13:26:08 +05:00
Elyor Djalilov
c6f5db2486 unused key removed 2022-11-28 12:12:42 +05:00
Elyor Djalilov
254e21515b unused key removed 2022-11-28 11:58:42 +05:00
Elyor Djalilov
fc59726fe1 empty value keys fixed and deleted duplicate keys 2022-11-28 11:46:04 +05:00
Elyor Djalilov
ad1a6c4d4d Fix bad merge 2022-11-26 14:41:58 +05:00
Elyor Djalilov
bc729a8847 Fix bad merge 2022-11-26 13:47:40 +05:00
Elyor Djalilov
34954cd9e0 Fix bad merge 2022-11-25 17:51:13 +05:00
Elyor Djalilov
b8348af578 Merge branch 'develop' into feature/new-docspace-translations
# Conflicts:
#	packages/client/public/locales/en/DeleteDialog.json
#	packages/client/public/locales/en/Files.json
#	packages/client/public/locales/en/InfoPanel.json
#	packages/client/public/locales/en/InviteDialog.json
#	packages/client/public/locales/en/Payments.json
#	packages/client/public/locales/en/Profile.json
#	packages/client/public/locales/en/Settings.json
#	packages/client/public/locales/en/Translations.json
#	packages/client/public/locales/ru/Files.json
#	packages/client/public/locales/ru/InfoPanel.json
#	packages/client/public/locales/ru/Payments.json
#	packages/client/src/components/GlobalEvents/RenameEvent.js
#	packages/client/src/pages/Home/Section/Filter/index.js
2022-11-25 16:27:23 +05:00
3175554fed Web: Files: added create, delete, move to archive room hotkeys 2022-11-08 17:34:32 +03:00
7073fc2fce Web: Changed translation. 2022-11-07 10:43:32 +03:00
dbd34303f1 Web: Fixed translation key. 2022-11-07 10:41:35 +03:00
mushka
75c8f03149 added SuccessSentMultipleInvitatios translation keys to en/ and ru/ 2022-11-03 17:05:26 +03:00
561f4cd185 Web: Added new information. 2022-11-02 12:27:54 +03:00
5812562fac Web: Refactoring, added content for daily feed container. 2022-11-01 11:57:01 +03:00
5cbc7d464c Web: Added new notifications panel. 2022-10-31 15:44:57 +03:00
073aa9943f Fix WrongTranslationVariablesTest issues + added missing files and key sorting 2022-10-25 14:52:15 +03:00
mushka
44caa890bd Merge branch 'develop' into feature/info-panel-update 2022-10-25 14:41:39 +03:00
00e6a174df Web: Files: fixed GracePeriodActivatedInfo translation 2022-10-25 13:17:33 +03:00
8f93c2df54 Web: Files: fixed GracePeriodActivatedInfo translation 2022-10-25 12:52:43 +03:00
f0ce5a9552 Web: Files: fixed Payments translations 2022-10-25 12:48:58 +03:00
5753d9722f Web: Files: added invite users dialog warning, fixed GracePeriodActivatedDescription translation 2022-10-25 11:44:30 +03:00
mushka
0adb8efd4c added ExpectPeople translation key 2022-10-19 19:33:57 +03:00
4115bdc5dd Web: Files: fixed TrustedMailDescription translation 2022-10-19 16:03:59 +03:00
b99bde994e Web: Files: fixed LanguageTimeSettingsTooltip translation 2022-10-19 16:01:32 +03:00
mushka
2a52c0b251 Merge branch 'develop' into feature/room-thirdparty-update 2022-10-19 13:22:09 +03:00
mushka
9e62fc8e45 added translation for root label 2022-10-18 13:14:06 +03:00
mushka
3008e549c9 fixed some small translation issues with info panel 2022-10-18 01:55:45 +03:00
TimofeyBoyko
b3395efe50 Merge branch 'develop' into feature/portal-access-rights 2022-10-17 11:45:25 +05:00
mushka
319d842312 fixed MakeRoomPrivateLimitationsWarningDescription translate key in russian 2022-10-13 15:12:58 +03:00
3bd63b26fe Web: Added new translations. 2022-10-13 15:06:51 +03:00
TimofeyBoyko
e56b10d1e5 Web:Client: move 'Room admin' and 'DocSpace admin' translation keys to common 2022-10-13 15:35:58 +05:00
cf2547e030 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/common/constants/index.js
2022-10-11 10:20:42 +03:00
8e7bf575ed Web: Fixed translation (ru). 2022-10-06 14:17:52 +03:00
d3d4ff6639 Web: Fixed description of grace period. 2022-10-05 13:34:59 +03:00
a2fb5e4b36 Web: Changed translations for grace period. 2022-10-05 13:26:45 +03:00
c3c64d847c Web: removed useless translations. 2022-10-05 11:55:15 +03:00
11479c14ba Web: Added missing translations. 2022-10-05 11:35:40 +03:00
84c8749e4f Web: Changed translations. 2022-10-05 10:58:10 +03:00
ca1cd06fad Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/public/images/plus.react.svg
#	packages/client/src/pages/PortalSettings/categories/common/branding.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
#	packages/client/src/pages/PortalSettings/index.js
#	packages/common/components/PrivateRoute/index.js
2022-10-04 17:13:46 +03:00
a5d3106907 Web: Added translation. 2022-10-04 16:52:43 +03:00
mushka
1b2dae0890 Merge branch 'develop' into feature/doc-space-info-panel 2022-10-02 03:45:40 +03:00
mushka
6ef11ff695 fixed spelling in FilesEmptyScreenText translation key 2022-10-02 03:20:29 +03:00