|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
86e965d779
|
Web: Fix translations
|
2021-12-22 18:12:04 +03:00 |
|
