Commit Graph

571 Commits

Author SHA1 Message Date
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
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
Viktor Fomin
c6e1c58e97 Client: add translates 2023-03-03 14:00:53 +03: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
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
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