Commit Graph

325 Commits

Author SHA1 Message Date
1bfd6a959c Web: Files: fixed ConnectedClouds settings 2022-04-18 17:05:36 +03:00
47ffc849a5 Merge branch 'feature/virtual-rooms-1.2' into feature/connected-clouds-redesign 2022-04-18 15:05:23 +03:00
b9a6c618bc Web: Moved Connect translation, added new translations 2022-04-15 16:39:57 +03:00
165a5979a3 Web: Files: Added new translations. 2022-04-13 16:02:27 +03:00
35950126cb Web: Files: Added new translations. 2022-04-13 15:14:37 +03:00
7086c7ebb5 Web: Files: Changed empty files page. 2022-04-13 10:08:20 +03:00
aa91c6389c Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
# Conflicts:
#	packages/asc-web-common/components/Section/sub-components/section-container.js
2022-04-06 20:36:36 +03:00
45d2a31d03 Merge branch 'feature/virtual-rooms-1.2' into feature/add-units
# Conflicts:
#	public/locales/de/Common.json
2022-04-04 19:34:51 +03:00
Timofey Boyko
d812df9332 Web: add new key 'DarkMode' for EU and RU locales 2022-04-04 13:31:55 +03:00
99cdaa0440 Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel 2022-04-01 15:46:42 +03:00
8e777afb09 Web: change info icon 2022-03-30 19:39:09 +03:00
f41c65623b Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
# Conflicts:
#	config/kafka.json
2022-03-30 11:14:47 +03:00
080079c944 Web: add avatar images 2022-03-29 11:19:35 +03:00
1922da4ab9 merge 2022-03-24 20:56:51 +03:00
mushka
cd82919062 merge with feature/virtual-rooms-1.2 2022-03-24 18:00:31 +03:00
9174a20871 Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
#	packages/asc-web-common/api/portal/index.js
#	packages/asc-web-common/components/Loaders/index.js
#	packages/asc-web-common/store/SettingsStore.js
#	packages/asc-web-components/file-input/index.js
#	packages/asc-web-components/modal-dialog/index.js
#	packages/asc-web-components/save-cancel-buttons/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/FilesListRow.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/src/store/ContextOptionsStore.js
#	public/locales/de/Common.json
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/NavMenu/index.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
#	web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-rights.js
#	web/ASC.Web.Client/webpack.config.js
#	web/ASC.Web.Editor/src/Editor.jsx
2022-03-24 14:39:52 +03:00
mushka
c51d920092 vr-1.2 actualization 2022-03-21 11:13:56 +03:00
6b84d183b8 Web: add translates 2022-03-17 12:41:57 +03:00
b0e22fdac9 Web: change password input icons 2022-03-16 12:47:44 +03:00
89b2f94469 Web: add missed translate for de 2022-03-16 11:19:44 +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
cc293f60c2 Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel 2022-03-15 14:11:00 +03:00
de81329df2 WEb: Backup: Added help button component. 2022-03-15 12:43:02 +03:00
a7199bd3d4 Web: sort locales by key 2022-03-10 23:50:43 +03:00
afb0510fd6 Web: Moved translations to Common file (az). 2022-03-10 17:30:30 +03:00
1cb0345483 Web: Moved translations to Common file (bg). 2022-03-10 17:26:47 +03:00
ca45ca77d7 Web: Moved translations to Common file (cs). 2022-03-10 17:25:20 +03:00
685e7e0193 Web: Moved translations to Common file (de). 2022-03-10 17:18:26 +03:00
9a4715fad7 Web: Moved translations to Common file (el). 2022-03-10 17:10:09 +03:00
5d4a54e1ce Web: Moved translations to Common file (en). 2022-03-10 16:57:56 +03:00
a403bdbf03 Web: Moved translations to Common file (es). 2022-03-10 16:56:15 +03:00
7b5f653ead Web: Moved translations to Common file (fi). 2022-03-10 16:54:21 +03:00
a94be67b16 Web: Moved translations to Common file (fr). 2022-03-10 16:52:35 +03:00
84f1a05ba3 Web: Moved translations to Common file (it). 2022-03-10 16:50:04 +03:00
9467226e09 Web: Moved translations to Common file (ja). 2022-03-10 16:48:45 +03:00
05da08892d Web: Moved translations to Common file (ko). 2022-03-10 16:47:13 +03:00
e15108a62c Web: Moved translations to Common file (lo). 2022-03-10 16:45:08 +03:00
0efd8d1126 Web: Moved translations to Common file (lv). 2022-03-10 16:43:34 +03:00
d2e1f04d8a Web: Moved translations to Common file (nl). 2022-03-10 16:41:37 +03:00
56b4eece3d Web: Moved translations to Common file (pl). 2022-03-10 16:39:54 +03:00
4eae2cdb3c Web: Moved translations to Common file (pt). 2022-03-10 16:38:25 +03:00
34e1f835fe Web: Moved translations to Common file (pt-BR). 2022-03-10 16:36:25 +03:00
8ba131d52d Web: Moved translations to Common file (ro). 2022-03-10 16:33:31 +03:00
0c9713c65b Web: Moved translations to Common file (sk). 2022-03-10 16:31:02 +03:00
bff2518bf9 Web: Moved translations to Common file (sl). 2022-03-10 16:28:38 +03:00
500945a6da Web: Moved translations to Common file (tr). 2022-03-10 16:26:11 +03:00
e663d59aeb Web: Moved translations to Common file (vi). 2022-03-10 16:25:27 +03:00
297394f359 Web: Moved translations to Common file (uk). 2022-03-10 16:24:18 +03:00
8080e416df Web: Moved translations to Common file (zh-CN). 2022-03-10 16:23:06 +03:00
7bca87c34d Web: Moved translations to the Common (ru). 2022-03-10 16:21:24 +03:00