Commit Graph

140 Commits

Author SHA1 Message Date
22381f8f44 Web: Moved dialog to common folder. 2022-09-19 15:12:49 +03:00
cd16261353 Web: fixed after merge. 2022-09-16 09:32:24 +03:00
bec4f11dcd Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/components/Loaders/index.js
#	packages/common/store/AuthStore.js
#	packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
#	packages/login/webpack.config.js
#	products/ASC.Files/Service/Program.cs
#	web/ASC.Web.Api/Program.cs
2022-09-15 17:16:04 +03:00
8df94b6af1 i18n: Translations: fix project files + sorting 2022-09-09 18:02:39 +03:00
ead45257f1 Web: Added 'Recover Access Modal Dialog' to the unavailable portal page. 2022-09-09 11:25:55 +03:00
d016efea48 Web: Moved translations to the common. 2022-09-09 11:12:02 +03:00
bd519f4184 Web: Login: Renamed locale folders 2022-09-06 13:01:23 +03:00
Artem Tarasov
65f1b61998 Web: Login/Editor: fixed showing warnings about request as expression 2022-09-05 13:16:04 +03:00
Artem Tarasov
a3f344712b Web: Login/Editor: added webpack-filter-warnings-plugin 2022-09-05 13:14:32 +03:00
7b623c4e30 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
#	packages/client/src/pages/PortalSettings/utils/settingsTree.js
#	packages/common/store/AuthStore.js
#	packages/components/slider/index.js
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
2022-09-05 10:19:52 +03:00
Artem Tarasov
d7b517c25e Web: Login: fixed production build 2022-09-05 04:25:32 +03:00
e136a41928 Merge branch 'feature/login-ssr' of github.com:ONLYOFFICE/DocSpace into feature/login-ssr 2022-09-02 17:15:36 +03:00
b5048bfafe Web: Fix react types warnings 2022-09-02 17:15:05 +03:00
6bcc951ad4 Web: Fix warning 2022-09-02 17:14:20 +03:00
Artem Tarasov
b0019f0967 Web: Login: deleted unnecessary code 2022-09-01 14:57:32 +03:00
Artem Tarasov
45bcfe4a8d Web: Login/Client: fixed parameter url name 2022-09-01 14:53:37 +03:00
f751cc5a8b Web: Auto-fix 2022-09-01 12:22:20 +03:00
Artem Tarasov
3f27595995 Web: Login: fixed server build 2022-09-01 01:50:27 +03:00
Artem Tarasov
3e34505eed Web: Login/Components: fixed styles 2022-09-01 01:14:24 +03:00
Artem Tarasov
8c28fda299 Web: Login/ColorTheme: fixed ssr 2022-08-31 18:32:13 +03:00
Artem Tarasov
d8e98fa208 Web: Login: MoreLogin mf fix 2022-08-31 18:02:05 +03:00
Artem Tarasov
1931e56f07 Web: Login: added LoginStore 2022-08-31 17:32:33 +03:00
370696aba0 Web: Fixed property name for ColorTheme component, changed type => themeId 2022-08-31 15:38:39 +03:00
a9338edd81 Web: Transferring translations to a common file 2022-08-31 15:22:48 +03:00
Artem Tarasov
0621fd9c86 Merge branch 'develop' into feature/login-ssr
# Conflicts:
#	packages/client/src/components/dialogs/ConnectDialog/index.js
#	packages/login/src/Login.jsx
#	packages/login/src/client/components/sub-components/forgot-password-modal-dialog.tsx
#	packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
#	yarn.lock
2022-08-30 18:38:12 +03:00
Artem Tarasov
73f2983177 Web: Login: added build scripts 2022-08-30 18:13:12 +03:00
Artem Tarasov
bc0e986707 Web: Login/Common: added language cookie setting on the server 2022-08-30 17:50:54 +03:00
Artem Tarasov
7e487bb064 Web: Login: deleted unnecessary code 2022-08-30 17:39:27 +03:00
Artem Tarasov
ee7986e7bb Web: Login: added getting language from portal settings, removed accept-language-parser 2022-08-30 15:00:31 +03:00
Artem Tarasov
b5c3e0b241 Web: Login: deleted unnecessary files 2022-08-30 14:42:20 +03:00
Artem Tarasov
25c1672e30 Web: Login: RoomsLogin moved to Login 2022-08-30 14:41:09 +03:00
Artem Tarasov
456166a7d5 Web: Login: RoomsLogin moved to Login 2022-08-30 14:40:46 +03:00
Artem Tarasov
bf925aeeed Web: Login: added types for IS_PERSONAL, IS_ROOMS_MODE 2022-08-30 13:30:29 +03:00
Artem Tarasov
044fd627e5 Web: Login: added support for rooms mode in webpack 2022-08-30 13:28:51 +03:00
Artem Tarasov
8a15cbc331 Web: Login: deleted console.log 2022-08-30 12:57:05 +03:00
Artem Tarasov
0c4033869f Web: Login/Client: fixed login routes 2022-08-30 12:56:28 +03:00
Artem Tarasov
b6e77cb2ac Web: Login: added code login to routes 2022-08-30 00:41:16 +03:00
Artem Tarasov
d1df749053 Web: Login: refactoring 2022-08-30 00:02:37 +03:00
Artem Tarasov
e1302e8b01 Web: Login: fixed styled-components warnings 2022-08-30 00:01:46 +03:00
Artem Tarasov
9bfc072508 Web: Login: added routing 2022-08-30 00:01:08 +03:00
Vlada Gazizova
2f822b0406
Merge branch 'develop' into feature/settings-common 2022-08-29 22:27:08 +03:00
ab654bc889 Web: Fix same key duplication warning 2022-08-29 11:33:52 +03:00
Artem Tarasov
146dafd96d Web: Login: modified render 2022-08-27 01:54:43 +03:00
Artem Tarasov
173404cdac Web: Login: added getCurrentLanguage 2022-08-27 01:53:48 +03:00
Artem Tarasov
ca5cad166d Web: Login: added route login/error=:error 2022-08-27 01:53:28 +03:00
Artem Tarasov
33d4d7c8df Web: Login: added global types 2022-08-27 01:52:57 +03:00
Artem Tarasov
8fe5c7f1d7 Web: Login/Client: InvalidError Component moved to Login 2022-08-27 01:51:40 +03:00
Artem Tarasov
0a3ebbc436 Web: Login: translations for InvalidError moved to login 2022-08-27 01:48:29 +03:00
Artem Tarasov
106152a2a4 Web: Login/Common: fixed types 2022-08-27 00:49:06 +03:00
Artem Tarasov
adb1946bc2 Web: Login: fixed register-modal-dialog 2022-08-26 19:03:33 +03:00