Commit Graph

3020 Commits

Author SHA1 Message Date
Artem Tarasov
42c42f19eb Merge branch 'develop' into bugfix/doceditor-fix 2022-07-25 18:05:08 +03:00
Artem Tarasov
eb352fd860 Web: Client/public: Moved PreparePortalTitle key from PreporationPortal.json to Common.json. 2022-07-25 17:54:51 +03:00
ea74b77dcd Web: Client: move toast to shell 2022-07-24 00:50:19 +03:00
86337271e4 Web: Client: IndicatorLoader: fix position 2022-07-23 22:07:50 +03:00
8152557397 Web: Client: Settings: fix article loader 2022-07-23 22:07:25 +03:00
bcf6faf40d Web: Client: add dialogs wrapper, fix rerender 2022-07-23 02:15:16 +03:00
7cf51de990 Web: Client: ProfileActionsStore: fix open about 2022-07-23 02:07:37 +03:00
61a1862f50 Web: Client: ProfileActionsStore: add icon 2022-07-22 10:31:32 +03:00
180aa03d95 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header 2022-07-22 10:22:52 +03:00
Artem Tarasov
284f0ef58d Web: Common/Client: deleted unnecessary comment, fix import tryRedirectTo 2022-07-21 18:05:23 +03:00
88c23a0453 Web: Client: hide header on login page 2022-07-21 16:41:29 +03:00
fa5bec9adc Web: Client: NavMenu: fix logo position 2022-07-21 14:49:00 +03:00
80de7c43d4 Web: Client: move indicator loader from navmenu 2022-07-21 14:37:44 +03:00
77d311b636
Merge branch 'develop' into feature/doceditor-ssr 2022-07-21 11:41:42 +03:00
68bfe739ca Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header 2022-07-20 14:15:42 +03:00
2c9a4f8181 Web: Client: fix t ns and keys 2022-07-20 12:27:30 +03:00
cf1b168dd6 Web: move locales to Common 2022-07-20 12:22:38 +03:00
75042eedf0 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
#	packages/asc-web-common/components/Article/styled-article.js
2022-07-20 10:00:32 +03:00
Artem Tarasov
4ddffad7b2 Merge branch 'develop' into feature/doceditor-ssr 2022-07-19 18:22:16 +03:00
66b0e8c303
Merge branch 'develop' into bugfix/tfa 2022-07-19 18:17:22 +03:00
c17817eed8 Web: Client: NavMenu: delete email 2022-07-19 14:35:48 +03:00
0c2d54638f Web: Client: NavMenu: fix button size 2022-07-19 14:10:36 +03:00
7f241f4c90 Web: Client: add profile actions 2022-07-19 14:08:06 +03:00
ad4767d572 Web: Client: move debug dialog to shell 2022-07-19 12:35:08 +03:00
a82f4293e7 Web: Client: ProfileActionsStore: add urls, fix about 2022-07-18 22:09:38 +03:00
93fc644a6a Web: Client: NavMenu: use profile actions store 2022-07-18 22:09:07 +03:00
7b6b252a09 Web: Client: create profile actions store, del about store 2022-07-18 21:46:43 +03:00
Artem Tarasov
10f2cde731 Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	.gitignore
2022-07-18 17:05:53 +03:00
005b72216d Web: Client: move about dialog to shell 2022-07-18 14:09:09 +03:00
5005bfec3d Web: Client: Confirm: use confirmHeader 2022-07-14 15:28:14 +03:00
fb162af624 Web: Client: Settings: use new tfa api 2022-07-14 14:43:50 +03:00
mushka
f99d8784f1 fixed RecoverAccess dialog 2022-07-12 17:28:13 +03:00
72b00ffe94 Merge branch 'develop' into feature/modal-redesign 2022-07-12 14:24:11 +03:00
mushka
45f2e63836 changed ConnectCloud dark theme and fixed ConsumerModalDialolg 2022-07-12 14:19:04 +03:00
404e014a59 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
#	products/ASC.Files/Client/src/Files.jsx
2022-07-12 14:18:29 +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
mushka
a222f836c4 fixed ConsumerModalDialog compennt 2022-07-12 12:50:08 +03:00
61d824db3c Web: Client: Main: fix height 2022-07-11 23:11:27 +03:00
mushka
83cb430911 small tweaks on DebugInfo 2022-07-11 22:15:53 +03:00
mushka
96a2d4530e fixed DebugInfo styles 2022-07-11 22:11:55 +03:00
e3c039942d Web: Client: hide header on desktop 2022-07-11 15:17:48 +03:00
136a0d45bf Web: Client: TfaActivation: fix layout 2022-07-11 14:47:57 +03:00
3cbfa3d952 Web: Client: TfaAuth: fix layout 2022-07-11 13:57:58 +03:00
mushka
2fb38338e5 fixed backdrop and Debug dialog 2022-07-11 13:30:55 +03:00
b3324ad875 Web: Client: NavMenu: fix namespace 2022-07-11 11:28:25 +03:00
Artem Tarasov
120f5f7b17 Web: Files/People/Client/Login: updated version webpack-cli 4.9.0 -> 4.10.0 2022-07-10 12:34:16 +03:00
Artem Tarasov
55198d0e7f Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	web/ASC.Web.Editor/src/i18n.js
#	web/ASC.Web.Editor/webpack.config.js
#	yarn.lock
2022-07-10 11:23:44 +03:00
mushka
58e68c1c12 Merge branch 'develop' into feature/modal-redesign 2022-07-08 17:23:02 +03:00
1f3dfb9ccc Web: Client: AdminMessage: fix save 2022-07-08 16:46:26 +03:00