Commit Graph

4258 Commits

Author SHA1 Message Date
Vladimir Khvan
b2546b1c96 Merge branch 'develop' into feature/webhooks-page 2023-03-07 00:41:32 +05:00
Vladimir Khvan
11e806d7c5 url key was substituted with id 2023-03-07 00:37:22 +05:00
Vladimir Khvan
dacebccf49 inputs were wrapped in form/ password settings were injected 2023-03-07 00:37:03 +05:00
Vladimir Khvan
4c303fb3e9 mask and required props were added 2023-03-07 00:36:34 +05:00
Vladimir Khvan
b4137afd7d password settings were injected/password validation was added 2023-03-07 00:36:12 +05:00
bdd62c5a43 Merge branch 'develop' into bugfix/fixed-loader-blinking 2023-03-06 23:03:03 +04: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
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
Vladimir Khvan
2c8560a3c0 webhook's actions were added 2023-03-06 16:03:22 +05:00
Vladimir Khvan
2b6705a755 webhooks store was added 2023-03-06 16:02:31 +05:00
Vladimir Khvan
93bfc64fe1 functions were substituted with webhooks's actions 2023-03-06 16:02:06 +05:00
Vladimir Khvan
2897160faf webhook's actions functions were added 2023-03-06 16:01:21 +05:00
Vladimir Khvan
dfe17a207c id was added to webhook object 2023-03-06 16:00:39 +05:00
Vladimir Khvan
dff264e97c webhooks store was integrated / webhooks interaction functions were added 2023-03-06 15:58:28 +05:00
Vladimir Khvan
5475c80893 set document title to developer tools 2023-03-06 15:57:22 +05: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
Vladimir Khvan
cd0c7e7adf webhooks store was created 2023-03-06 09:56:24 +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
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