Commit Graph

22094 Commits

Author SHA1 Message Date
d8980cc3a7 fix 57917 2022-07-14 20:00:43 +03:00
ee9e381b26 fixed async 2022-07-13 20:09:43 +03:00
3597114325 Api: fix tfaappnewapp 2022-07-13 18:41:44 +03:00
2aec92c2e0 fix 2022-07-13 18:15:29 +03:00
595cfcc2d2 fixed loginevent 2022-07-13 15:15:13 +03:00
ed7ef58b53 Api: fixed loginevent 2022-07-13 14:21:25 +03:00
48a743e01e
Merge pull request #722 from ONLYOFFICE/bugfix/Bug53348
Bug 53348 - Client.Account termination. Account deletion confirmation…
2022-07-13 13:43:03 +03:00
04603f1314 Merge branch 'develop' into bugfix/Bug53348 2022-07-13 13:42:24 +03:00
a88d5b6d41
Merge pull request #715 from ONLYOFFICE/feature/room_tests
Feature/room tests
2022-07-13 13:03:41 +03:00
ea00433ff1 Files: tests. refactoring 2022-07-13 13:00:08 +03:00
120a57c1bf Merge branch 'develop' into feature/room_tests 2022-07-13 11:56:48 +03:00
62ce169017
Merge pull request #724 from ONLYOFFICE/feature/room-api-refactor
feature/room-api-refactor
2022-07-13 11:49:20 +03:00
e7831d9b94 Files: moved parameter from body to query 2022-07-13 11:47:15 +03:00
06a98c508e Merge branch 'develop' into feature/room_tests
# Conflicts:
#	.gitignore
2022-07-12 22:48:47 +03:00
a8ba7ae685 removed logo test 2022-07-12 22:44:10 +03:00
72caeb475c People: fixed change theme mathod 2022-07-12 20:45:12 +03:00
c9680ae830 fix tfaapp 2022-07-12 19:36:39 +03:00
c1be6ecb61 Settings: ignore id 2022-07-12 15:33:46 +03:00
fa8898d522 Files: fixed converter 2022-07-12 14:18:26 +03:00
df65b26ce9
Merge pull request #723 from ONLYOFFICE/feature/security-settings
Feature/security settings
2022-07-12 14:16:53 +03:00
a9d5080f5d Web: Client: Settings: disabled autofocus 2022-07-12 13:50:55 +03:00
7b19b2f730 Web: Client: Settings: SessionLifetime: fix show reminder 2022-07-12 13:41:50 +03:00
0d0eed6d1a Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings 2022-07-12 12:57:57 +03:00
71ca12b8e2 Update .gitignore with radicale plugin files 2022-07-12 12:53:30 +03:00
e9a15cc2a4 added [HttpGet("iprestrictions/settings")] 2022-07-12 12:20:59 +03:00
c9f7e95d5c fixed iprestrictions method 2022-07-12 12:06:38 +03:00
fd986320f2 Api: fixed maildomainsettings 2022-07-12 11:47:05 +03:00
b2b55bfa5b fixed subfolders method 2022-07-11 22:22:56 +03:00
477f386047
Merge pull request #698 from ONLYOFFICE/feature/create-from-modal
Feature/create from modal
2022-07-11 17:28:09 +03:00
14ec770253
Merge branch 'develop' into feature/create-from-modal 2022-07-11 17:19:39 +03:00
TimofeyBoyko
58bd9509a1 Web:Files:Hocs: fix keyup on create docx after merge 2022-07-11 17:13:51 +03:00
TimofeyBoyko
a0651ecca4 Web:Files:HOCs: fix create operation with hotkeys 2022-07-11 16:36:46 +03:00
70a8100235 Bug 53348 - Client.Account termination. Account deletion confirmation page when following an invalid link. 2022-07-11 15:58:13 +03:00
16acccc4e3 Sql: Added hosting_instance_registration table 2022-07-11 15:48:53 +03:00
TimofeyBoyko
91ca312871 Merge branch 'develop' into feature/create-from-modal 2022-07-11 14:51:45 +03:00
baea63043c Web: Components: Utils: fix hugeMobile size 2022-07-11 14:48:25 +03:00
136a0d45bf Web: Client: TfaActivation: fix layout 2022-07-11 14:47:57 +03:00
65a739d871 Removed ASC.Web.Campaigns (moved to separated repository) 2022-07-11 14:15:51 +03:00
3cbfa3d952 Web: Client: TfaAuth: fix layout 2022-07-11 13:57:58 +03:00
6719ff0e72 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings 2022-07-11 12:39:34 +03:00
a9e94046c8 Merge branch 'master' into develop 2022-07-11 12:16:37 +03:00
b3324ad875 Web: Client: NavMenu: fix namespace 2022-07-11 11:28:25 +03:00
15fc78111a
Merge pull request #718 from ONLYOFFICE/release/v1.2
Release/v1.2
2022-07-11 10:47:33 +03:00
1f3dfb9ccc Web: Client: AdminMessage: fix save 2022-07-08 16:46:26 +03:00
f69194b034 Web: Client: TfaActivation: fix error 2022-07-08 16:22:30 +03:00
6a690fc175 Web: Client: fix confirmLinkData 2022-07-08 16:22:08 +03:00
63c2c34d44 refactoring tests 2022-07-08 15:31:07 +03:00
7e3abdc498
Merge pull request #712 from ONLYOFFICE/feature/new-files
Files: update docstore submodule
2022-07-08 15:11:18 +03:00
0504838691 fix tests 2022-07-08 11:46:34 +03:00
0da612710d Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings 2022-07-07 19:39:12 +03:00