Commit Graph

23894 Commits

Author SHA1 Message Date
d26f045e8e Webhooks: added enabled and delivery columns 2022-08-18 12:03:13 +03:00
8fefd3debb Merge branch 'develop' into feature/create-room 2022-08-18 11:25:02 +03:00
f5474d5e26
Merge pull request #759 from ONLYOFFICE/feature/login-confirm-redesign
Feature/login confirm redesign
2022-08-18 11:22:12 +03:00
2b6c4b127a Merge branch 'develop' into feature/docspace-backup
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Server/Api/ThirdpartyController.cs
2022-08-17 13:58:00 +03:00
fe7140c21d Web: ManualBackup: fixed after merge. 2022-08-17 13:34:05 +03:00
f0ff24b065 Web: Deleted useless code. 2022-08-17 12:57:34 +03:00
f08679dd2d Web: Deleted useless code. 2022-08-17 12:54:20 +03:00
88c3a92876 Backup: fixed mail 2022-08-17 12:38:51 +03:00
4cdce5b713 Webhook: async 2022-08-17 12:18:50 +03:00
6ec79e015e Webhook: splited event in two columns 2022-08-16 17:47:40 +03:00
89157000e5 fixed createMigrations.bat 2022-08-16 17:46:29 +03:00
b65b7c75e5 Move translates from NavMenu to Login 2022-08-16 16:26:00 +03:00
36c52959e5 delete useless 2022-08-16 16:13:50 +03:00
12760ef28f Webhook: merged services. Added Polly. 2022-08-16 13:36:48 +03:00
a9591c875c Login: add recover access dialog 2022-08-16 12:51:28 +03:00
6ef8662ab3 Login: RecoverAccess: add logic 2022-08-16 12:50:35 +03:00
acd6ed8b57 Login: move recover access modal from client 2022-08-16 12:33:45 +03:00
fc12eb4873 NavMenu: delete useless 2022-08-16 12:33:09 +03:00
ddc24796fe NavMenu: delete recover access 2022-08-16 12:26:42 +03:00
e08d1342c2 Login: fix style 2022-08-16 12:06:32 +03:00
34453e8cea Login: fix style 2022-08-16 11:47:54 +03:00
33574cfeb9 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/login-confirm-redesign 2022-08-16 11:43:01 +03:00
mushka
6d7dd140cd commented out react-avatar-editor dependancy 2022-08-15 19:13:15 +03:00
mushka
218b94b5b6 commented out unfinished room params 2022-08-15 19:07:59 +03:00
mushka
0a686b6731 added react-avatar-editor dependency 2022-08-15 19:06:46 +03:00
9ccf6055ea Web: Updated icons. 2022-08-15 17:33:36 +03:00
c03a12209e fixed total 2022-08-15 17:31:27 +03:00
29187803e5 Web: Deleted useless code. 2022-08-15 17:24:41 +03:00
8537afcbcf Web: Deleted useless code. 2022-08-15 17:22:20 +03:00
fd37c07afc Web: added translations. 2022-08-15 17:17:56 +03:00
e3d7f4cee8 Web: Added translations. 2022-08-15 17:03:55 +03:00
bfcc420e66 Web: Fixed bugs after merge. 2022-08-15 16:42:15 +03:00
0f869ed987 Web: Changed title. 2022-08-15 16:36:16 +03:00
21f8dd92fd Web: Added disconnect button. 2022-08-15 16:26:27 +03:00
mushka
4379a34bcf Merge branch 'develop' into feature/create-room 2022-08-15 16:01:20 +03:00
mushka
6b69ef62ea Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2022-08-15 15:59:04 +03:00
mushka
d772e1eb13 removed not needed data 2022-08-15 15:58:03 +03:00
mushka
ec286077c2 updated and fixed SetRoomParams 2022-08-15 15:57:33 +03:00
mushka
e86d45d88d removed unwanted file 2022-08-15 15:56:54 +03:00
mushka
f99806f51e update of ThirdPartyStorage 2022-08-15 15:56:28 +03:00
mushka
a2f32969e4 updatedCreateRoomEvent 2022-08-15 15:55:37 +03:00
mushka
2c2ae838b3 updatedEditRoomEvent 2022-08-15 15:55:24 +03:00
mushka
2acc22b17f added roomLogo methods to filesStore 2022-08-15 15:55:04 +03:00
mushka
f0351ceec0 added roomLogo api methods 2022-08-15 15:54:46 +03:00
mushka
95be5666fd updated tagInput and tagList 2022-08-15 15:54:24 +03:00
mushka
aad25382f2 moved privacy setting to own component and added warning banner 2022-08-15 15:53:47 +03:00
mushka
d79e7bf452 fixed translations in data & removed thhirdparties 2022-08-15 15:53:16 +03:00
mushka
5aa2147bf3 added permanent settings 2022-08-15 15:52:30 +03:00
mushka
78fe429124 restructured params to templates 2022-08-15 15:52:10 +03:00
mushka
5097d09a44 created iconEditorComponent 2022-08-15 15:51:11 +03:00