Commit Graph

2375 Commits

Author SHA1 Message Date
Timofey Boyko
a31ef97615 Web:People: remove old article 2022-03-15 17:49:31 +03:00
Timofey Boyko
3c092803ea Web:People:Components:Catalog: fix loaders for main button and header with isLoaded prop 2022-03-15 14:21:53 +03:00
mushka
57f75cd8a5 merge with feature/virtual-rooms-1.2 2022-03-14 18:53:15 +03:00
Timofey Boyko
4495de8686 Web:People: remove catalog from pages and refactoring 2022-03-14 17:11:18 +03:00
mushka
25ad35ab6a added Normal Touchscreen/Desktop differentiation 2022-03-11 13:41:48 +03:00
mushka
c3c59ceaff changed size names in app buttons 2022-03-10 15:59:04 +03:00
3bbf82d918 add new lines 2022-03-09 19:07:24 +03:00
1062e3bcdf Web: People: fix translates 2022-03-09 11:04:28 +03:00
ee446c8e67 Web: moved translates to Common 2022-03-09 11:04:12 +03:00
Timofey Boyko
2fcc7806ea Web:People:Catalog: add translate 'OtherOperations' for main button mobile 2022-03-05 19:44:33 +03:00
Timofey Boyko
13f0b2dd5a Web:People: add new key 'OtherOperations' for ru and en locales 2022-03-05 19:43:35 +03:00
Timofey Boyko
60110e4e9e Web:People:Filter: add search placeholder 2022-03-05 16:59:05 +03:00
Timofey Boyko
02a0bcd610 Web:People:Components: update actions model for mobile main button 2022-03-05 16:58:42 +03:00
Timofey Boyko
c31d1f171e Web:People:Components: fix click item for catalog body for mobile devices 2022-03-05 16:58:01 +03:00
5fb51923b0 Web: People: fix translates 2022-03-05 14:32:35 +03:00
7ffaee6efc Web: moved translates to Common 2022-03-05 14:27:59 +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
cae358636e
Merge branch 'develop' into bugfix/fixed-dates-in-profile 2022-02-25 17:51:06 +03:00
dc78ff3a33 Web: Client: People: Added fixedDirection property for DateField 2022-02-25 16:48:12 +03:00
7e50d1b097 Web: People: Profile: fixed help-icon styles 2022-02-25 13:41:47 +03:00
64473bb70e Merge branch 'develop' into bugfix/fixed-dates-in-profile 2022-02-25 11:15:20 +03:00
ba0bfe7260 Merge branch 'develop' into bugfix/fixed-dates-in-profile
# Conflicts:
#	packages/asc-web-components/calendar/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
2022-02-24 15:59:56 +03:00
2e000f1d9d Web: People: fixed profile dates 2022-02-24 15:48:02 +03:00
902b2b54eb Web: People: fixed table style 2022-02-24 11:33:58 +03:00
deeff80f26 Web: TabLe: refactoring table view 2022-02-22 16:00:26 +03:00
Timofey
82e1af9828 Web:People: add new key for translations 2022-02-22 17:13:00 +08:00
Timofey
f6fdb1ce66 Web:People: add new filter 2022-02-22 17:12:44 +08:00
Timofey
06a83fdfa7 Web:People: fix display catalog main button 2022-02-22 17:12:19 +08:00
Timofey
fe75dc72b2 Web:People: fix catalog main button 2022-02-22 17:10:57 +08:00
Timofey
45c521cd08 Web:People: add new filter input 2022-02-22 16:51:05 +08: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
Timofey
eb78d0cd26 Web:People:Dialogs: add theme as props in change password dialog 2022-02-21 21:33:38 +08:00
Timofey
7a97d482f0 Web:People:Home: remove mobile main button from empty screen on desktop devices 2022-02-21 20:04:24 +08:00
6ed624844b Web: People: Re-write setIsEdit to arrow function 2022-02-18 11:17:58 +03:00
eccb588362 Web: People: Profile: Added default width for language selector 2022-02-17 14:38:49 +03:00
7e011de3cf Web: People: fixed display of registration date/birthday in user profile 2022-02-17 11:46:50 +03:00
7419eb87dc Web: People: Added opportunity to unsubscribe from mailing list on My Profile page (/my?unsubscribe=tips) 2022-02-16 21:34:19 +03:00
Timofey
894ec8a429 Web:People:ProfileAction: change group selector in form action 2022-02-16 17:07:20 +08:00
Timofey
2e288faf7e Web:People:Components: fix label for all users groups 2022-02-16 17:06:46 +08:00
Timofey
908122694d Web:People:Components: refactoring group selector 2022-02-16 17:05:56 +08:00
Timofey
63568d0c4a Web:People: add new key 'AllGroups' for group selector for en and ru locales 2022-02-16 16:57:38 +08:00
c1541d7901 Fixed Bug 55248 - Mobile.Client.Profile. Fixed closing the profile save window on the avatar editor page 2022-02-15 19:16:14 +03:00
Timofey
5cd639f63d Web:People: add new key 'AddHeadOfDepartment' for group action for en locale 2022-02-15 15:17:38 +08:00
Timofey
61a525eb8e Web:People: add new keys 'AddUsers' and 'AllUsers' for people selector for en and ru locales 2022-02-15 15:16:02 +08:00
Timofey
92e668a182 Web:People:PeopleSelector: change default header label and all users group name 2022-02-15 15:05:30 +08:00
Timofey
b727092407 Web:People:GroupAction: change props for people selector for header and members select 2022-02-15 15:02:50 +08:00
2dac619d61 Fixed Bug 55248 - Mobile.Client.Profile. Fixed closing the profile save window on the avatar editor page 2022-02-14 16:32:39 +03:00
Timofey
ec77078bd7 Web:People:Components: change people selector base props 2022-02-14 18:53:20 +08:00
Timofey
af3a9f08eb Web: switch article component on catalog component 2022-02-09 19:48:11 +08:00
d54d3a938e Web: e2e-tests: Update tests screenshots 2022-02-08 19:41:50 +03:00
78fb372dcd Web: e2e-tests: Fix create user test 2022-02-08 18:05:45 +03:00
Timofey
92ed07db23 Web:People: disable catalog main button in section for desktop view 2022-02-08 17:21:36 +08:00
Timofey
13c0cd63a1 Web:People:Catalog: fix desktop mobile main button and add new view for tablet and mobile 2022-02-08 17:04:09 +08:00
Timofey
f42ce0eb52 Web:People: change people menu svg 2022-02-04 00:04:27 +08:00
Timofey
bd8d8180f9 Web: fixed code format 2022-02-03 23:34:19 +08:00
Timofey
223c04a3c7 Merge branch 'feature/dark-theme' into feature/virtual-rooms-1.2 2022-02-03 20:59:26 +08:00
Timofey
21cd73a698 Web: restore code format 2022-01-28 21:44:58 +08:00
Timofey
47527c3430 Web:People:ProfileAction: add support dark-theme for link in tooltip 2022-01-28 19:46:46 +08:00
509332fb23 Web: restored classNames for autotest after merge 2022-01-25 12:31:18 +03:00
Timofey
a53ed1a7c5 Web: added support theme as props 2022-01-25 15:56:51 +08:00
Timofey
72c5c93737 Web: add theme support from props 2022-01-24 23:27:24 +08:00
Timofey
f831c9344a Web:People:Profile: add support dark-theme for tooltip-link in profile info 2022-01-21 23:04:23 +08:00
Timofey
f5ae02dfc9 Merge branch 'develop' into feature/catalog 2022-01-21 21:06:40 +08: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
Timofey
b0c7564c2a Web:People:Reassign: update dark-theme 2022-01-21 16:44:14 +08:00
6e2a990c58 Fixed Bug 54484 - People. Added redirect to people list after deleting user profile 2022-01-14 11:20:15 +03:00
ee71dbb2cd Web: updated icons of modules 2022-01-12 15:51:36 +03:00
0246f10380 Web: People: fixed mobx warning 2022-01-11 12:35:53 +03:00
3565666fd2 Web: Table: fixed default columns size, fixed styles 2022-01-11 12:34:54 +03:00
3df4bc8c67 Web: People: added badges for people table 2022-01-10 17:28:22 +03:00
901d48b4f0 Web: People: fixed the user position cell 2022-01-10 15:56:38 +03:00
efffe7feb3 Fixed Bug 54482 - People. User profile is not removed from the context menu 2022-01-10 10:55:29 +03:00
0ad204743f Merge branch 'develop' into feature/dark-theme 2021-12-29 20:25:29 +08:00
bedfad1ec5 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2021-12-28 18:21:44 +03:00
4c5ba66857 Web: People: fixed table cell styles 2021-12-28 16:47:57 +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
190e3eed1e Web:People:Section: add fill for send clock icon in dark-theme 2021-12-28 16:43:22 +08:00
148acc38c9 Web:People:Dialogs: add support dark-theme 2021-12-28 15:35:41 +08:00
76595827fa Web:People:HOCs: add support dark-theme 2021-12-28 15:20:56 +08:00
3259cf4db4 Web:People:PeopleSelector: add support dark-theme 2021-12-28 15:13:37 +08:00
440811e931 Web: Added convertLanguage for compatibility 2021-12-23 14:01:08 +03:00
c899f4db3a Web: People: Fix selectedLanguage == undefined 2021-12-23 13:10:35 +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
3c26c6cdfd edit az, vi, uk 2021-12-23 11:24:00 +03:00
cd56b02c8e Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-22 19:10:45 +03:00
e28744d69a Web:Tests: fix culture change before test start 2021-12-23 00:09:49 +08:00
48aa091786 Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-22 18:12:12 +03:00
86e965d779 Web: Fix translations 2021-12-22 18:12:04 +03:00
b63d7d02f4 Web:Tests: close process when tests done 2021-12-22 18:45:53 +08:00
868332bb83 Web:Tests: add ability to ignore different cultures 2021-12-22 16:46:45 +08:00
ff7b6fc432 Web: init e2e tests 2021-12-21 15:59:11 +08:00
36c692f9da Web:People:ProfileAction: add support dark-theme 2021-12-15 17:28:02 +08:00
bc62c12e9e Web:People:Profile: add support dark-theme 2021-12-15 17:27:45 +08:00
7b21c03357 Web:People:GroupAction: add support dark-theme 2021-12-14 18:52:28 +08:00
07942f600c Web:People:Section: add support dark-theme 2021-12-14 18:52:14 +08:00
49f3955e07 edit translations 2021-12-14 13:17:23 +03:00
b7e80bc96e Web:People:ArticleBody: add support dark-theme 2021-12-14 16:04:06 +08:00
4eee5b49a2 add lo 2021-12-13 14:55:33 +03:00
65a7ae3df4 add translations el 2021-12-13 12:26:37 +03:00
fce12af277 add translations 2021-12-10 13:34:21 +03:00
878df989d9 Web: Renamed folder zh_CN to zh-CN 2021-12-09 21:51:05 +03:00
02a57ac53e Web: People: Added dropDownMaxHeight 2021-12-09 19:48:03 +03:00
afe25e3bc4 Fix issues of WrongTranslationVariablesTest 2021-12-09 19:47:18 +03:00
372ba52d94 add translations 2021-12-09 14:07:51 +03:00
489ecb1b26 add translations 2021-12-08 15:18:22 +03:00
ddbaee09e4 add translations 2021-12-08 12:23:52 +03:00
e2899e57e4 add translations 2021-12-07 17:17:56 +03:00
dba7e2afd6 edit lo 2021-12-07 16:59:36 +03:00
20a17fca96 rename pt 2021-12-07 16:50:09 +03:00
b6a963c712 add ko 2021-12-07 16:24:37 +03:00
06a478a499 add translations 2021-12-07 16:07:55 +03:00
c95aa3e29a add sl 2021-12-07 15:29:28 +03:00
c44f580681 Fix issues of UselessModuleTranslationKeysTest 2021-12-07 13:04:06 +03:00
f9cf10afc5 edit files 2021-12-07 12:35:01 +03:00
2074c2f94d edit ja 2021-12-07 11:49:18 +03:00
78e36309e0 edit ja 2021-12-07 11:23:03 +03:00
83874a0eb8 edit cs 2021-12-07 11:19:20 +03:00
ac4e23553e add it 2021-12-07 11:08:55 +03:00
3b11d8fa30 edit translations 2021-12-06 13:05:00 +03:00
3a50fca3cc Merge branch 'hotfix/v1.1.1' into bugfix/dropdown-correct-display 2021-12-02 18:32:36 +05:00
c010fa4e69 update lo 2021-12-02 15:54:57 +03:00
bc322380b6 update lo 2021-12-02 13:19:51 +03:00
c59c6edd66 add az 2021-12-02 12:55:41 +03:00
a012038f3b Merge branch 'develop' into feature/catalog 2021-12-02 14:59:31 +08:00
7f5bf2f65c add tr 2021-12-01 14:26:28 +03:00
5320d4cdf1 add pt-PT 2021-12-01 14:21:54 +03:00
9298919311 edit pt-PT 2021-12-01 14:20:48 +03:00
554235abcc add vi 2021-12-01 14:18:08 +03:00
b2a646177c add sl 2021-12-01 13:57:12 +03:00
9143e6af43 add sk 2021-12-01 13:44:20 +03:00
b517eac78c edit Translation 2021-12-01 13:35:20 +03:00
920cad4f70 add pt 2021-12-01 13:30:16 +03:00
bc232e937e add pl 2021-12-01 12:43:45 +03:00
160479aa27 add nl 2021-12-01 12:35:25 +03:00
f6efa27440 add lv 2021-12-01 12:24:03 +03:00
2c51644c9c add ko 2021-12-01 12:07:49 +03:00
22d5a4ef01 add fi 2021-12-01 12:05:52 +03:00
71a5a3cb1a add cs 2021-12-01 12:01:30 +03:00
002af23d9b add ja 2021-12-01 11:26:35 +03:00
685fb5f196 edit fr 2021-12-01 11:16:28 +03:00
4c3845934f edit it 2021-12-01 10:55:33 +03:00
6ca4abf360 edit de 2021-12-01 10:51:35 +03:00
02e5ef9bdc edit ro 2021-11-30 17:23:28 +03:00
db1d482fbc edit ru 2021-11-30 16:22:24 +03:00
3eb2ee20a8 add bg 2021-11-30 16:16:44 +03:00
40d6fcbf3b add uk 2021-11-30 16:15:55 +03:00
a9dc2a08da add zh-CN 2021-11-30 16:14:32 +03:00
7e2b2463ef add es 2021-11-30 12:36:57 +03:00
b2c123d6f4 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-11-30 11:46:22 +03:00
fb637b43f1 Web: added version for table 2021-11-25 17:38:09 +03:00
08746974f4 Web: SW: Added SW unregister + refactoring 2021-11-25 15:08:18 +03:00
ff9bb93efd Web: Scripts: Hide shx mkdir errors 2021-11-25 15:06:19 +03:00
73d3b00c07 Web: added missing classNames for autotests 2021-11-25 12:11:22 +03:00
4b5af5912c Web: People: fixed row-checkbox styles 2021-11-23 12:30:55 +03:00
89e7b494c4 Web: People: Fixed translation ChangeUserStatusDialog, fixed translation ChangeUsersActiveStatus, ChangeUsersDisableStatus for en language 2021-11-23 12:24:24 +03:00
470fd7ffcb Web: People: MainButton: Added missing actions 2021-11-22 11:21:58 +03:00
1004ed5dfb Fixed Bug 53415. Fixed save button 2021-11-22 11:20:01 +03:00
11d527ba03 Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	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/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Login/package.json
2021-11-21 14:40:24 +03:00
f675415228 Merge branch 'master' into release/v1.1.0
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	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/public/locales/en/SelectFile.json
#	products/ASC.Files/Client/public/locales/en/SelectFolder.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/components/Article/MainButton/index.js
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/public/locales/en/Translations.json
#	products/ASC.People/Client/public/locales/ru/Translations.json
#	products/ASC.People/Client/src/components/Article/MainButton/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Login/package.json
2021-11-21 14:26:20 +03:00
d31ea87211 Merge branch 'master' into develop
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
2021-11-21 13:57:55 +03:00
56ecbc95ea Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-19 18:18:13 +03:00
4b095ecdd6 Web: People: MainButton: Reworked data model for button items 2021-11-19 18:01:47 +03:00
50fb593b39 Web: People: Changed Email Dialog according to layouts. 2021-11-19 16:09:41 +03:00
9608cabeb0 Web: People: Forced download of translations. 2021-11-19 16:08:17 +03:00
7a2e48d066 Web: People: fix translations 2021-11-18 19:10:51 +03:00
ac09d3691d Web: People: fix translations 2021-11-18 19:03:24 +03:00
Artem Tarasov
f33d99c9c0 Web: People/Common: added sorting of groups in the tree 2021-11-16 19:27:27 +03:00
e0f297bf0a Web: People: add translations 2021-11-16 18:24:02 +03:00
d403fa1dcd Web: People: removed log 2021-11-15 18:37:29 +03:00
7ca1a18a37 Web: People: added translations for column position 2021-11-15 18:35:08 +03:00
b72760c789 Web: People: fixed Paging tReady 2021-11-15 17:44:21 +03:00
5ed03e0351 Web: People: Fix displaying error on Avatar save 2021-11-13 20:31:43 +03:00
cd21a4013d Web: Restored missing translations 2021-11-13 19:15:50 +03:00
2c6e0d45bc Web: Fix wrong braces of variables inside translation files 2021-11-13 19:07:48 +03:00
c7c7267a9a Test: Added new WrongTranslationVariablesTest and fix it's issues 2021-11-13 19:03:10 +03:00
623313e4be Web: Restored missing 'ru' translations 2021-11-12 21:14:44 +03:00
1c8f091dce Web: Fix DublicatesByContentTest translation issues 2021-11-12 20:12:33 +03:00
d8cf12f9d7 translations 2021-11-12 19:00:01 +03:00
17e3e5cb98 bump version to 1.1.1 2021-11-12 15:21:25 +03:00
3809273075 bump version to 1.1.0 2021-11-12 15:19:40 +03:00
3363cb4111 Web: added className to MainButton 2021-11-12 14:17:20 +03:00
9b6d9dac6f Web: People: added classNames for MainButton items 2021-11-12 14:13:47 +03:00
6b299a48e3 Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.0.1 2021-11-10 21:25:08 +03:00
11769e8c9e Fix Bug 53180 - Client: Profile. Error «.../pt/Common.json 404» on pt-BR language. 2021-11-10 19:59:03 +03:00
cab7603f5b Fixed Bug 53415: Fixed save avatar click 2021-11-10 18:33:21 +03:00
09520f60fb Web: People: fixed styles 2021-11-10 13:59:34 +03:00
eb1db9eea6 Merge branch 'hotfix/v1.0.1' into feature/desktop-login 2021-11-02 18:15:53 +03:00
2bafe9c7c0 Web: People: Profile: Fixed serialized profile property 2021-11-02 18:13:39 +03:00
d37aa52f09 Merge branch 'develop' into feature/catalog 2021-11-02 21:04:46 +08:00
4e018d2d71 Web: Bump version to 1.0.1 2021-11-02 14:02:46 +03:00
89391ab385
Merge branch 'develop' into bugfix/tooltip 2021-11-01 15:02:25 +03:00
8cc08045b7 Merge branch 'master' into develop
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-header.js
#	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
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
2021-11-01 13:54:40 +03:00
6aa8281ea7 Web: People: add space in tooltip translate 2021-10-29 16:44:48 +03:00
72d972d8fb Web: People: Changed styles to match layouts. 2021-10-22 14:19:57 +03:00
5bd9c06c1a Merge branch 'develop' into table-group-menu
# Conflicts:
#	products/ASC.Files/Client/src/store/FilesStore.js
2021-10-22 12:20:20 +03:00
94cbac3c02 Merge branch 'develop' into feature/catalog 2021-10-22 15:43:23 +08:00
657e34d474 Web:Studio:NavMenu: fix showing navigation icons 2021-10-21 20:36:25 +08:00
9aa3fd7047 Web:Common:Catalog: update branch 2021-10-20 22:31:39 +08:00
f35ea7d172 Web: People: delete useless 2021-10-20 11:21:28 +03:00