Commit Graph

392 Commits

Author SHA1 Message Date
e82a44d493
Merge pull request #617 from ONLYOFFICE/feature/redesign-sharing-panel
Feature/redesign sharing panel
2022-04-19 10:36:41 -04:00
e8c46ba42c Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
#	public/locales/en/Common.json
#	public/locales/ru/Common.json
2022-04-19 14:04:10 +03:00
ebff3a8f80 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-19 13:41:21 +03:00
d448691ae3 Web: fix view selector icons 2022-04-19 12:42:10 +03:00
Timofey Boyko
79a9b4175b Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-sharing-panel 2022-04-19 09:56:59 +03:00
1bfd6a959c Web: Files: fixed ConnectedClouds settings 2022-04-18 17:05:36 +03:00
Timofey Boyko
1abd712f67 Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-sharing-panel 2022-04-18 15:21:48 +03:00
47ffc849a5 Merge branch 'feature/virtual-rooms-1.2' into feature/connected-clouds-redesign 2022-04-18 15:05:23 +03:00
Timofey Boyko
ca9e132a67 Web: remove key 'DarkMode' in EU and RU locales 2022-04-18 12:37:08 +03:00
6dbf77317d Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery 2022-04-18 10:32:31 +03:00
b9a6c618bc Web: Moved Connect translation, added new translations 2022-04-15 16:39:57 +03:00
Timofey Boyko
3194f8810e Web:update image for access operation 2022-04-14 11:34:18 +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
Timofey Boyko
d2c5cbb0eb Web: update copy.react.svg 2022-04-11 18:56:59 +03:00
90bf5a7dc2 Web: Files: added info panel for OFORMsGallery 2022-04-07 16:52:16 +03:00
Timofey Boyko
397ff0d90d Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-07 12:10:11 +03:00
342c938415 Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery 2022-04-07 11:17:57 +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
Timofey Boyko
9aa24924ad Web: add code.react.svg 2022-04-06 15:05:32 +03:00
c51741bf94 Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery 2022-04-05 10:35:53 +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
f04d679df4 Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery 2022-04-04 18:25:32 +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
8c782a7903 Web: Files: added OFORMs gallery 2022-03-31 16:10:16 +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
3bbf82d918 add new lines 2022-03-09 19:07:24 +03:00
b71c2eabc5 Web:Added translation for "Title" for locales en, pt-BR, ru, de, fr, it. 2022-03-09 12:03:01 +03:00
ee446c8e67 Web: moved translates to Common 2022-03-09 11:04:12 +03:00
7ffaee6efc Web: moved translates to Common 2022-03-05 14:27:59 +03:00
mushka
384a92c30f finished merging 2022-03-04 12:52:34 +03:00
Timofey Boyko
65ccfb896f Web:Files: add new key 'sorting' 2022-03-04 10:20:10 +03:00
mushka
424a7a7e3c change code formatting 2022-03-03 13:43:43 +03:00
mushka
e77a97e105 added checkbox menu interaction and new opening mechanics 2022-03-02 17:19:19 +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
mushka
518abb7a2f added sever files, fixed closeOnclick interaction, added alternative thumbnail and implemented destructorization 2022-02-28 15:53:46 +03:00
7907016bde Web: fix after merge 2022-02-22 13:55:49 +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
743d0566a3 edit de (common) 2022-02-17 12:34:35 +03:00
3229019aad Web: move LoginButton key to Common 2022-02-10 18:01:40 +03:00
ef87651b3a Fixed Bug 55254 - Client.Files. Fixed the change of the cursor to the "palm" 2022-02-10 11:25:00 +03:00
Timofey
092d870f69 Merge branch 'feature/virtual-rooms-1.2' into feature/new-filter-input 2022-02-09 19:54:45 +08:00
Timofey
f6e4cc4d71 Merge branch 'develop' into feature/new-filter-input 2022-02-09 19:54:11 +08:00
817a155642 Web: move ShowMore to Common translate 2022-02-08 22:34:21 +03:00
b866e5cccc Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-02-08 18:17:41 +03:00
16f3adcb64 Web:Studio:Added the "Automatic time zone" method to the LanguageAndTimeZone component. Added HelpButton for StudioTimeLanguageSettings header.Added an image for the HelpButton component. 2022-02-08 17:43:56 +03:00
Timofey
97a23c8524 Web: change color to nav.logo.opened.react.svg for all themes 2022-02-03 23:47:44 +08:00
57ae1bdf00 Web: add danger alert icon 2022-02-03 16:05:54 +03:00
9068af695d Web: add sso translate 2022-02-03 01:09:51 +03:00
c8f1fc9f03 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-02-01 16:53:56 +03:00
2cd5e501f7 Web: add sso icon 2022-01-31 12:32:23 +03:00
Timofey
4b45eaa243 Merge branch 'develop' into feature/dark-theme 2022-01-27 18:10:13 +08:00
Dmitry Kulak
926f0c6a2e Web: Files: Changed "shared" icon 2022-01-26 14:09:43 +03:00
Timofey
021f205c38 Web: update catalog.share.react.svg 2022-01-24 17:41:29 +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
34441d6335 Web: Moved some translations from Files to COMMON for asc-web-components 2022-01-21 11:49:16 +03:00
Timofey
48daf70cd5 Web: add new icons for new search 2022-01-20 20:04:28 +08:00
6c72436a03
Merge branch 'develop' into feature/mobile-main-button 2022-01-20 14:25:05 +03:00