Commit Graph

22271 Commits

Author SHA1 Message Date
Artem Tarasov
3da9439f0f Web: Doceditor: fixed webpack config 2022-07-19 10:58:50 +03:00
Artem Tarasov
9f19891d0b Web: Doceditor: fix after merge 2022-07-19 10:48:26 +03:00
Artem Tarasov
10f2cde731 Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	.gitignore
2022-07-18 17:05:53 +03:00
Artem Tarasov
d4968b3225 Web: Doceditor: refactoring 2022-07-18 16:13:45 +03:00
Artem Tarasov
8c46fc661d Web: Doceditor: added i18n initialization 2022-07-18 16:07:22 +03:00
Artem Tarasov
d70e2df443 Web: Doceditor: added logger 2022-07-18 13:56:22 +03:00
cb9f4e5c61 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2022-07-18 12:37:04 +03:00
fb18fa6a0f removed voip 2022-07-18 12:36:45 +03:00
5f5b1f80c3
Merge pull request #727 from ONLYOFFICE/feature/remove-voip
Feature/remove voip
2022-07-18 12:32:50 +03:00
d94904b6af removed voip 2022-07-18 12:24:12 +03:00
Artem Tarasov
e06f4bd7b3 Web: Doceditor: modified run dev scripts 2022-07-17 13:01:49 +03:00
Artem Tarasov
ca7809ba52 Web: Doceditor: refactoring client (fix warnings, optimization component) 2022-07-17 12:48:23 +03:00
Artem Tarasov
de7b320f06 Web: Doceditor: modified webpack config (deleted unnecessary plugins, optimization) 2022-07-17 12:47:03 +03:00
Artem Tarasov
3ac7597ef7 Web: Doceditor: refactoring server 2022-07-17 12:46:17 +03:00
Artem Tarasov
4d9422ef0d Web: Doceditor: modified webpack config for client 2022-07-15 18:50:57 +03:00
e2b1e48fa9 removed voip service 2022-07-15 18:46:52 +03:00
Artem Tarasov
8172c832bf Web: Doceditor: modified webpack config for server 2022-07-15 14:37:58 +03:00
d8980cc3a7 fix 57917 2022-07-14 20:00:43 +03:00
Artem Tarasov
b8e4f56862 Web: Doceditor: fixed start script 2022-07-14 03:41:50 +03:00
Artem Tarasov
c47a265eff Web: Doceditor: added initDoceditor, api, requestManager 2022-07-14 03:39:56 +03:00
Artem Tarasov
12ed025fad Web: Doceditor: editor render fix 2022-07-14 03:39:09 +03:00
Artem Tarasov
0fe7836f65 Web: Doceditor: added global styles 2022-07-14 03:38:34 +03:00
Artem Tarasov
5364dceb53 Web: Doceditor: added Websocket to implement Live Reloading 2022-07-14 00:25:15 +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
Artem Tarasov
1e321859d7 Web: Doceditor: added ejs 2022-07-13 14:08:20 +03:00
Artem Tarasov
776c0874d1 Web: Doceditor: added babel.config.js to be able to use import in server 2022-07-13 14:07:49 +03:00
Artem Tarasov
a612c8490a Web: Doceditor: rewrite server to CommonJs 2022-07-13 14:06:03 +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