Commit Graph

2620 Commits

Author SHA1 Message Date
b2079ccace fixed warnings 2022-02-07 20:19:58 +03:00
812241a69a Analyzers: fix 2022-02-07 17:53:58 +03:00
Vashchuk Nikita
5aa99ec811 Merge branch 'develop' into feature/async
# Conflicts:
#	common/ASC.Common/Caching/KafkaCache.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/services/ASC.AuditTrail/AuditEventsRepository.cs
#	common/services/ASC.AuditTrail/LoginEventsRepository.cs
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Utils/MailMergeTask.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	products/ASC.Files/Service/Thumbnail/FileDataProvider.cs
2022-02-04 16:04:52 +03: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
cf3d4c71e3 Merge branch 'devlop' into branch feature/catalog 2022-01-31 23:52:52 +08:00
Vashchuk Nikita
2901d837a1 async methods for httpClient in ASC.Web 2022-01-31 17:35:36 +03:00
34ff334692 Merge branch 'develop' into feature/analizators 2022-01-31 14:35:16 +03: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
Timofey
15dd9b0642 Merge branch 'develop' into feature/dark-theme 2022-01-27 22:21:06 +08:00
1908af64f0 cache: return support kafka. refactoring 2022-01-27 15:20:51 +03: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
2029c34f9c analizators/s1121 2022-01-21 14:02:17 +03:00
473259657e analizators/s1118 2022-01-21 13:47:56 +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
Timofey
b0c7564c2a Web:People:Reassign: update dark-theme 2022-01-21 16:44:14 +08:00
Timofey
e5f06b932d Merge branch 'develop' into feature/dark-theme 2022-01-20 21:18:30 +08:00
50a7bd6856 analizators/s3265 2022-01-20 11:40:21 +03:00
84638feaf0 analizators/U2U1202 2022-01-18 16:54:24 +03:00
4bf841581f Analizators/U2U1104 2022-01-14 16:12:37 +03:00
6e2a990c58 Fixed Bug 54484 - People. Added redirect to people list after deleting user profile 2022-01-14 11:20:15 +03:00
48897308d7 refactoring 2022-01-13 22:17:56 +03:00
6b883bcd60 Merge branch 'develop' into feature/support-elasticache 2022-01-13 18:16:43 +03:00
cacb889ee2 analizators/U2U1100 2022-01-13 15:04:28 +03:00
4155f911c0 analizators/U2U1025 2022-01-13 14:19:39 +03:00
ee71dbb2cd Web: updated icons of modules 2022-01-12 15:51:36 +03:00
c85c2e6f26 analizators/U2U1007 2022-01-11 18:37:10 +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
b9ae9b7335 analizators/s2583 2021-12-30 15:12:44 +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
895e888ad3 analizators/s4144 2021-12-28 17:04:52 +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
6d250efffa add *.dll for support redis + update Grpc.* dll 2021-12-23 16:17:31 +03: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