Commit Graph

9357 Commits

Author SHA1 Message Date
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
670125fe32 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-13 12:34:46 +03:00
d8281d940e Web: Added translation for unexpected error. 2023-03-13 12:33:29 +03:00
b77f0ac9f5 Fix UselessTranslationKeysTest issue (Remove EnterPath key) 2023-03-13 13:24:34 +04:00
af423e2047 Fix UselessTranslationKeysTest issue (Change usage of DeleteFile and DeleteFolder keys) 2023-03-13 13:23:15 +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
7420a2a25a Web: Removed number substitution in translation. 2023-03-13 11:57:19 +03:00
d1c766c6fc Fix FullEnDublicatesTest issues (Archive/to archive) 2023-03-13 12:56:29 +04:00
bb48ec204a Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0 2023-03-13 11:53:36 +03:00
6bb831bd45 Web:Client:Fix language combo box styles. 2023-03-13 11:53:23 +03:00
9762e4eaca Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-13 11:45:30 +03:00
805f258e97 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-13 12:38:41 +04:00
80f2f03638 Fix EnDublicatesByContentTest issue (Payments) 2023-03-13 12:38:31 +04:00
Timofey Boyko
5b07dfb502 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-13 11:33:41 +03:00
Timofey Boyko
f084a463a2 Web:Client:Profile: add tooltip for not verified email 2023-03-13 11:33:31 +03:00
4bb0bc9d1c Web: Change version to v1.0.0 2023-03-13 12:19:48 +04:00
6b2e5868a4 Web: PortalSettings: Payments: Fixed styles. 2023-03-13 11:18:28 +03:00
Timofey Boyko
8a27f241d7 Web:Client:Profile: fix styles 2023-03-13 11:16:20 +03:00
9d0a3f10e8 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0 2023-03-12 18:27:19 +03:00
0fd2142e82 Web:Common: Fixed applying tablet styles for tablets larger than 1024px to desktop styles. 2023-03-12 18:26:37 +03:00
1365901bac Merge branch 'release/v1.0.0' into bugfix/payments-page 2023-03-11 00:26:01 +04:00
Viktor Fomin
00e3e50876 Client: Confirm: CreateUser: add greeting mode 2023-03-10 20:31:04 +03:00
bc68d350bf Merge branch 'release/v1.0.0' into bugfix/payments-page 2023-03-10 19:41:04 +04:00
0bfb51b5f7 Web: Added quota request after adding rooms and users. 2023-03-10 18:37:47 +03:00
122f9065dc Web: Added errors handler, getting link was moved to init function. 2023-03-10 18:25:24 +03:00
Timofey Boyko
d25a3bdaea Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-10 17:34:38 +03:00
Timofey Boyko
74822fe5f6 Web:Editor:Client: hide createNewFile for desktop editors 2023-03-10 17:34:30 +03:00
26dd6c28f0 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0 2023-03-10 17:23:23 +03:00
f5b56ec6db Web:Client:Add props showDisabledItems. 2023-03-10 17:23:16 +03:00
511c9d0bef Web: Added error handler. 2023-03-10 17:09:03 +03:00
132bc6792b
Merge pull request #1297 from ONLYOFFICE/feature/notifications
Feature/notifications
2023-03-10 17:06:55 +03:00
95a35bcad3 Web: Returned request. 2023-03-10 16:35:20 +03:00
Viktor Fomin
49554ab65e Client: Confirm: CreateUser: refactoring 2023-03-10 16:20:16 +03:00
Viktor Fomin
1b8d9c9664 Client: Confirm: fix layout style 2023-03-10 16:19:45 +03:00
Viktor Fomin
f2d8c90b21 Components: Themes: add colors 2023-03-10 16:19:32 +03:00
5c477e8a36 Web:Fix. 2023-03-10 16:18:29 +03:00
093a6fa577 Web:Component:Fixed incorrect itemCount definition for list with showDisabledItems prop set to false. 2023-03-10 16:17:21 +03:00
234bb31ab9 Web: Fixed dates. 2023-03-10 16:16:12 +03:00
bd61c2c322 Web: Payments: Splitting a file into several. 2023-03-10 15:41:33 +03: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
7f729cdf1b Web: Refactoring. 2023-03-10 15:14:40 +03:00
bd54c11a81 Merge branch 'develop' into feature/notifications 2023-03-10 14:27:34 +03:00
10d5ebcbca Web: Notifications: Deleted useless code. 2023-03-10 14:25:03 +03:00
9f390b7837 Web: Refactoring. added error handler. 2023-03-10 14:23:16 +03:00
a8350825bc Web: Refactoring, added mute status update immediately. 2023-03-10 14:22:10 +03:00
e6b1cf82bd Web: Notifications: Renaming. 2023-03-09 19:15:57 +03:00
ec3d8eb44b Web: Deleted useless translations. 2023-03-09 19:13:22 +03:00
70f89faa78 Web:Client:Add sortByTitle for FilterInput. 2023-03-09 19:12:13 +03:00
e138399ab2 Web:Common:Add title for SortButton. 2023-03-09 19:11:55 +03:00
66e26f076b Web: Added error handler. 2023-03-09 19:05:27 +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
7f3c2c5bb2 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0 2023-03-09 18:13:05 +03:00
de834ffa27 Web:Client:Change translations. 2023-03-09 18:12:58 +03:00
Viktor Fomin
9499aa6306 Client: PortalSettings: Whitelabel: fix reset, disabled 2023-03-09 18:11:02 +03:00
666a5775ea Web:Client:Renamed actions in the main button. 2023-03-09 17:42:53 +03:00
a6ce7bcfa9 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0 2023-03-09 17:00:08 +03:00
8b643df15e Web:Components:Fixed missing icon cross after page reload due to missing url dynamic update in ReactSvg. 2023-03-09 16:59:21 +03:00
Elyor Djalilov
5b282e02e1 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-09 16:30:47 +05:00
Elyor Djalilov
13dc3daac7 Web: Client: Profile: fix undefined value in session storage 2023-03-09 16:30:40 +05:00
c09340775d Web: Files: fixed onClearFilter 2023-03-09 13:39:29 +03:00
14a6bceb86 Fixed Bug 61529 - Rooms.Archive. Fixed "Clear search" action 2023-03-09 13:36:50 +03:00
Elyor Djalilov
6f43a64a35 Fix Bug 61532 2023-03-09 14:25:52 +05:00
Elyor Djalilov
53919a72a2 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-09 13:47:09 +05:00
Elyor Djalilov
f75c2c7e08 Fix Bug 61043 2023-03-09 13:46:58 +05:00
4284fac1aa Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-09 11:46:45 +03:00
38332692bf Web: MediaViewer: Removed scroll after media exit. 2023-03-09 11:46:26 +03:00
98d1106b32 Web: Section: Added when clicking on the name of a media file, the file is not selected. 2023-03-09 11:42:48 +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
Mushka Nikita
208fa56a24 Fixed crash on several people selection 2023-03-09 11:15:41 +03:00
Vlada Gazizova
7c22c9d4fa
Merge pull request #1292 from ONLYOFFICE/bugfix/fix-duplicate
Web:Client:Fix deleting source file after duplication operation.
2023-03-07 16:59:53 +03:00
3acd390f2b
Merge pull request #1289 from ONLYOFFICE/bugfix/fix-back-button
Web:Client:Fix back button.
2023-03-07 13:30:36 +04:00
00e07ac1cb Web:Client:Fix deleting source file after duplication operation. 2023-03-07 12:24:46 +03:00
fe70038a43 Web:Client:Fix. 2023-03-07 11:27:44 +03:00
517e7f16e0 Web:Client:Fix. 2023-03-07 11:24:21 +03:00
b5b9deb391 Web:Client:Fix isArchivedRoom. 2023-03-07 11:22:38 +03:00
b2a71ab158 Web:Client:Fix. 2023-03-07 10:57:12 +03:00
DmitrySychugov
5b6a107e3d Web: Client: fixed clean timeout 2023-03-07 12:53:11 +05:00
bdd62c5a43 Merge branch 'develop' into bugfix/fixed-loader-blinking 2023-03-06 23:03:03 +04:00
6b2434eb28 Web:Client:Fix back button. 2023-03-06 18:05:23 +03:00
DmitrySychugov
daf38f640c Web: Client: added a small delay to the loader so that there is no flickering 2023-03-06 19:06:57 +05:00
626bb741b5 Merge branch 'develop' into bugfix/61157 2023-03-06 17:34:37 +04:00
378407686c
Merge pull request #1287 from ONLYOFFICE/bugfix/additional-resources-buttons
Bugfix/additional resources buttons
2023-03-06 17:32:20 +04: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
cbc8d7b2d5
Merge pull request #1286 from ONLYOFFICE/bugfix/fixed-files-upload
Web: Files: fixed files upload
2023-03-06 15:11:16 +03:00
668a1c6258 Web: Files: fixed conversion 2023-03-06 14:29:39 +03:00
90c9fa1a0c Web:Client:Fix the lack of buttons if the settings are not paid. 2023-03-06 14:28:41 +03:00
a26384cc96 Web: Files: fixed files upload 2023-03-06 14:17:21 +03:00
977ef4f43a Merge branch 'develop' into feature/send-again 2023-03-06 15:12:02 +04:00
8d45abeffe Merge branch 'feature/send-again' of github.com:ONLYOFFICE/AppServer into feature/send-again 2023-03-06 13:21:45 +03:00
b219ebb07b Web:Client:Fix styles. 2023-03-06 13:21:37 +03:00
43e465697d Fix Bug 61481 - Accounts. The email of the portal owner is not confirmed 2023-03-06 14:20:59 +04:00
Elyor Djalilov
b28f8e793b Web: PortalSettings: fix backup fields 2023-03-06 14:43:16 +05:00
Elyor Djalilov
d4fd62e2ec fix bad merge 2023-03-06 14:29:09 +05:00
Elyor Djalilov
fdaf0aa9e9 Merge branch 'develop' into bugfix/61157
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
#	packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js
#	packages/client/src/pages/PortalSettings/categories/common/Customization/portal-renaming.js
#	packages/client/src/pages/PortalSettings/categories/common/Customization/welcome-page-settings.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/index.js
2023-03-06 14:20:25 +05:00
83c03823aa Fix confirmLink activeEmail 2023-03-06 12:35:49 +04:00
2a503cfc47 Merge branch 'develop' into feature/send-again 2023-03-06 10:59:42 +04:00
Akmal Isomadinov
7ee3770bd2 Web:Common:Components:MediaViewer:Sub-Components:ImageViewer Fixed the wheel event and removed useless code 2023-03-06 11:59:41 +05:00
Akmal Isomadinov
ff18523e43 Web:Common:Components:MediaViewer:Sub-Components Fixed the zoom value in the toolbar 2023-03-06 11:21:28 +05:00
6cf2a16c39 Merge branch 'develop' into feature/send-again 2023-03-05 12:18:02 +03:00
bfeda8f9e9 Web:Client:Fixed styles because the send link again did not fit in the plate. 2023-03-05 12:17:42 +03:00
b341ddfb62 Fix socket operations 2023-03-05 11:39:44 +04:00
Elyor Djalilov
44c04c5131 Web: PortalSettings: fix appearance color 2023-03-04 19:44:39 +05:00
Elyor Djalilov
668be2e17d Web: PortalSettings: fix single sign-on fields 2023-03-04 13:10:53 +05:00
Elyor Djalilov
4cecc2c3a9 Web: PortalSettings: fix styles 2023-03-04 11:36:04 +05:00
Elyor Djalilov
728ba4ea5b Web: PortalSettings: fix automatic backup fields 2023-03-04 11:19:06 +05:00
Elyor Djalilov
6ded261462 Web: PortalSettings: fix company logos 2023-03-04 10:18:44 +05:00
c91f6c9e5d Merge branch 'develop' into feature/fix-back-button-rooms 2023-03-03 18:03:29 +04:00
964300cd19 Merge branch 'develop' into bugfix/oforms-context-info 2023-03-03 17:02:35 +04:00
b6b24fd4fc
Merge pull request #1280 from ONLYOFFICE/bugfix/fix-truncate-text
Bugfix/fix truncate text
2023-03-03 17:01:16 +04:00
e68e5a2cbb Web:Components:Fix missing text clipping if text is out of width. 2023-03-03 15:21:24 +03:00
68ce5c8764 Merge branch 'bugfix/settings-backup' of github.com:ONLYOFFICE/AppServer into bugfix/settings-backup 2023-03-03 14:46:21 +03:00
f4d8972358 Web: Renaming. 2023-03-03 14:46:01 +03:00
8acbf0bd64 Merge branch 'develop' into bugfix/settings-backup 2023-03-03 15:23:05 +04:00
Mushka Nikita
bc2eda8a4c fiixed erasure sorting 2023-03-03 14:21:25 +03:00
Mushka Nikita
00d44aad43 added russian translation to erasure functionality 2023-03-03 14:21:17 +03:00
Viktor Fomin
b2edb13072 Client: AccountsHome: add ResetApplicationDialog 2023-03-03 14:03:32 +03:00
Viktor Fomin
c7aa870767 Client: init reset auth 2023-03-03 14:03:02 +03:00
Viktor Fomin
4d60816027 Client: ResetApplicationDialog: add success toast 2023-03-03 14:01:10 +03:00
Viktor Fomin
c6e1c58e97 Client: add translates 2023-03-03 14:00:53 +03:00
Mushka Nikita
5171aeceb8 fiixed infoPanel closing on category switch 2023-03-03 13:34:03 +03:00
3448048b2b Web: PortalSettings: Restore: Deleted useless code. 2023-03-03 13:06:21 +03:00
d49f5ead91 Web: PortalSettings: Deleted useless code. 2023-03-03 12:56:38 +03:00
Akmal Isomadinov
e6fe2125d8 Web:Common:Components:MediaViewer:Sub-Components:ImageViewerToolbar Fixed a typo in the file name 2023-03-03 14:55:55 +05:00
f8000cdc2a Web: PortalSettings: Backup: Fixed component display by direct url. 2023-03-03 12:54:22 +03:00
Akmal Isomadinov
63821e70f3 Web:Common:Components:MediaViewer:Sub-Components Correcting the function name and casting a single style 2023-03-03 14:52:17 +05:00
Akmal Isomadinov
fbab03fa5e Web:Common:Components:MediaViewer:Sub-Components:ImageViewer Fixed a typo in the function name 2023-03-03 14:41:59 +05:00
d88d866deb Merge branch 'develop' into feature/refactoring-viewer-base 2023-03-03 13:24:49 +04:00
Akmal Isomadinov
50b50cb75b Web:Common:Components:MediaViewer:Sub-Components:ImageViewer Fixed position calculation in wheel events 2023-03-03 13:36:58 +05:00
Akmal Isomadinov
e20b60b5af Web:Common:Components:MediaViewer:Sub-Components:ViewerWrapper Fixed closing the viewer during deletion and renaming 2023-03-03 13:26:44 +05:00
23b5689205 Web:Client:Fix. 2023-03-03 11:17:58 +03:00
Akmal Isomadinov
a8a7344225 Web:Common:Components:MediaViewer:Sub-Components:Viewer Fixed hiding the toolbar after opening the viewer 2023-03-03 13:11:39 +05:00
Timofey Boyko
a1c6d87598 Web:Common:FilterInput: fix empty tag 2023-03-03 11:07:52 +03:00
Timofey Boyko
f4f7a1b3ad Web:Client: move FilterGroups and FilterKeys constants to common 2023-03-03 11:05:26 +03:00
714676d9c7 Web:Components:Fix not displaying content corresponding to url in submenu when you press back button in browser. 2023-03-03 11:02:47 +03:00
Akmal Isomadinov
26df02cd2c Web:Common:Components:MediaViewer:Sub-Components:ImageViewer Fixed on close 2023-03-03 12:58:50 +05:00
Akmal Isomadinov
94e5321e13 Web:Common:Components:MediaViewer:Sub-Components: Removed useless code 2023-03-03 12:47:26 +05:00
00e385f193 Web:Client:Fixed repeated push of the same url in Customization settings. 2023-03-03 10:47:07 +03:00
Akmal Isomadinov
be745d1f67 Web:Common:Components:MediaViewer:Sub-Components:ImageViewer Fixed closing the image when clicking outside the image area 2023-03-03 12:41:56 +05:00
Akmal Isomadinov
165d410e15 Web:Common:Components:MediaViewer:Sub-Components:ImageViewer Fixed image position calculation 2023-03-03 12:37:43 +05:00
8e025f4afb Web:Client:Fixed the lack of highlighting of the portal settings menu items when clicking back in the browser. Fixed substitution of the URL of the customization page when going to the branding page when there was a direct link download of the appearance page. 2023-03-03 10:12:00 +03:00
43dcb4dcd7 Web: Added clear storage. 2023-03-03 09:55:44 +03:00
Akmal Isomadinov
c9cc5f78be Merge branch 'feature/refactoring-viewer-base' of github.com:ONLYOFFICE/DocSpace into feature/refactoring-viewer-base 2023-03-03 00:22:47 +05:00