Commit Graph

794 Commits

Author SHA1 Message Date
ac48208d40 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-31 18:39:48 +03:00
4cdc83d2b3 added translations 2023-03-31 18:39:27 +03:00
Viktor Fomin
dba6725bcf Client: delete useless 2023-03-31 15:53:00 +03:00
ad514df77c added translations 2023-03-30 18:29:03 +03:00
a0401a20db Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-29 19:37:32 +03:00
a2ccddd363 added translations 2023-03-29 19:37:11 +03:00
eefcc9c024 Web: PortalSettings: Payments: Changed translations. 2023-03-29 15:53:29 +03:00
d4ec48e7a4 Web: PortalSettings: Payments: Changed translations. 2023-03-29 11:44:31 +03:00
3af54531eb Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-29 10:44:09 +03:00
1ef1998541 Web: PortalSettings: Payments: Changed translation. 2023-03-29 10:41:03 +03:00
deaa8880f0 added translations 2023-03-28 19:21:37 +03:00
d44706498d added translations 2023-03-28 18:43:17 +03:00
0fa58d66b4 Web: Client: ChangeUserStatusDialog: Fixed actions translation keys, removed ChangeUsersStatusButton translation key 2023-03-28 11:34:46 +03:00
Elyor Djalilov
d383a33e7b Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-27 22:40:40 +05:00
Elyor Djalilov
87ac149247 Fix Bug 61785 - Settings: ThirdParty. Change links to helpcenter articles for docspace 2023-03-27 22:40:34 +05:00
21c9147b28 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-27 18:13:28 +03:00
552ddcf579 added translations 2023-03-27 18:13:03 +03:00
Viktor Fomin
b64bc9d9dd Client: add translate 2023-03-27 14:37:30 +03:00
a717db3118 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-24 22:02:27 +03:00
c9617c5ff6 added translations 2023-03-24 22:02:04 +03:00
236bcca758 Fix BusinessFinalDateInfo translation key 2023-03-24 19:19:23 +04:00
fc2810ca97 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-23 19:05:56 +03:00
53311f0e36 added translations 2023-03-23 19:05:25 +03:00
d3bf4028a9 Web: Files: added CancelUpload translation 2023-03-23 16:21:44 +03:00
3385f2bb5d Web: PortalSettings: Payments: Added new translations. 2023-03-23 10:20:42 +03:00
Timofey Boyko
72550a5de6 Web:Client: fix 'CannotDowngradePlan' translation key 2023-03-22 17:08:24 +03:00
7ef7d568e4 Update LogoLogin key translation 2023-03-22 17:45:55 +04:00
993a7e66c4
Merge pull request #1313 from ONLYOFFICE/feature/new-quota-bars
Feature/new quota bars
2023-03-22 15:42:46 +04:00
Mushka Nikita
43579e4272 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-22 13:24:11 +03:00
Mushka Nikita
5fe08be4ba changed "ToArchive" translation key to "MoveToArchive" 2023-03-22 13:19:27 +03:00
Timofey Boyko
145b343da7 Merge branch 'release/v1.0.0' into feature/new-quota-bars 2023-03-22 09:04:09 +03:00
Timofey Boyko
de9b08614f Web:Client:Translations: change Collaborator to PowerUser 2023-03-22 08:56:16 +03:00
ca3becaef6 Web:Client:Delete translation ViewDetails. 2023-03-21 18:59:18 +03:00
Timofey Boyko
d3caeb7f64 Web:Client:Translations: change ClickHere key, add StorageAndUserHeader, StorageAndRoomHeader 2023-03-21 16:36:40 +03:00
Timofey Boyko
3abb59d363 Web:Client: add translation for user quota bar 2023-03-21 12:10:47 +03:00
6f699b82f0 edited translations 2023-03-17 18:47:56 +03:00
db302362a0 edited translations 2023-03-16 18:30:30 +03:00
1ebc887717 Web: Fix Payments translation issues (moved some keys to Common) 2023-03-14 15:00:19 +04:00
0b911b0d36 Web: Moved SizeImageLarge translation key to Common 2023-03-14 14:44:57 +04:00
eb86665d70 Web: Fix some translations issues 2023-03-14 14:30:58 +04:00
1df9a39a13 Web: Fix some translations issues 2023-03-14 14:15:43 +04:00
2edbe1cb3f Web: Added display of a dialog when creating a room during the grace period of the portal. 2023-03-14 10:33:08 +03:00
a0b92eb114 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-14 09:48:28 +03:00
db4c561798 Web: Fixed 'ru' translation. 2023-03-14 09:27:27 +03:00
7b305cc518 Web:Client:Delete duplicate translation. 2023-03-13 18:17:03 +03:00
46fa21c57f Web: Changed translation. 2023-03-13 15:34:49 +03:00
4cdf6b0ac9 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-13 15:22:14 +03:00
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
0947e1d67a Web: Deleted useless translation after merge. 2023-03-09 18:22:23 +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
Timofey Boyko
8e59451b4a Merge branch 'develop' into feature/colloborator 2023-02-27 15:22:21 +03: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
Timofey Boyko
89bf5322a5 Web:Client: add new translation key for collaborator 2023-02-22 15:56:51 +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
Viktor Fomin
81cd9cb6e5 Client: fix translate 2023-02-21 08:46:17 +03:00
f738a8b830 Merge branch 'develop' into feature/entries-trash-origin 2023-02-15 17:29:23 +03:00
9b36707fbd Web: Changed "DeveloperTools" translation 2023-02-14 12:55:16 +03:00
Mushka Nikita
663b7931ab added erasure column to trash 2023-02-13 15:19:02 +03:00
640d8d6632 Merge branch 'develop' into bugfix/61099 2023-02-13 13:15:52 +03:00
c9baec3175 Web: Added translation. 2023-02-10 11:31:49 +03:00
Elyor Djalilov
f3c6b14817 Fix Bug 61099 - Mobile. The location of the download copy button in the backup menu 2023-02-09 13:47:20 +05: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
DmitrySychugov
321298d809 Web: Client: added en media error translation 2023-02-06 16:09:55 +05:00
Vashchuk Nikita
ab7f24a68b Merge branch 'release/rc-v1.2.0' into feature/notifications 2023-02-02 18:48:48 +05:00
Elyor Djalilov
272c57a1fd Web: PortalSettings: fix translate 2023-02-02 13:45:05 +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
Akmal Isomadinov
daa4331f79 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-30 14:31:36 +05:00
Akmal Isomadinov
8bf53e54a4 Web:Client Fixed delete forever dialog for trash 2023-01-30 14:31:16 +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
799fdd9679 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-27 15:56:14 +05: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
Viktor Fomin
2672c870d2 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-27 13:05:58 +03:00
14204efc52 Web: PortalSettings: Payments: Changed styles according to layouts. 2023-01-27 09:59:37 +03:00
Viktor Fomin
bad353a3f3 Client: Wizard: fix translate 2023-01-26 18:40: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
Akmal Isomadinov
6ca51c697e Web: Change text download report button, Added download report description and added loader for download report button 2023-01-25 14:04:38 +05:00
2e25297f49 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2023-01-24 11:38:12 +03:00
72441319da Web:Client:Fix. 2023-01-24 11:38:04 +03: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
1d3f252a16 Web:Client:Add translation. 2023-01-23 23:22:57 +03: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