|
|
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 |
|
