|
cbfbc4faae
|
Web: Login: fix warning
|
2022-03-28 18:09:08 +03:00 |
|
Timofey Boyko
|
052a76aa36
|
Web:Login: fix errors after merge
|
2022-03-18 11:15:50 +03:00 |
|
Timofey Boyko
|
27fab6de23
|
Merge branch 'feature/virtual-rooms-1.2' into feature/refactoring-pagelayout
|
2022-03-18 11:05:58 +03:00 |
|
|
26d092085e
|
Web: Login: fix enter action
|
2022-03-17 16:26:49 +03:00 |
|
Timofey Boyko
|
5e4798285a
|
Web:Login: change 'pagelayout' component to 'section' component
|
2022-03-17 16:21:59 +03:00 |
|
|
9bc3adb433
|
Web: Login: fix
|
2022-03-17 15:56:23 +03:00 |
|
|
00e5b2ebf6
|
Web: Login: fix show error logic
|
2022-03-17 15:46:09 +03:00 |
|
|
c08b673421
|
Web: Login: fix enter action
|
2022-03-17 15:39:45 +03:00 |
|
|
4ea8d65c08
|
Web: Login: fix field jumping
|
2022-03-17 12:28:20 +03:00 |
|
|
b1894a03f3
|
Web: Login: fix show error
|
2022-03-17 12:25:46 +03:00 |
|
|
d4938aac6f
|
Web: Login: fix forgot email input
|
2022-03-16 18:04:43 +03:00 |
|
|
bfb27ce17f
|
Web: Login: fix registration email input
|
2022-03-16 17:33:26 +03:00 |
|
|
c77f35895c
|
Web: Login: use email input
|
2022-03-16 16:27:33 +03:00 |
|
|
2ea15ac80f
|
Web: Login: fix button size
|
2022-03-16 11:36:00 +03:00 |
|
|
0a87411fbc
|
Web: Login: fix buttons size
|
2022-03-16 11:26:28 +03:00 |
|
|
0cd4cb49ed
|
Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign
# Conflicts:
# packages/asc-web-components/modal-dialog/index.js
# packages/asc-web-components/themes/dark.js
# public/locales/de/Common.json
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Login/src/Login.jsx
|
2022-03-16 11:03:07 +03:00 |
|
|
9886c434b2
|
Web: Login: fix
|
2022-03-15 14:32:53 +03:00 |
|
|
2f4a93188f
|
Web: delete feature disallow char
|
2022-03-15 13:57:33 +03:00 |
|
mushka
|
57f75cd8a5
|
merge with feature/virtual-rooms-1.2
|
2022-03-14 18:53:15 +03:00 |
|
|
55ef22b5f5
|
Web: Login: fix
|
2022-03-14 17:13:22 +03:00 |
|
|
5ea216e0c9
|
Web: Login: fix
|
2022-03-14 17:08:33 +03:00 |
|
|
4538a11b89
|
Web: Login: fix
|
2022-03-14 14:21:42 +03:00 |
|
|
edc20a1f9e
|
Web: Login: fix email input behavior
|
2022-03-14 11:48:45 +03:00 |
|
mushka
|
25ad35ab6a
|
added Normal Touchscreen/Desktop differentiation
|
2022-03-11 13:41:48 +03:00 |
|
|
79e1b0e082
|
Web: Login: disable with error
|
2022-03-10 17:01:42 +03:00 |
|
mushka
|
c3c59ceaff
|
changed size names in app buttons
|
2022-03-10 15:59:04 +03:00 |
|
|
5585a28f0b
|
Web: Login: use email inputs
|
2022-03-10 11:58:12 +03:00 |
|
|
69ea81d70e
|
Web: Login: Tests: update screenshots
|
2022-03-09 11:55:46 +03:00 |
|
|
947115a6ca
|
Web: Login: fix modal style
|
2022-03-09 11:43:08 +03:00 |
|
|
df920f7b4e
|
Web: Login: delete useless
|
2022-03-09 11:30:34 +03:00 |
|
|
14c51ff4a6
|
Web: Login: fix form jump
|
2022-03-05 11:57:41 +03:00 |
|
|
a603abf556
|
Web: Login: disabled social buttons on loading
|
2022-03-04 12:32:39 +03:00 |
|
|
aa4a65ba8f
|
Web: Login: fix styles
|
2022-03-03 22:23:25 +03:00 |
|
|
e9cfff3013
|
Web: Login: add cancel buttons
|
2022-03-03 22:16:06 +03:00 |
|
|
48f9afd6b0
|
Web: Login: delete useless
|
2022-03-03 21:51:09 +03:00 |
|
|
a83ad2abdd
|
Web: Login: delete useless
|
2022-03-03 18:37:50 +03:00 |
|
|
6209ff6d93
|
Web: Login: fix modal
|
2022-03-03 17:51:51 +03:00 |
|
|
8bba8e8345
|
Web: Login: wait all promise
|
2022-03-03 17:22:02 +03:00 |
|
|
9c98b70686
|
Web: Login: add loader
|
2022-03-03 13:13:56 +03:00 |
|
|
5a355090dd
|
Web: Login: add loader
|
2022-03-03 13:08:56 +03:00 |
|
|
6822fafda0
|
Web: Login: fix buttons width
|
2022-03-03 12:47:20 +03:00 |
|
|
6102b15c6d
|
Web: Login: fix dialog
|
2022-03-03 12:44:09 +03:00 |
|
|
f3afd79a3f
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# packages/asc-web-common/components/AdvancedSelector/AdvancedSelector.js
# packages/asc-web-common/components/AdvancedSelector/sub-components/Selector.js
# packages/asc-web-common/components/FilterInput/sub-components/SortComboBox.js
# packages/asc-web-common/components/PageLayout/index.js
# packages/asc-web-common/store/SettingsStore.js
# packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/context-menu/styled-context-menu.js
# packages/asc-web-components/drop-down/index.js
# packages/asc-web-components/link-with-dropdown/index.js
# packages/asc-web-components/row/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# packages/asc-web-components/themes/dark.js
# products/ASC.Files/Client/public/images/files.menu.svg
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/QuickButtons.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/ModalView.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
# products/ASC.People/Client/public/images/people.menu.svg
# products/ASC.People/Client/src/components/GroupSelector/index.js
# products/ASC.People/Client/src/components/PeopleSelector/index.js
# products/ASC.People/Client/src/pages/Home/Section/Body/RowView/userContent.js
# products/ASC.People/Client/src/pages/Home/index.js
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header-nav.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/nav-item.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/profile-menu.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
|
2022-03-01 13:50:26 +03:00 |
|
|
322b07dd5e
|
Web: Login: Tests: update screenshots
|
2022-02-28 16:16:50 +03:00 |
|
|
45a2868f77
|
Web: Login: Tests: add pause
|
2022-02-28 16:16:30 +03:00 |
|
|
9354bce5a0
|
Web: Login: fix panel width
|
2022-02-28 16:02:28 +03:00 |
|
|
20c0900e12
|
Web: Login: fix panel width
|
2022-02-28 15:54:22 +03:00 |
|
|
32868de412
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# public/locales/de/Common.json
|
2022-02-22 13:53:00 +03:00 |
|
|
3aeac42444
|
Merge branch 'master' into develop
# Conflicts:
# common/ASC.Core.Common/Data/DbSubscriptionService.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
# common/services/ASC.ElasticSearch/Service/Settings.cs
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
# common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableGroupMenu.js
# packages/asc-web-components/table-container/TableHeader.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# packages/asc-web-components/table-container/TableRow.js
# products/ASC.Files/Client/public/locales/az/Home.json
# products/ASC.Files/Client/public/locales/bg/Home.json
# products/ASC.Files/Client/public/locales/bg/Translations.json
# products/ASC.Files/Client/public/locales/cs/Home.json
# products/ASC.Files/Client/public/locales/de/ConvertDialog.json
# products/ASC.Files/Client/public/locales/de/Home.json
# products/ASC.Files/Client/public/locales/de/Translations.json
# products/ASC.Files/Client/public/locales/de/UploadPanel.json
# products/ASC.Files/Client/public/locales/el/ConvertDialog.json
# products/ASC.Files/Client/public/locales/el/Home.json
# products/ASC.Files/Client/public/locales/en/ConvertDialog.json
# products/ASC.Files/Client/public/locales/en/Home.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/en/UploadPanel.json
# products/ASC.Files/Client/public/locales/es/ConvertDialog.json
# products/ASC.Files/Client/public/locales/es/Home.json
# products/ASC.Files/Client/public/locales/es/UploadPanel.json
# products/ASC.Files/Client/public/locales/fi/Home.json
# products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
# products/ASC.Files/Client/public/locales/fr/Home.json
# products/ASC.Files/Client/public/locales/fr/Translations.json
# products/ASC.Files/Client/public/locales/it/ConvertDialog.json
# products/ASC.Files/Client/public/locales/it/Home.json
# products/ASC.Files/Client/public/locales/it/Translations.json
# products/ASC.Files/Client/public/locales/it/UploadPanel.json
# products/ASC.Files/Client/public/locales/ja/Home.json
# products/ASC.Files/Client/public/locales/ja/UploadPanel.json
# products/ASC.Files/Client/public/locales/lv/Home.json
# products/ASC.Files/Client/public/locales/nl/Home.json
# products/ASC.Files/Client/public/locales/nl/Translations.json
# products/ASC.Files/Client/public/locales/pl/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
# products/ASC.Files/Client/public/locales/pt-BR/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/Translations.json
# products/ASC.Files/Client/public/locales/ro/Home.json
# products/ASC.Files/Client/public/locales/ro/UploadPanel.json
# products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
# products/ASC.Files/Client/public/locales/ru/Home.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/public/locales/ru/UploadPanel.json
# products/ASC.Files/Client/public/locales/sk/Home.json
# products/ASC.Files/Client/public/locales/tr/Home.json
# products/ASC.Files/Client/public/locales/uk/Home.json
# products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
# products/ASC.Files/Client/public/locales/vi/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
# products/ASC.Files/Client/src/HOCs/withBadges.js
# products/ASC.Files/Client/src/HOCs/withContent.js
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# public/locales/de/Common.json
|
2022-02-21 22:22:38 +03:00 |
|
|
d67fb24b68
|
Web: Login: fix translate
|
2022-02-10 18:01:55 +03:00 |
|
|
3229019aad
|
Web: move LoginButton key to Common
|
2022-02-10 18:01:40 +03:00 |
|
|
d05d770a76
|
Web: Login: fix screenshots
|
2022-02-10 17:46:45 +03:00 |
|
|
a09da9d2f2
|
Web: Login: fix test
|
2022-02-10 17:17:13 +03:00 |
|
|
b3eb58971e
|
Web: Login: fix test
|
2022-02-09 15:57:19 +03:00 |
|
|
f8d4916d99
|
Web: Login: fix style
|
2022-02-09 13:36:50 +03:00 |
|
|
b1332d5895
|
Web: Login: fix translate namespace
|
2022-02-08 22:41:28 +03:00 |
|
|
817a155642
|
Web: move ShowMore to Common translate
|
2022-02-08 22:34:21 +03:00 |
|
|
e39fa3edaf
|
Web: Login: expose more-login
|
2022-02-07 21:07:00 +03:00 |
|
|
db0f49708a
|
Web: Login/Client: redirect to enter code page
|
2022-02-07 08:10:20 +03:00 |
|
|
ea65388497
|
Web: Login: disable input when enter code
|
2022-02-07 08:03:13 +03:00 |
|
|
73a0dc5588
|
Web: Login: add manually log in
|
2022-02-06 22:55:59 +03:00 |
|
|
246720c4fa
|
Web: Login: fix dialog style
|
2022-02-06 22:53:48 +03:00 |
|
|
acc102fa8d
|
Web: Login: delete useless
|
2022-02-04 18:34:17 +03:00 |
|
|
e8feb6af1c
|
Web: Login: delete useless
|
2022-02-04 18:33:09 +03:00 |
|
|
a477947042
|
Web: Login: add error/warning bar
|
2022-02-03 16:08:22 +03:00 |
|
|
66dfe12d8d
|
Web: Login: add translate
|
2022-02-03 16:07:04 +03:00 |
|
|
8e79b98864
|
Web: Login: add webpack expose
|
2022-02-03 01:37:43 +03:00 |
|
|
a0e1f31f5b
|
Web: Login: delete useless
|
2022-02-03 01:36:05 +03:00 |
|
|
2de4d2b96c
|
Web: Login: add new rooms login page
|
2022-02-03 01:18:24 +03:00 |
|
|
6e5a1572b4
|
Web: Login: fix show sso
|
2022-02-03 01:10:36 +03:00 |
|
|
14f02ea7f8
|
Web: Login: delete useless
|
2022-02-03 00:59:25 +03:00 |
|
|
bc7811b8eb
|
Web: Login: add submit func
|
2022-02-03 00:51:08 +03:00 |
|
|
c718ce6cd6
|
Web: Login: add code input page
|
2022-02-02 16:14:19 +03:00 |
|
|
e3473c1bde
|
Web: Login: add translate
|
2022-02-02 16:13:57 +03:00 |
|
|
c25a57582e
|
Web: Login: fix style
|
2022-02-02 16:13:33 +03:00 |
|
|
1049f78462
|
Web: Login: add workspace login page
|
2022-02-02 12:40:25 +03:00 |
|
|
c7e0b77883
|
Web: Login: add translations
|
2022-02-02 12:40:07 +03:00 |
|
|
fbf0dcc6f5
|
Web: Login: fix get sso
|
2022-02-01 17:44:12 +03:00 |
|
|
a7e710726c
|
Web: Login: add sso in more login
|
2022-02-01 15:20:59 +03:00 |
|
|
fa175efb73
|
Web: Login: move styles
|
2022-02-01 13:36:08 +03:00 |
|
|
615252c487
|
Web: add sso button
|
2022-01-31 12:33:39 +03:00 |
|
Timofey
|
21cd73a698
|
Web: restore code format
|
2022-01-28 21:44:58 +08:00 |
|
|
663c7aef90
|
Web: Login: fix or label
|
2022-01-28 03:12:24 +03:00 |
|
|
24261c843a
|
Web: Files: fix buttons width
|
2022-01-28 02:40:47 +03:00 |
|
|
03512706f0
|
Web: Login: fix show social buttons
|
2022-01-28 02:27:02 +03:00 |
|
|
429266b5e5
|
Web: Login: add social auth
|
2022-01-28 02:13:49 +03:00 |
|
|
53179bb9e3
|
Web: Login> fix body style
|
2022-01-28 02:06:54 +03:00 |
|
|
c03ea33c4d
|
Web: Login: fix styles
|
2022-01-27 19:33:55 +03:00 |
|
|
9ce1930f9a
|
Web: Login: add more login panel
|
2022-01-26 21:06:57 +03:00 |
|
|
79cd500028
|
Web: Login: fix greeting title style
|
2022-01-26 19:22:33 +03:00 |
|
|
3447ec4834
|
Web: Login: redesign login page
|
2022-01-26 19:13:26 +03:00 |
|
|
cbb58fdf09
|
Web: Login: fix width modal aside
|
2022-01-26 19:12:44 +03:00 |
|
|
4177cd35ec
|
Web: Login: add translations
|
2022-01-26 19:11:54 +03:00 |
|
Timofey
|
47974e378f
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-21 19:31:48 +08:00 |
|
|
32c398c044
|
Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS
|
2022-01-21 12:53:29 +03:00 |
|
|
0ad204743f
|
Merge branch 'develop' into feature/dark-theme
|
2021-12-29 20:25:29 +08:00 |
|
|
febf172875
|
Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/avatar-editor/index.js
# packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
# packages/asc-web-components/main-button/index.js
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
# products/ASC.Files/Server/DocStore
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Login/package.json
|
2021-12-28 13:35:02 +03:00 |
|
|
42411acf49
|
Web:Login: add support dark-theme
|
2021-12-28 11:27:15 +08:00 |
|
|
919092e6c6
|
Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0
|
2021-12-23 11:28:50 +03:00 |
|
|
9e24c182c9
|
edit ko
|
2021-12-23 11:22:48 +03:00 |
|