Commit Graph

23397 Commits

Author SHA1 Message Date
933a4129fa Quota: string representation of quota 2022-08-29 20:20:58 +03:00
ff8cfa3737 Quota: api 2022-08-29 15:03:36 +03:00
d70bf58c0a Quota: ldap user quota limit 2022-08-29 14:07:52 +03:00
953faf550e Quota: user quota init 2022-08-23 09:44:07 +03:00
907b793c30 Settings: communityserver version 2022-08-19 16:49:33 +03:00
2e85702127 Settings: version. CommunityServer replaced with DocSpace 2022-08-19 16:34:39 +03:00
d4eefc6145 Files: fixed optional params 2022-08-19 15:47:11 +03:00
8b6821d410 Files: fixed .format folders methods 2022-08-19 14:57:51 +03:00
9b5e966559 removed unused DisposableHttpContext 2022-08-19 13:56:32 +03:00
5b8374daa0 refactoring 2022-08-18 19:00:22 +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
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
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
c03a12209e fixed total 2022-08-15 17:31:27 +03:00
92942fbcf6 People: fix 2022-08-15 14:30:50 +03:00
c79d5e5885 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/login-confirm-redesign
# Conflicts:
#	common/ASC.WebDav/.yarn/install-state.gz
2022-08-12 18:17:31 +03:00
fa1258618a fixed warnings 2022-08-12 17:49:34 +03:00
299bed5559
Merge pull request #758 from ONLYOFFICE/bugfix/editor-ssr-production-fix
Web: Editor: fixed duplication of global styles on each request (prod…
2022-08-12 17:27:17 +03:00
a04c6b3533
Merge branch 'develop' into bugfix/editor-ssr-production-fix 2022-08-12 17:25:49 +03:00
0973f4e8d1 Files: removed .result 2022-08-12 16:26:57 +03:00
a941da35b4 removed ignored files 2022-08-12 16:11:25 +03:00
c72a9b18e0 Login: comment signin with code 2022-08-12 14:40:25 +03:00
191f527028 Login: RoomsLogin: fix 2022-08-12 13:48:30 +03:00
d32cadc5e3 Login: RoomsLogin: add background pattern 2022-08-12 13:36:08 +03:00
938b34bcdc Login: redesign 2022-08-12 13:33:38 +03:00
4638c8dca5 Login: add translates 2022-08-12 13:33:20 +03:00
f60aaef514 Login: CodeLogin: add logo 2022-08-12 13:32:58 +03:00
ba66b55d4d Login: fix register height 2022-08-12 13:07:42 +03:00
3bbd457505
Merge branch 'develop' into feature/login-confirm-redesign 2022-08-12 12:05:40 +03:00
87ee619e09
Merge pull request #756 from ONLYOFFICE/feature/async-fix
Feature/async fix
2022-08-12 11:59:54 +03:00
Artem Tarasov
649a9d5ed5 Web: Editor: fixed duplication of global styles on each request (production) 2022-08-12 11:26:54 +03:00
296959b9ea
Merge pull request #757 from ONLYOFFICE/bugfix/editor-ssr-fix
Bugfix/editor ssr fix
2022-08-12 10:44:24 +03:00
Artem Tarasov
7673750d41 Web: Editor: fixed duplication of global styles on each request 2022-08-12 10:02:41 +03:00
23b059c0cc fix 2022-08-11 22:35:53 +03:00
2314d6fc47 Merge branch 'develop' into feature/async-fix
# Conflicts:
#	common/ASC.Socket.IO/.yarn/install-state.gz
#	common/ASC.SsoAuth/.yarn/install-state.gz
#	common/ASC.UrlShortener/.yarn/install-state.gz
#	common/ASC.WebDav/.yarn/install-state.gz
2022-08-11 22:33:13 +03:00
5b613b8078 Files: async fix 2022-08-11 22:25:29 +03:00
7d32616524 Files: fix 2022-08-11 19:02:52 +03:00
484d1867e6 Confirm: fix style 2022-08-11 17:43:39 +03:00
eea2c0c656 Components: FormWrapper: fix min-width 2022-08-11 17:43:30 +03:00
6316de2937 Components: FormWrapper: fix width 2022-08-11 17:17:21 +03:00
962ebd4e9c Confirm: fix style 2022-08-11 17:16:20 +03:00
44bd9f1d6d Files: fix 2022-08-11 16:55:35 +03:00