Commit Graph

4639 Commits

Author SHA1 Message Date
c521443ce7 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-16 18:30:52 +03:00
db302362a0 edited translations 2023-03-16 18:30:30 +03:00
6f407e2c0c Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0 2023-03-16 16:00:25 +03:00
Viktor Fomin
c16a1d529c Client: PortalSettings: Preview: fix style 2023-03-16 15:26:00 +03:00
Viktor Fomin
60c69b044c Client: Profile: fix style 2023-03-16 15:20:02 +03:00
DmitrySychugov
8333b410c7 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-16 16:24:15 +05:00
DmitrySychugov
8a7a9fe8e4 Web: Client: fixed CustomizationNavbar display condition 2023-03-16 16:24:04 +05:00
614a64b8e5 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0 2023-03-16 13:25:07 +03:00
Mushka Nikita
1c5c9de7dc Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-16 13:18:50 +03:00
Mushka Nikita
5a1bfb575b infoPanel styling refactor 2023-03-16 13:13:25 +03:00
0ccebd8d09 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0 2023-03-16 12:19:12 +03:00
f7e3bcf9d2 Web:Client:Fixed showing DropDown list with withBlur for mobile phones with landscape orientation. 2023-03-16 12:15:44 +03:00
Viktor Fomin
fecd04f1e1 Client: disabled reset auth if tfa off 2023-03-16 12:13:26 +03:00
21c6ddee11 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-16 12:11:33 +03:00
20d8f5d4ff Web: Added a check for the "payment required" error and updating the tariff status to go to the payment page, if necessary by status. 2023-03-16 12:00:47 +03:00
e0db25760c Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0 2023-03-16 11:35:17 +03:00
7474947f68 Web: Files: fixed loaders flickering 2023-03-16 11:35:07 +03:00
4f4ed5481f Web: Fix Filter by RoomsType enum 2023-03-16 12:27:00 +04:00
d27100fd1a Web: Applied new thumbnail size for InfoPanel 2023-03-15 20:18:34 +04:00
785a04f4fe Applied new height of thumbnails (300 -> 156) + new 1280x720 variant for InfoPanel and preview 2023-03-15 19:25:01 +04:00
ca18f997c3 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-15 18:08:07 +03:00
bf9063b497 Web: Added links to go to support and help center. 2023-03-15 18:07:21 +03:00
Viktor Fomin
dcc172dbd6 Client: InfoPanel: fix style 2023-03-15 13:28:26 +03:00
03a56fe6ae Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-15 13:09:37 +03:00
30bb3a6e3b Web: PortalUnavailable: Fixed theme styles. 2023-03-15 13:08:34 +03:00
4454b0455a Web: PortalUnavailable: Fixed translations. 2023-03-15 13:06:10 +03:00
274ed54c94 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0 2023-03-15 12:29:16 +03:00
451863a8b3 Web: Added warning dialog when trying to restore a room during the grace period. 2023-03-15 12:28:26 +03:00
e19e813738 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0 2023-03-15 12:10:55 +03:00
a42ee66617 Web:Client:Fixed the lack of simultaneous display of the skeleton in the body of the content and the footer in the profile. 2023-03-15 12:10:13 +03:00
52c90296f1 Web:Client:Add Loader for ActiveSessions. 2023-03-15 12:07:38 +03:00
0710fc8a7e Web: MainBar: Bar display was limited on confirm pages. 2023-03-15 11:25:23 +03:00
7d77215066 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-15 11:04:21 +03:00
49becf391a Web: MainBar: Bar display was limited. 2023-03-15 11:02:42 +03:00
Timofey Boyko
00d92318a8 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-14 17:54:04 +03:00
Timofey Boyko
ac3eab17d4 Web:Client:Shell: fix night mode for mobile firefox IOS 2023-03-14 17:54:00 +03:00
448fd76bba Web: InviteUsersWarningDialog: Removed button for users who cannot go to the payment page. 2023-03-14 16:54:01 +03:00
Mushka Nikita
4595804d33 fixed info-panel several items padding 2023-03-14 15:51:33 +03:00
a1b4659e4b Fix NotFoundKeysTest issue 2023-03-14 15:31:53 +04:00
DmitrySychugov
e462798190 Web: Client: fixed comments 2023-03-14 16:24:26 +05:00
cf90dd11c2 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-14 14:14:54 +03:00
d4ea5f4ccb Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-14 14:14:20 +03:00
0044ea935b Web: Removed 'Video guides'. 2023-03-14 14:14:14 +03:00
Mushka Nikita
ac4bc3b023 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-14 14:13:50 +03:00
853915fad1 Web: PortalSettings: Payments: Fixed free tariff title. 2023-03-14 14:11:49 +03:00
Mushka Nikita
f1dbe0242f fixed thirdpartyStorage returning empty div 2023-03-14 14:02:53 +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
838e580a69 Web: PortalSettings: Payments: Removed useless check. 2023-03-14 13:44:16 +03:00
6eb50f8d50 Web: PortalSettings: Payments: Fixed dates. 2023-03-14 13:39:28 +03:00
ca574f09eb Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-14 14:31:07 +04:00
eb86665d70 Web: Fix some translations issues 2023-03-14 14:30:58 +04:00
Viktor Fomin
c5df3e697f Client: PortalSettings: Whitelabel: simplify 2023-03-14 13:21:24 +03:00
1df9a39a13 Web: Fix some translations issues 2023-03-14 14:15:43 +04:00
0ab596cb27 Web: Removed ConnectClouds (Fix NotFoundKeysTest issues) 2023-03-14 13:47:56 +04:00
13f5ef4a5d Web: Removed old third-party code (Fix NotFoundKeysTest issues) 2023-03-14 13:45:22 +04:00
d586b39791 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-14 13:20:54 +04:00
4861aef38e Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-14 13:20:42 +04:00
5e5572db2c Fix NotFoundKeysTest issue (Removed usage of AdvantageEditor, AdvantagePrivateRooom, AdvantageWebEditors and AdvantageUpdates keys) 2023-03-14 13:20:32 +04:00
Mushka Nikita
faaac15b37 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-14 12:20:26 +03:00
Mushka Nikita
7d688d3841 refactored infoPanel styling 2023-03-14 12:20:10 +03:00
c1d4b91419 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-14 12:20:07 +03:00
074033d200 Web: PortalSettings: Payments: Deleted useless code. 2023-03-14 12:19:53 +03:00
cb864b23be Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-14 13:11:22 +04:00
898a734a2f Fix NotFoundKeysTest issue (Payments key) 2023-03-14 13:11:12 +04:00
fc4167cad8 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-14 12:02:25 +03:00
9811bceef4 Web: Files: fixed info-panel title 2023-03-14 11:43:29 +03:00
6f0f0ef2a5 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0 2023-03-14 11:40:22 +03:00
ebed98a537 Web:Client:Fix title in infoPanel. 2023-03-14 11:40:14 +03: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
5197dfae86 Fix NotFoundKeysTest issue (Removed usage of CustomNewDepartment key) 2023-03-14 11:27:36 +04:00
88060f9ca5 Fix NotFoundKeysTest issue (Removed usage of ReassignmentData key) 2023-03-14 11:22:02 +04: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
39ce5dd016 Web: Fixed info panel opening. 2023-03-14 09:47:41 +03:00
db4c561798 Web: Fixed 'ru' translation. 2023-03-14 09:27:27 +03:00
7a22d71642 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0 2023-03-13 18:17:15 +03:00
7b305cc518 Web:Client:Delete duplicate translation. 2023-03-13 18:17:03 +03:00
485abb701f Web: Files: fixed tile view 2023-03-13 17:34:32 +03:00
89f51ab20a Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0 2023-03-13 17:30:52 +03:00
d9943ab255 Web: Files: fixed moveToCopyTo 2023-03-13 17:30:38 +03:00
755af4f544 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-13 17:25:31 +03:00
696b6504fc Web: Hid upgrade button in dialog for room admin. 2023-03-13 17:23:36 +03:00
ac0f8feae9 Web: Added portal grace period warning modal dialog when inviting users. 2023-03-13 17:05:58 +03:00
918ccb1bf6 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0 2023-03-13 16:53:41 +03:00
1cd8e14763 Web:Client:Fixed the definition of the time zone in active sessions by the location of the user and not the portal. 2023-03-13 16:53:31 +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
91943124ac Fix NotFoundKeysTest issue (Removed usage of SendInvitesAgain and ImportPeople keys) 2023-03-13 15:23:36 +04: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
4719c48604 Fix UselessTranslationKeysTest issue (Added usage of RoomNotificationsDisabled key) 2023-03-13 14:55:52 +04:00
d09f0bfe18 Fix UselessTranslationKeysTest issue (Added usage of PortalIntegration key) 2023-03-13 14:52:53 +04:00
2c5f2093fa Fix UselessTranslationKeysTest issue (Change usage of MoveToTrashFolderFromPersonal and MoveToTrashFolderFromPersonal keys) 2023-03-13 14:36:24 +04:00
d42b889c30 Fix UselessTranslationKeysTest issue (Change usage of MoveToTrashFile and MoveToTrashFolder keys) 2023-03-13 14:35:00 +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
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
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
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
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
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
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
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
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
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
f8000cdc2a Web: PortalSettings: Backup: Fixed component display by direct url. 2023-03-03 12:54:22 +03:00
23b5689205 Web:Client:Fix. 2023-03-03 11:17:58 +03:00
Timofey Boyko
f4f7a1b3ad Web:Client: move FilterGroups and FilterKeys constants to common 2023-03-03 11:05:26 +03:00
00e385f193 Web:Client:Fixed repeated push of the same url in Customization settings. 2023-03-03 10:47:07 +03: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
0f22feed6e Merge branch 'develop' into bugfix/fixed-render-list 2023-03-02 19:59:01 +04:00
655add486d Hide ResetAuth option 2023-03-02 19:56:38 +04:00
4eed07ffe1 Hide concole 2023-03-02 19:51:27 +04:00
fb101bfabe Web: Files: fixed moveToCopyTo operation 2023-03-02 18:39:23 +03:00
baed7a67aa Web:Client:Remove unnecessary code since the handling of the popstate event is in the submenu. 2023-03-02 18:23:53 +03:00
b59aec3807 Web: PortalSettings: Backup: Delete useless code. 2023-03-02 17:59:33 +03:00
Timofey Boyko
0f82f5436a Web:Client:MainBar: delete useless code 2023-03-02 17:24:01 +03:00
Timofey Boyko
ad2398ddd0 Web:Client:Profile: fix double invite request 2023-03-02 17:22:50 +03:00
Timofey Boyko
d8e2b2c03a Merge branch 'develop' into bugfix/accounts-filter 2023-03-02 17:16:30 +03:00
Mushka Nikita
da794c6a0f Merge branch 'bugfix/oforms-context-info' of github.com:ONLYOFFICE/AppServer into bugfix/oforms-context-info 2023-03-02 16:50:33 +03:00
Mushka Nikita
0569c1faab fixed styling in info-panel accounts empty view 2023-03-02 16:50:18 +03:00
Mushka Nikita
caeaf69406 fixed accounts home header-container styling 2023-03-02 16:49:32 +03:00
2da50109bb Merge branch 'develop' into bugfix/oforms-context-info 2023-03-02 17:37:51 +04:00
a4d3ff43bf Merge branch 'develop' into bugfix/mobile-loader 2023-03-02 17:26:32 +04:00
bdb784b250
Merge pull request #1264 from ONLYOFFICE/bugfix/avatar-size
Web:Client:Removed the transfer of the size of the avatar so that the…
2023-03-02 17:18:27 +04:00
Timofey Boyko
477015697d Web:Client:MainBar: fix link style 2023-03-02 16:17:35 +03:00
Viktor Fomin
ba81ad25b9 Merge branch 'develop' into bugfix/mobile-loader 2023-03-02 16:13:00 +03:00
b47ed9ea40 Merge branch 'develop' into bugfix/Bug61218 2023-03-02 17:08:47 +04:00
1a73aa630e
Merge pull request #1270 from ONLYOFFICE/bugfix/fixed-cancel-upload
Web: Files: fixed cancel upload
2023-03-02 17:03:21 +04:00
7ea61d3c5b Web:Client:Added popstate event handling for accounts and settings. 2023-03-02 16:01:11 +03:00
Timofey Boyko
6fcabb5e2b Web:Client:Profile: fix styles for main-profile 2023-03-02 15:56:27 +03:00
cad06d79a1 Web: Client: InviteLinksStore: Added runInAction for getting links action 2023-03-02 15:39:34 +03:00
Viktor Fomin
fbcd2500fe Merge branch 'develop' into bugfix/mobile-loader 2023-03-02 15:03:31 +03:00
Viktor Fomin
12109ee711 Merge branch 'develop' into bugfix/Bug61218 2023-03-02 15:03:18 +03:00
Viktor Fomin
e498f32200 Client: Shell: delete useless 2023-03-02 14:49:08 +03:00
c6cdd69be1 Web: TreeFolders: Deleted error. 2023-03-02 14:24:32 +03:00